commit f55cb55d5b04a0cc599fa15eb028d0c768a2677e
author Lei Zhang <thestig@chromium.org> Tue Apr 23 16:34:43 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Apr 23 16:34:43 2019 +0000
tree 5bfaf786a90fcf6ccd6d13dc84b5e94a5a44b82d
parent 0f35a9ee0be19783496a143744ad247422941d0f

Roll third_party/skia/ 1383a38e1..e2aa08bf1 (1 commit)

https://chromium.googlesource.com/skia.git/+log/1383a38e1d92..e2aa08bf199d

Stop using legacy enums.

Created with:
  roll-dep third_party/skia

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

DEPS

diff --git a/DEPS b/DEPS
index 401c166..f45dc7f 100644
--- a/DEPS
+++ b/DEPS
@@ -28,7 +28,7 @@
   'jpeg_turbo_revision': '2de84a43e683c2c3c8ff4922da16b9053f024144',
   'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
   'pdfium_tests_revision': '5a68e87859476eb75d3e068bd406c4921a6be8e2',
-  'skia_revision': '1383a38e1d92fb70d94185b454daa6c1afecc6a0',
+  'skia_revision': 'e2aa08bf199db33f58da5f17c43d8efd95be8c09',
   '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 11f7a47..6b9912b 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2052,9 +2052,9 @@
     float end_y = pCoords->GetNumberAt(3);
     SkPoint pts[] = {{start_x, start_y}, {end_x, end_y}};
     skMatrix.mapPoints(pts, SK_ARRAY_COUNT(pts));
-    paint.setShader(SkGradientShader::MakeLinear(
-        pts, skColors.begin(), skPos.begin(), skColors.count(),
-        SkShader::kClamp_TileMode));
+    paint.setShader(
+        SkGradientShader::MakeLinear(pts, skColors.begin(), skPos.begin(),
+                                     skColors.count(), SkTileMode::kClamp));
     if (clipStart || clipEnd) {
       // if the gradient is horizontal or vertical, modify the draw rectangle
       if (pts[0].fX == pts[1].fX) {  // vertical
@@ -2096,7 +2096,7 @@
 
     paint.setShader(SkGradientShader::MakeTwoPointConical(
         pts[0], start_r, pts[1], end_r, skColors.begin(), skPos.begin(),
-        skColors.count(), SkShader::kClamp_TileMode));
+        skColors.count(), SkTileMode::kClamp));
     if (clipStart || clipEnd) {
       if (clipStart && start_r)
         skClip.addCircle(pts[0].fX, pts[0].fY, start_r);
@@ -2504,10 +2504,10 @@
                  &paint);
   sk_sp<SkImage> skSrc = SkImage::MakeFromBitmap(skBitmap);
   sk_sp<SkShader> skSrcShader =
-      skSrc->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
+      skSrc->makeShader(SkTileMode::kClamp, SkTileMode::kClamp);
   sk_sp<SkImage> skMaskImage = SkImage::MakeFromBitmap(skMask);
-  sk_sp<SkShader> skMaskShader = skMaskImage->makeShader(
-      SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
+  sk_sp<SkShader> skMaskShader =
+      skMaskImage->makeShader(SkTileMode::kClamp, SkTileMode::kClamp);
   paint.setShader(SkShader::MakeComposeShader(skMaskShader, skSrcShader,
                                               SkBlendMode::kSrcIn));
   SkRect r = {0, 0, SkIntToScalar(srcWidth), SkIntToScalar(srcHeight)};