commit 723f27a7451a2d2448c3b3313c63bde887c4db94
author Lei Zhang <thestig@chromium.org> Wed Apr 24 21:19:45 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Apr 24 21:19:45 2019 +0000
tree 84f5ea7e8aab0b03bae125c7aee922a3b9785411
parent 960c5e3b8a5a0ed9540b4fd5e665e8326068fa80

Roll third_party/skia/ c8bea7deb..442973874 (1 commit)

https://chromium.googlesource.com/skia.git/+log/c8bea7deb6cc..442973874c7f

Switch away from SkColorFilter::MakeModeFilter().

Created with:
  roll-dep third_party/skia

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

DEPS

diff --git a/DEPS b/DEPS
index 3a9dcdb..b3e23ed 100644
--- a/DEPS
+++ b/DEPS
@@ -28,7 +28,7 @@
   'jpeg_turbo_revision': '2de84a43e683c2c3c8ff4922da16b9053f024144',
   'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
   'pdfium_tests_revision': '5a68e87859476eb75d3e068bd406c4921a6be8e2',
-  'skia_revision': 'c8bea7deb6cc4bfb2a2fb317f2ee48578a245a92',
+  'skia_revision': '442973874c7fcb33e3a426df9646dce9f3b4b435',
   '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 6b9912b..c6ce09b 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -569,10 +569,9 @@
                     BlendMode blend_type,
                     SkPaint* paint) {
   paint->setAntiAlias(true);
-  if (isAlphaMask) {
-    paint->setColorFilter(
-        SkColorFilter::MakeModeFilter(argb, SkBlendMode::kSrc));
-  }
+  if (isAlphaMask)
+    paint->setColorFilter(SkColorFilters::Blend(argb, SkBlendMode::kSrc));
+
   // paint->setFilterQuality(kHigh_SkFilterQuality);
   paint->setBlendMode(GetSkiaBlendMode(blend_type));
   paint->setAlpha(bitmap_alpha);