Update skia to e038489a743d6c0ab1cb208862c305180815bc8e. (#3074)

DEPS

@@ -23,7 +23,7 @@ vars = {
   'github_git': 'https://github.com',
   'mojo_sdk_revision': '6b5fb1227c742f5ecc077486ebc029f2711c61fa',
   'base_revision': '75e70c3387cf327702a0533e93bc480446da0806',
-  'skia_revision': '5561e3ddbbf6c3e051075ada4a11ddc70760f03d',
+  'skia_revision': 'e038489a743d6c0ab1cb208862c305180815bc8e',
 
   # Note: When updating the Dart revision, ensure that all entries that are
   # dependencies of dart are also updated

flow/layers/clip_rrect_layer.cc

@@ -21,7 +21,7 @@ void ClipRRectLayer::Paint(PaintContext& context) {
   TRACE_EVENT0("flutter", "ClipRRectLayer::Paint");
   SkAutoCanvasRestore save(&context.canvas, false);
   context.canvas.saveLayer(&paint_bounds(), nullptr);
-  context.canvas.clipRRect(clip_rrect_, SkRegion::kIntersect_Op, true);
+  context.canvas.clipRRect(clip_rrect_, kIntersect_SkClipOp, true);
   PaintChildren(context);
 }
 

shell/common/diagnostic/diagnostic_server.cc

@@ -135,7 +135,7 @@ void DiagnosticServer::SkiaPictureTask(Dart_Port port_id) {
   SkDynamicMemoryWStream stream;
   PngPixelSerializer serializer;
   picture->serialize(&stream, &serializer);
-  SkAutoTUnref<SkData> picture_data(stream.copyToData());
+  sk_sp<SkData> picture_data(stream.snapshotAsData());
 
   Dart_CObject c_object;
   c_object.type = Dart_CObject_kTypedData;

skia/BUILD.gn

@@ -7,7 +7,10 @@ if (is_fuchsia) {
 group("skia") {
   # TODO(abarth): Switch the non-Fuchsia build over to using Skia's BUILD.gn
   # files as well.
-  public_deps = [ "//third_party/skia" ]
+  public_deps = [
+    "//third_party/skia",
+    "//third_party/skia:gpu",
+  ]
 }
 
 } else {
@@ -22,18 +25,6 @@ if (current_cpu == "mipsel" || current_cpu == "mips64el") {
   import("//build/config/mips.gni")
 }
 
-# The list of Skia defines that are to be set for chromium.
-gypi_skia_defines =
-    exec_script("//build/gypi_to_gn.py",
-                [
-                  rebase_path(
-                      "//third_party/skia/gyp/skia_for_chromium_defines.gypi"),
-                  "--replace=<(skia_include_path)=//third_party/skia/include",
-                  "--replace=<(skia_src_path)=//third_party/skia/src",
-                ],
-                "scope",
-                [ "//third_party/skia/gyp/skia_for_chromium_defines.gypi" ])
-
 # The list of Skia core sources that are to be set for chromium.
 gypi_skia_core =
     exec_script("//build/gypi_to_gn.py",
@@ -67,16 +58,14 @@ gypi_skia_effects =
                 "scope",
                 [ "//third_party/skia/gyp/effects.gypi" ])
 
-# The list of Skia utils that are to be set for chromium.
-gypi_skia_utils =
+gypi_skia_sources =
     exec_script("//build/gypi_to_gn.py",
                 [
-                  rebase_path("//third_party/skia/gyp/utils.gypi"),
-                  "--replace=<(skia_include_path)=//third_party/skia/include",
-                  "--replace=<(skia_src_path)=//third_party/skia/src",
+                  rebase_path("//third_party/skia/gyp/skia_sources.gypi"),
+                  "--replace=..=//third_party/skia",
                 ],
                 "scope",
-                [ "//third_party/skia/gyp/utils.gypi" ])
+                [ "//third_party/skia/gyp/skia_sources.gypi" ])
 
 gypi_skia_opts =
     exec_script("//build/gypi_to_gn.py",
@@ -134,9 +123,7 @@ config("skia_library_config") {
     include_dirs += [ "//third_party/skia/include/utils/ios" ]
   }
 
-  defines = gypi_skia_defines.skia_for_chromium_defines
-
-  defines += [ "SK_SUPPORT_GPU=1" ]
+  defines = [ "SK_SUPPORT_GPU=1" ]
 
   # Supported codecs.
   defines += [
@@ -242,7 +229,7 @@ component("skia") {
   # The skia gypi values are relative to the skia_dir, so we need to rebase.
   sources += gypi_skia_core.sources
   sources += gypi_skia_effects.sources
-  sources += gypi_skia_utils.sources
+  sources += gypi_skia_sources.utils_sources
 
   sources += [
     "//third_party/skia/src/codec/SkAndroidCodec.cpp",
@@ -269,6 +256,7 @@ component("skia") {
     "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
     "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
     "//third_party/skia/src/ports/SkDiscardableMemory_none.cpp",
+    "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
     "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
     "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
     "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
@@ -422,6 +410,7 @@ component("skia") {
 
   if (!is_linux) {
     sources -= [
+      "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
       "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",

sky/engine/platform/graphics/GraphicsContext.cpp

@@ -1076,13 +1076,13 @@ void GraphicsContext::strokeEllipse(const FloatRect& ellipse)
     drawOval(ellipse, immutableState()->strokePaint());
 }
 
-void GraphicsContext::clipRoundedRect(const RoundedRect& rect, SkRegion::Op regionOp)
+void GraphicsContext::clipRoundedRect(const RoundedRect& rect, SkClipOp clipOp)
 {
     if (contextDisabled())
         return;
 
     if (!rect.isRounded()) {
-        clipRect(rect.rect(), NotAntiAliased, regionOp);
+        clipRect(rect.rect(), NotAntiAliased, clipOp);
         return;
     }
 
@@ -1093,7 +1093,7 @@ void GraphicsContext::clipRoundedRect(const RoundedRect& rect, SkRegion::Op regi
     SkRRect r;
     r.setRectRadii(rect.rect(), radii);
 
-    clipRRect(r, AntiAliased, regionOp);
+    clipRRect(r, AntiAliased, clipOp);
 }
 
 void GraphicsContext::clipOut(const Path& pathToClip)
@@ -1142,7 +1142,7 @@ void GraphicsContext::clipOutRoundedRect(const RoundedRect& rect)
     if (contextDisabled())
         return;
 
-    clipRoundedRect(rect, SkRegion::kDifference_Op);
+    clipRoundedRect(rect, kDifference_SkClipOp);
 }
 
 void GraphicsContext::canvasClip(const Path& pathToClip, WindRule clipRule)
@@ -1161,7 +1161,7 @@ void GraphicsContext::canvasClip(const Path& pathToClip, WindRule clipRule)
     path.setFillType(previousFillType);
 }
 
-void GraphicsContext::clipRect(const SkRect& rect, AntiAliasingMode aa, SkRegion::Op op)
+void GraphicsContext::clipRect(const SkRect& rect, AntiAliasingMode aa, SkClipOp op)
 {
     if (contextDisabled())
         return;
@@ -1171,7 +1171,7 @@ void GraphicsContext::clipRect(const SkRect& rect, AntiAliasingMode aa, SkRegion
     m_canvas->clipRect(rect, op, aa == AntiAliased);
 }
 
-void GraphicsContext::clipPath(const SkPath& path, AntiAliasingMode aa, SkRegion::Op op)
+void GraphicsContext::clipPath(const SkPath& path, AntiAliasingMode aa, SkClipOp op)
 {
     if (contextDisabled())
         return;
@@ -1181,7 +1181,7 @@ void GraphicsContext::clipPath(const SkPath& path, AntiAliasingMode aa, SkRegion
     m_canvas->clipPath(path, op, aa == AntiAliased);
 }
 
-void GraphicsContext::clipRRect(const SkRRect& rect, AntiAliasingMode aa, SkRegion::Op op)
+void GraphicsContext::clipRRect(const SkRRect& rect, AntiAliasingMode aa, SkClipOp op)
 {
     if (contextDisabled())
         return;

sky/engine/platform/graphics/GraphicsContext.h

@@ -283,12 +283,12 @@ public:
 
     void clip(const IntRect& rect) { clipRect(rect); }
     void clip(const FloatRect& rect) { clipRect(rect); }
-    void clipRoundedRect(const RoundedRect&, SkRegion::Op = SkRegion::kIntersect_Op);
-    void clipOut(const IntRect& rect) { clipRect(rect, NotAntiAliased, SkRegion::kDifference_Op); }
+    void clipRoundedRect(const RoundedRect&, SkClipOp = kIntersect_SkClipOp);
+    void clipOut(const IntRect& rect) { clipRect(rect, NotAntiAliased, kDifference_SkClipOp); }
     void clipOutRoundedRect(const RoundedRect&);
     void clipPath(const Path&, WindRule = RULE_EVENODD);
     void clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias = true);
-    void clipRect(const SkRect&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
+    void clipRect(const SkRect&, AntiAliasingMode = NotAntiAliased, SkClipOp = kIntersect_SkClipOp);
 
     void drawText(const Font&, const TextRunPaintInfo&, const FloatPoint&);
     void drawEmphasisMarks(const Font&, const TextRunPaintInfo&, const AtomicString& mark, const FloatPoint&);
@@ -395,8 +395,8 @@ private:
 
 
     // SkCanvas wrappers.
-    void clipPath(const SkPath&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
-    void clipRRect(const SkRRect&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
+    void clipPath(const SkPath&, AntiAliasingMode = NotAntiAliased, SkClipOp = kIntersect_SkClipOp);
+    void clipRRect(const SkRRect&, AntiAliasingMode = NotAntiAliased, SkClipOp = kIntersect_SkClipOp);
     void concat(const SkMatrix&);
     void drawRRect(const SkRRect&, const SkPaint&);