[Libreoffice-commits] core.git: vcl/inc vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/inc/skia/salbmp.hxx |   12 ++++++++----
 vcl/skia/salbmp.cxx     |    2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 76babdeaf2e419d2aa21d674160a4575691a536a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Sep 5 14:11:43 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Sep 7 15:22:11 2020 +0200

    improve debug for erased SkiaSalBitmap
    
    Change-Id: I1e1edafc7b9daf5748e22846ca5807613f779b2d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102167
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index f834478be51a..d2599d3e98b5 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -121,10 +121,14 @@ private:
             return stream << "(null)";
         // I/i - has SkImage (on GPU/CPU),
         // A/a - has alpha SkImage (on GPU/CPU)
-        return stream << static_cast<const void*>(bitmap) << " " << bitmap->GetSize() << "/"
-                      << (bitmap->mImage ? (bitmap->mImage->isTextureBacked() ? "I" : "i") : "")
-                      << (bitmap->mAlphaImage ? (bitmap->mAlphaImage->isTextureBacked() ? "A" : "a")
-                                              : "");
+        stream << static_cast<const void*>(bitmap) << " " << bitmap->GetSize() << "/";
+        if (bitmap->mImage)
+            stream << (bitmap->mImage->isTextureBacked() ? "I" : "i");
+        if (bitmap->mAlphaImage)
+            stream << (bitmap->mAlphaImage->isTextureBacked() ? "A" : "a");
+        if (bitmap->mEraseColorSet)
+            stream << "E" << bitmap->mEraseColor;
+        return stream;
     }
 
     BitmapPalette mPalette;
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index ec91417cdf1b..83b807e87b15 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -204,12 +204,14 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode nMode)
             if (!mBuffer)
                 return nullptr;
             assert(mPixelsSize == mSize);
+            assert(!mEraseColorSet);
             break;
         case BitmapAccessMode::Read:
             EnsureBitmapData();
             if (!mBuffer)
                 return nullptr;
             assert(mPixelsSize == mSize);
+            assert(!mEraseColorSet);
             break;
         case BitmapAccessMode::Info:
             break;