diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-12-06 12:26:00 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-12-12 11:01:41 +0100 |
| commit | 23b3de0b9a6cb69ed258905effa096ce5d5f1f13 (patch) | |
| tree | efcd2dba24db226c27c16ed338e7919e782f2df5 /vcl | |
| parent | d32be257ca011316281edf2752564a421e3747a3 (diff) | |
update Skia to chrome/m80
Change-Id: I26782c8bd3d8ce34cbf7ce5a00b884436d37cb85
Reviewed-on: https://gerrit.libreoffice.org/84617
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/skia/gdiimpl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index c081be975657..ff700c5f0362 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -355,7 +355,7 @@ static SkRegion toSkRegion(const vcl::Region& region) { SkPath path; addPolyPolygonToPath(region.GetAsB2DPolyPolygon(), path); - path.setFillType(SkPath::kEvenOdd_FillType); + path.setFillType(SkPathFillType::kEvenOdd); SkRegion skRegion; skRegion.setPath(path, SkRegion(path.getBounds().roundOut())); return skRegion; @@ -395,7 +395,7 @@ bool SkiaSalGraphicsImpl::setClipRegion(const vcl::Region& region) { SkPath path; addPolyPolygonToPath(region.GetAsB2DPolyPolygon(), path); - path.setFillType(SkPath::kEvenOdd_FillType); + path.setFillType(SkPathFillType::kEvenOdd); canvas->clipPath(path); } else @@ -586,7 +586,7 @@ bool SkiaSalGraphicsImpl::drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectTo SAL_INFO("vcl.skia", "drawpolypolygon(" << this << "): " << aPolyPolygon << ":" << mLineColor << ":" << mFillColor); addPolyPolygonToPath(aPolyPolygon, aPath); - aPath.setFillType(SkPath::kEvenOdd_FillType); + aPath.setFillType(SkPathFillType::kEvenOdd); SkPaint aPaint; aPaint.setAntiAlias(mParent.getAntiAliasB2DDraw()); @@ -685,7 +685,7 @@ bool SkiaSalGraphicsImpl::drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDev SkPath aPath; addPolygonToPath(aPolyLine, aPath); - aPath.setFillType(SkPath::kEvenOdd_FillType); + aPath.setFillType(SkPathFillType::kEvenOdd); // Apply the same adjustment as toSkX()/toSkY() do. Do it here even in the non-GPU // case as it seems to produce better results. aPath.offset(0.5, 0.5, nullptr); @@ -878,7 +878,7 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon const& rPoly, SalInvert eFl { SkPath aPath; addPolygonToPath(rPoly, aPath); - aPath.setFillType(SkPath::kEvenOdd_FillType); + aPath.setFillType(SkPathFillType::kEvenOdd); // TrackFrame is not supposed to paint outside of the polygon (usually rectangle), // but wider stroke width usually results in that, so ensure the requirement // by clipping. @@ -898,7 +898,7 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon const& rPoly, SalInvert eFl { SkPath aPath; addPolygonToPath(rPoly, aPath); - aPath.setFillType(SkPath::kEvenOdd_FillType); + aPath.setFillType(SkPathFillType::kEvenOdd); SkPaint aPaint; aPaint.setColor(SkColorSetARGB(255, 255, 255, 255)); aPaint.setStyle(SkPaint::kFill_Style); |