diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-09-05 14:11:43 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-09-07 15:22:11 +0200 |
| commit | 76babdeaf2e419d2aa21d674160a4575691a536a (patch) | |
| tree | 315d19040a0b2e9e9e2d9f50a46e1744fca6aab4 /vcl | |
| parent | acb47f7aaaec14baccc0f3233670044e72342d29 (diff) | |
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@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/skia/salbmp.hxx | 12 | ||||
| -rw-r--r-- | vcl/skia/salbmp.cxx | 2 |
2 files changed, 10 insertions, 4 deletions
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; |