[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 67f96e7e43725b44643ce241c472742bb1dc18e8
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Aug 20 16:25:00 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 21 16:42:09 2020 +0200

    fix setting clip region for new Skia graphics objects (tdf#135487)
    
    Set the clip region only after possibly creating the surface, because
    creating the surface sets the default clip region.
    
    Change-Id: I2c344397336fa487f55553f49e40704ef05b2100
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101077
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 600ff56010f5297cab7faf4bc44ae29dfb404d2f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101065
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index b27ef0c7f488..5efab1faaf3d 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -406,8 +406,8 @@ bool SkiaSalGraphicsImpl::setClipRegion(const vcl::Region& region)
         return true;
     SkiaZone zone;
     checkPendingDrawing();
-    mClipRegion = region;
     checkSurface();
+    mClipRegion = region;
     SAL_INFO("vcl.skia.trace", "setclipregion(" << this << "): " << region);
     SkCanvas* canvas = mSurface->getCanvas();
     // SkCanvas::clipRegion() can only further reduce the clip region,