commit 25c3d07be0373ff268298049dd1acf592461ea0c
author Alan Screen <awscreen@chromium.org> Thu Jan 21 00:32:43 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Jan 21 00:32:43 2021 +0000
tree e95575696cf4ca22528caff926fc5f37d6a693b6
parent 28d3912d285c007510245a41d7748654d39344fd

Roll third_party/skia/ ae95077db..81bfabeb1 (783 commits)

https://chromium.googlesource.com/skia.git/+log/ae95077db60b..81bfabeb18e6

Created with:
  roll-dep third_party/skia

Adjustments to makeShader() usage are based upon pattern from
https://skia.googlesource.com/skia/+/99c944647fccc67206fbfede479fddeab8c27576.

Change-Id: I99a1ec137f741215f65146963aed10184df5aa86
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/77452
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Alan Screen <awscreen@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index 649cea7..0a0567d 100644
--- a/DEPS
+++ b/DEPS
@@ -93,7 +93,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling skia
   # and whatever else without interference from each other.
-  'skia_revision': 'ae95077db60b455f972c66e1c0378918c6d42048',
+  'skia_revision': '81bfabeb18e661dcbd7f9920c14f02a53826c4e2',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling tools_memory
   # and whatever else without interference from each other.

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 7015aaa..b61e7ec 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2668,11 +2668,11 @@
     SetBitmapPaint(pSource->IsMask(), !m_FillOptions.aliased_path, 0xFFFFFFFF,
                    bitmap_alpha, blend_type, &paint);
     sk_sp<SkImage> skSrc = SkImage::MakeFromBitmap(skBitmap);
-    sk_sp<SkShader> skSrcShader =
-        skSrc->makeShader(SkTileMode::kClamp, SkTileMode::kClamp);
+    sk_sp<SkShader> skSrcShader = skSrc->makeShader(
+        SkTileMode::kClamp, SkTileMode::kClamp, SkSamplingOptions());
     sk_sp<SkImage> skMaskImage = SkImage::MakeFromBitmap(skMask);
-    sk_sp<SkShader> skMaskShader =
-        skMaskImage->makeShader(SkTileMode::kClamp, SkTileMode::kClamp);
+    sk_sp<SkShader> skMaskShader = skMaskImage->makeShader(
+        SkTileMode::kClamp, SkTileMode::kClamp, SkSamplingOptions());
     paint.setShader(
         SkShaders::Blend(SkBlendMode::kSrcIn, skMaskShader, skSrcShader));
     SkRect r = {0, 0, SkIntToScalar(srcWidth), SkIntToScalar(srcHeight)};