commit 93b7982bcb11952ee559949eec1084c3e57414b5
author Lei Zhang <thestig@chromium.org> Thu Apr 25 14:16:02 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Apr 25 14:16:02 2019 +0000
tree 4f4b4798132ba502e53858bc994d731b61b9abe8
parent d646476d0048c875a18c1ade3ace949340f5f778

Roll third_party/skia/ 2655ede7c..b5c685991 (1 commit)

https://chromium.googlesource.com/skia.git/+log/2655ede7c9f9..b5c685991faa

Switch away from SkShader::MakeComposeShader().

Created with:
  roll-dep third_party/skia

Change-Id: I32cbd5c75803641ca0867f5beb811776d4942f2f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/53531
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index a57b325..aeff0c6 100644
--- a/DEPS
+++ b/DEPS
@@ -28,7 +28,7 @@
   'jpeg_turbo_revision': '2de84a43e683c2c3c8ff4922da16b9053f024144',
   'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
   'pdfium_tests_revision': '5a68e87859476eb75d3e068bd406c4921a6be8e2',
-  'skia_revision': '2655ede7c9f92f0dc5fe000be3ad586eb742c88c',
+  'skia_revision': 'b5c685991faa79d6ac5caeacd48644eca4954426',
   'tools_memory_revision': 'f7b00daf4df7f6c469f5fbc68d7f40f6bd15d6e6',
   'trace_event_revision': '936ba8a963284a6b3737cf2f0474a7131073abee',
   'v8_revision': '93306f1d7b2c10824e1e8876e5b8a3ab37c42b96',

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 c6ce09b..d246b6a 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2507,8 +2507,8 @@
   sk_sp<SkImage> skMaskImage = SkImage::MakeFromBitmap(skMask);
   sk_sp<SkShader> skMaskShader =
       skMaskImage->makeShader(SkTileMode::kClamp, SkTileMode::kClamp);
-  paint.setShader(SkShader::MakeComposeShader(skMaskShader, skSrcShader,
-                                              SkBlendMode::kSrcIn));
+  paint.setShader(
+      SkShaders::Blend(SkBlendMode::kSrcIn, skMaskShader, skSrcShader));
   SkRect r = {0, 0, SkIntToScalar(srcWidth), SkIntToScalar(srcHeight)};
   m_pCanvas->drawRect(r, paint);
   m_pCanvas->restore();