commit 67f96e7e43725b44643ce241c472742bb1dc18e8
author Luboš Luňák <l.lunak@collabora.com> Thu Aug 20 16:25:00 2020 +0200
committer Caolán McNamara <caolanm@redhat.com> Fri Aug 21 16:42:09 2020 +0200
tree d5697cc4ad695576a4dc495ec7de54fa98ec59a2
parent fe5b6ed3fc5d6f4317542ec5237a78d7f735f0b8

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@collabora.com>
(cherry picked from commit 600ff56010f5297cab7faf4bc44ae29dfb404d2f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101065
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

vcl/skia/gdiimpl.cxx

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index b27ef0c..5efab1f 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,