[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia

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

 vcl/skia/gdiimpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d54da282837d56027260bbdbca4c9f0d23d159bb
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Sep 8 17:48:26 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 9 17:19:13 2020 +0200

    allow xor mode with Skia drawTransformedBitmap() (tdf#136575)
    
    I thought this wouldn't make sense, but the document uses invert and
    then VclProcessor2D::RenderBitmapPrimitive2D(), which simply uses
    DrawTransformedBitmap() with its transformation data (which is
    a no-op I'd guess). Still, don't bother with the possibly complicated
    finding out the bounds, just invalidate the whole area.
    
    Change-Id: I309953338f11d1c1c90c684bf0314e60bc44a249
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102267
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 8821bd663ed75fb2c9706b102e1d6f8ccfcf00f5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102298
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 2cd92c5412ba..9fa79f498801 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1650,7 +1650,7 @@ bool SkiaSalGraphicsImpl::drawTransformedBitmap(const basegfx::B2DPoint& rNull,
             canvas->drawImage(rSkiaBitmap.GetSkImage(), 0, 0, &paint);
         }
     }
-    assert(!mXorMode);
+    addXorRegion(SkRect::MakeWH(GetWidth(), GetHeight())); // can't tell, use whole area
     postDraw();
     return true;
 }