commit 096645cee201c4cbc2ca04cb23e3b2e1b6173867
author Lei Zhang <thestig@chromium.org> Sat Dec 07 02:58:22 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Dec 07 02:58:22 2019 +0000
tree fad3c7be9077b1a2410112b92624396784d914d0
parent b99e55f5da35feb7c14a13abb29bfe73942f262e

Roll third_party/skia/ 17096c763..7d34dc774 (1 commit)

https://chromium.googlesource.com/skia.git/+log/17096c763c24..7d34dc7747a8

Switch from SkPath::FillType to SkPathFillType.

Created with help from:
  roll-dep third_party/skia

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

DEPS

diff --git a/DEPS b/DEPS
index f580af6..97f2ac0 100644
--- a/DEPS
+++ b/DEPS
@@ -28,7 +28,7 @@
   'jpeg_turbo_revision': 'bc13578529255ec75005ffc98aae151666122892',
   'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
   'pdfium_tests_revision': '02dd653ec62649b6f1aa4e4526071cc32d903f54',
-  'skia_revision': '17096c763c24816e6b299c1f8d652cad86f38c00',
+  'skia_revision': '7d34dc7747a8f4ede89babc6052222e35d5b22e7',
   'tools_memory_revision': 'f7b00daf4df7f6c469f5fbc68d7f40f6bd15d6e6',
   'trace_event_revision': '5e4fce17a9d2439c44a7b57ceecef6df9287ec2f',
   'v8_revision': 'a423bb8be61832d0349150cb286fcadeb65192fc',

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 d7ce582..ad42393 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -300,14 +300,14 @@
   return GetAlternateOrWindingFillMode(fill_mode) == FXFILL_ALTERNATE;
 }
 
-SkPath::FillType GetAlternateOrWindingFillType(int fill_mode) {
-  return IsAlternateFillMode(fill_mode) ? SkPath::kEvenOdd_FillType
-                                        : SkPath::kWinding_FillType;
+SkPathFillType GetAlternateOrWindingFillType(int fill_mode) {
+  return IsAlternateFillMode(fill_mode) ? SkPathFillType::kEvenOdd
+                                        : SkPathFillType::kWinding;
 }
 
-bool IsEvenOddFillType(SkPath::FillType fill) {
-  return fill == SkPath::kEvenOdd_FillType ||
-         fill == SkPath::kInverseEvenOdd_FillType;
+bool IsEvenOddFillType(SkPathFillType fill) {
+  return fill == SkPathFillType::kEvenOdd ||
+         fill == SkPathFillType::kInverseEvenOdd;
 }
 
 SkPath BuildPath(const CFX_PathData* pPathData) {
@@ -2225,7 +2225,7 @@
       if (clipEnd)
         skClip.addCircle(pts[1].fX, pts[1].fY, end_r, SkPathDirection::kCCW);
       else
-        skClip.setFillType(SkPath::kInverseWinding_FillType);
+        skClip.setFillType(SkPathFillType::kInverseWinding);
       skClip.transform(skMatrix);
     }
     SkMatrix inverse;