diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-02-07 21:11:59 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-02-08 13:29:56 +0100 |
| commit | 0a76b8ebbaf934faad27ddb3a4e951b9c743e536 (patch) | |
| tree | 732574df9b4e1e46e08c2b266586c9ebb412bf25 /vcl/skia | |
| parent | 4566aae83ca69a69aa22590d9359a9b6ea8b7ccb (diff) | |
Revert "update Skia to chrome/m89" (tdf#140023)
That update started using SkSamplingOptions to specify image scaling
quality. Some places using SkImage::makeShader() should use
the quality instead of default SkSamplingOptions ctor, but even with that
fix the test document still uses the default nearest quality. Since
chrome/m90 will introduce further changes related to this, I'll just
revert to m88 and revisit this with m90.
This reverts commit 2cf9b8e265e9694803f55e30f2f392abfa512a5a.
Change-Id: Iea0e57b7e7b804675d393e4088532a6f617bfd43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110541
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, 4 insertions, 6 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index 767428fa4339..b2da1e4b1ef8 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -606,8 +606,7 @@ 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, SkSamplingOptions())); + paint.setShader(bitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat)); surface->getCanvas()->drawPaint(paint); } diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index b2c6598edea4..f9fdfcaa1300 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -1473,8 +1473,7 @@ 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, SkSamplingOptions())); + aPaint.setShader(aBitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat)); } if (!intelHack) getDrawCanvas()->drawPath(aPath, aPaint); diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx index a8d4acc7bc27..70405e2b5111 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(SkSamplingOptions()); + return GetSkImage()->makeShader(); } sk_sp<SkShader> SkiaSalBitmap::GetAlphaSkShader() const { if (mEraseColorSet) return SkShaders::Color(fromEraseColorToAlphaImageColor(mEraseColor)); - return GetAlphaSkImage()->makeShader(SkSamplingOptions()); + return GetAlphaSkImage()->makeShader(); } bool SkiaSalBitmap::IsFullyOpaqueAsAlpha() const |