diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2021-01-18 19:38:03 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2021-01-20 11:55:23 +0100 |
commit | 2cf9b8e265e9694803f55e30f2f392abfa512a5a (patch) | |
tree | 70bba59e111d3ed1692ed970b392384273075343 /vcl/skia | |
parent | 644f9abce55878e27292451b9b2c8d3b6e11104e (diff) |
update Skia to chrome/m89
Change-Id: I82517728139a4b270d98e2694f2a21b248c80d4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109568
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/skia')
-rw-r--r-- | vcl/skia/SkiaHelper.cxx | 3 | ||||
-rw-r--r-- | vcl/skia/gdiimpl.cxx | 3 | ||||
-rw-r--r-- | vcl/skia/salbmp.cxx | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index b2da1e4b1ef8..767428fa4339 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -606,7 +606,8 @@ void prefillSurface(const sk_sp<SkSurface>& surface) bitmap.setImmutable(); SkPaint paint; paint.setBlendMode(SkBlendMode::kSrc); // set as is, including alpha - paint.setShader(bitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat)); + paint.setShader( + bitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, SkSamplingOptions())); surface->getCanvas()->drawPaint(paint); } diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index f9fdfcaa1300..b2c6598edea4 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -1473,7 +1473,8 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon const& rPoly, SalInvert eFl aBitmap.setImmutable(); // The bitmap is repeated in both directions the checker pattern is as big // as the polygon (usually rectangle) - aPaint.setShader(aBitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat)); + aPaint.setShader( + aBitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, SkSamplingOptions())); } if (!intelHack) getDrawCanvas()->drawPath(aPath, aPaint); diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx index 70405e2b5111..a8d4acc7bc27 100644 --- a/vcl/skia/salbmp.cxx +++ b/vcl/skia/salbmp.cxx @@ -896,14 +896,14 @@ sk_sp<SkShader> SkiaSalBitmap::GetSkShader() const { if (mEraseColorSet) return SkShaders::Color(toSkColor(mEraseColor)); - return GetSkImage()->makeShader(); + return GetSkImage()->makeShader(SkSamplingOptions()); } sk_sp<SkShader> SkiaSalBitmap::GetAlphaSkShader() const { if (mEraseColorSet) return SkShaders::Color(fromEraseColorToAlphaImageColor(mEraseColor)); - return GetAlphaSkImage()->makeShader(); + return GetAlphaSkImage()->makeShader(SkSamplingOptions()); } bool SkiaSalBitmap::IsFullyOpaqueAsAlpha() const |