From f1ed018784aff190260cbffe7ebad9cea99f148a Mon Sep 17 00:00:00 2001
From: skia-flutter-autoroll
 <37626415+skia-flutter-autoroll@users.noreply.github.com>
Date: Fri, 21 Sep 2018 14:33:17 -0400
Subject: [PATCH] Roll src/third_party/skia d842557c0724..c25f440d537e (10
 commits) (flutter/engine#6304)

https://skia.googlesource.com/skia.git/+log/d842557c0724..c25f440d537e


Created with:
  gclient setdep -r src/third_party/skia@c25f440d537e

The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
---
 DEPS                                              |  2 +-
 .../src/flutter/ci/licenses_golden/licenses_skia  | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/DEPS b/DEPS
index f34d56b22ad..1c05bd6dea6 100644
--- a/DEPS
+++ b/DEPS
@@ -23,7 +23,7 @@ vars = {
   'fuchsia_git': 'https://fuchsia.googlesource.com',
   'github_git': 'https://github.com',
   'skia_git': 'https://skia.googlesource.com',
-  'skia_revision': 'd842557c07246546ff15aede9d3b4e078c62b7e4',
+  'skia_revision': 'c25f440d537e40d9fdd4f2123d86a77645d87aeb',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
diff --git a/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia
index 54196859863..e4b9ec8033a 100644
--- a/engine/src/flutter/ci/licenses_golden/licenses_skia
+++ b/engine/src/flutter/ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
-Signature: fdd070809577c4d1926fd0176c8dee74
+Signature: 69298134a1579dc05008e1521a499ac3
 
 UNUSED LICENSES:
 
@@ -723,6 +723,12 @@ FILE: ../../../third_party/skia/bench/StreamBench.cpp
 FILE: ../../../third_party/skia/bench/SwizzleBench.cpp
 FILE: ../../../third_party/skia/bench/TileImageFilterBench.cpp
 FILE: ../../../third_party/skia/bench/VertexColorSpaceBench.cpp
+FILE: ../../../third_party/skia/experimental/pipe/SkPipe.h
+FILE: ../../../third_party/skia/experimental/pipe/SkPipeCanvas.cpp
+FILE: ../../../third_party/skia/experimental/pipe/SkPipeCanvas.h
+FILE: ../../../third_party/skia/experimental/pipe/SkPipeFormat.h
+FILE: ../../../third_party/skia/experimental/pipe/SkPipeReader.cpp
+FILE: ../../../third_party/skia/experimental/pipe/SkRefSet.h
 FILE: ../../../third_party/skia/experimental/svg/model/SkPEG.h
 FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttribute.cpp
 FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttribute.h
@@ -1000,7 +1006,6 @@ FILE: ../../../third_party/skia/src/core/SkOverdrawCanvas.cpp
 FILE: ../../../third_party/skia/src/core/SkPM4f.h
 FILE: ../../../third_party/skia/src/core/SkPM4fPriv.h
 FILE: ../../../third_party/skia/src/core/SkPathMeasurePriv.h
-FILE: ../../../third_party/skia/src/core/SkPipe.h
 FILE: ../../../third_party/skia/src/core/SkRasterPipeline.cpp
 FILE: ../../../third_party/skia/src/core/SkRasterPipeline.h
 FILE: ../../../third_party/skia/src/core/SkRasterPipelineBlitter.cpp
@@ -1134,11 +1139,6 @@ FILE: ../../../third_party/skia/src/pdf/SkPDFDocumentPriv.h
 FILE: ../../../third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
 FILE: ../../../third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h
 FILE: ../../../third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h
-FILE: ../../../third_party/skia/src/pipe/SkPipeCanvas.cpp
-FILE: ../../../third_party/skia/src/pipe/SkPipeCanvas.h
-FILE: ../../../third_party/skia/src/pipe/SkPipeFormat.h
-FILE: ../../../third_party/skia/src/pipe/SkPipeReader.cpp
-FILE: ../../../third_party/skia/src/pipe/SkRefSet.h
 FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface.cpp
 FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp
 FILE: ../../../third_party/skia/src/ports/SkImageGeneratorCG.cpp
@@ -1608,6 +1608,7 @@ FILE: ../../../third_party/skia/src/utils/Sk3D.cpp
 FILE: ../../../third_party/skia/src/utils/SkJSON.cpp
 FILE: ../../../third_party/skia/src/utils/SkJSON.h
 FILE: ../../../third_party/skia/src/utils/SkTextOnPath.cpp
+FILE: ../../../third_party/skia/src/utils/mac/SkUniqueCFRef.h
 FILE: ../../../third_party/skia/src/utils/win/SkDWriteNTDDI_VERSION.h
 FILE: ../../../third_party/skia/third_party/skcms/skcms.cc
 FILE: ../../../third_party/skia/third_party/skcms/skcms.h