generic Skia workaround for VCL sending empty size (tdf#140288)
There have already been commits to handle this, but the case
of getting the wrong size the first was still broken (or was
fixed in the past and got broken again). Try to be generic
by forcing these to be always considered to be offscreen
and force non-zero size there.
Change-Id: Ie366a296f7f6645333630fa31e9fe18d54c7fba8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111528
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 9d8c04d2d5529626d649af3fcebb6d4b65193b28)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111711
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 21305ff47a1bee1fa4787bf792fb3ecdb10d4863)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111782
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index ca227e4..057adf4 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -229,7 +229,7 @@
void checkSurface();
void destroySurface();
// Reimplemented for X11.
virtual bool avoidRecreateByResize() const { return false; }
virtual bool avoidRecreateByResize() const;
void createWindowSurface(bool forceRaster = false);
virtual void createWindowContext(bool forceRaster = false) = 0;
void createOffscreenSurface();
@@ -239,7 +239,7 @@
void setProvider(SalGeometryProvider* provider) { mProvider = provider; }
bool isOffscreen() const { return mProvider == nullptr || mProvider->IsOffScreen(); }
bool isOffscreen() const;
bool isGPU() const { return mIsGPU; }
void invert(basegfx::B2DPolygon const& rPoly, SalInvert eFlags);
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index bd497d7f..946663c 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -311,14 +311,24 @@
#endif
}
bool SkiaSalGraphicsImpl::isOffscreen() const
{
if (mProvider == nullptr || mProvider->IsOffScreen())
return true;
// HACK: Sometimes (tdf#131939, tdf#138022, tdf#140288) VCL passes us a zero-sized window,
// and zero size is invalid for Skia, so force offscreen surface, where we handle this.
if (GetWidth() <= 0 || GetHeight() <= 0)
return true;
return false;
}
void SkiaSalGraphicsImpl::createOffscreenSurface()
{
SkiaZone zone;
assert(isOffscreen());
assert(!mSurface);
assert(!mWindowContext);
// When created (especially on Windows), Init() gets called with size (0,0), which is invalid size
// for Skia. May happen also in rare cases such as shutting down (tdf#131939).
// HACK: See isOffscreen().
int width = std::max(1, GetWidth());
int height = std::max(1, GetHeight());
switch (SkiaHelper::renderMethodToUse())
@@ -428,17 +438,7 @@
}
else if (GetWidth() != mSurface->width() || GetHeight() != mSurface->height())
{
if (avoidRecreateByResize())
return;
if (!GetWidth() || !GetHeight())
{
SAL_WARN("vcl.skia", "recreate(" << this << "): can't create empty surface "
<< Size(GetWidth(), GetHeight())
<< " => keeping old one!");
return;
}
if (!avoidRecreateByResize())
{
Size oldSize(mSurface->width(), mSurface->height());
// Recreating a surface means that the old SkSurface contents will be lost.
@@ -471,6 +471,14 @@
}
}
bool SkiaSalGraphicsImpl::avoidRecreateByResize() const
{
// Keep the old surface if VCL sends us a broken size (see isOffscreen()).
if (GetWidth() == 0 || GetHeight() == 0)
return true;
return false;
}
void SkiaSalGraphicsImpl::flushDrawing()
{
if (!mSurface)
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index a4cbe06..3b5249b 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -39,6 +39,7 @@
{
SkiaZone zone;
sk_app::DisplayParams displayParams;
assert(GetWidth() > 0 && GetHeight() > 0);
switch (forceRaster ? SkiaHelper::RenderRaster : SkiaHelper::renderMethodToUse())
{
case SkiaHelper::RenderRaster:
diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 1602218..c3b0e81 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -97,6 +97,8 @@
bool X11SkiaSalGraphicsImpl::avoidRecreateByResize() const
{
if (SkiaSalGraphicsImpl::avoidRecreateByResize())
return true;
if (!mSurface || isOffscreen())
return false;
// Skia's WindowContext uses actual dimensions of the X window, which due to X11 being
