Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

skia/ext/analysis_canvas.h

Index: skia/ext/analysis_canvas.h
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
index 6af139fd8a6545f7d4386f1a723df7cf8278db08..f21b8d02cf7933ec921027ffa0ba14662f2bb6dd 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDrawPictureCallback.h"
+#include "third_party/skia/include/core/SkPicture.h"
 
 namespace skia {
 
@@ -15,7 +15,8 @@ namespace skia {
 // (specified as a clip rectangle) of an SkPicture as the picture is
 // played back through it.
 // To use: play a picture into the canvas, and then check result.
-class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
+class SK_API AnalysisCanvas : public SkCanvas,
+    public SkPicture::AbortCallback {
  public:
   AnalysisCanvas(int width, int height);
   ~AnalysisCanvas() override;
@@ -26,8 +27,8 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
   void SetForceNotSolid(bool flag);
   void SetForceNotTransparent(bool flag);
 
-  // SkDrawPictureCallback override.
-  bool abortDrawing() override;
+  // SkPicture::AbortCallback override.
+  bool abort() override;
 
   // SkCanvas overrides.
   void onDrawPaint(const SkPaint& paint) override;