summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-07-01 14:55:08 +0200
committerCaolán McNamara <caolanm@redhat.com>2020-07-02 20:46:38 +0200
commitbbcc31c7261daba266b31a8d7d58fe0c1c87febe (patch)
tree032a04e919c0e84ad0174cae56d1499e1118124e
parentc88186145cb2c16a0e32bcdaab523a656a50edb9 (diff)
Revert "implement Skia workaround for ... (tdf#133016)" (tdf#134346)
The workaround breaks a valid use in tdf#134346, so the original problem will need to be handled differently. Change-Id: I1560ef5714a90f1d170341c1b716010a0eb5aafc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97723 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 556c2a41a5114a8a366cd68e3112e7d3a594b45b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97680 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/skia/gdiimpl.cxx18
1 files changed, 0 insertions, 18 deletions
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 78aa2c4c39fe..11b59d30d8ed 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -708,24 +708,6 @@ bool SkiaSalGraphicsImpl::drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectTo
aPaint.setColor(toSkColorWithTransparency(mFillColor, fTransparency));
aPaint.setStyle(SkPaint::kFill_Style);
getDrawCanvas()->drawPath(aPath, aPaint);
- // There is some code that needlessly subdivides areas into adjacent rectangles,
- // but Skia doesn't line them up perfectly if AA is enabled (e.g. Cairo, Qt5 do,
- // but Skia devs claim it's working as intended
- // https://groups.google.com/d/msg/skia-discuss/NlKpD2X_5uc/Vuwd-kyYBwAJ).
- // An example is tdf#133016, which triggers SvgStyleAttributes::add_stroke()
- // implementing a line stroke as a bunch of polygons instead of just one, and
- // SvgLinearAtomPrimitive2D::create2DDecomposition() creates a gradient
- // as a series of polygons of gradually changing color. Those places should be
- // changed, but for now explicitly draw the polygon outline in these cases,
- // which will fill the holes between polygons left by AA.
- // TODO: If fTransparency != 0 then this will draw some pixels twice, if that
- // is a problem then this can be handled by drawing to a temporary surface
- // and drawing that using the given transparency.
- if (mParent.getAntiAliasB2DDraw() && mLineColor == SALCOLOR_NONE)
- {
- aPaint.setStyle(SkPaint::kStroke_Style);
- getDrawCanvas()->drawPath(aPath, aPaint);
- }
}
if (mLineColor != SALCOLOR_NONE)
{