Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

skia/ext/analysis_canvas.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SKIA_EXT_ANALYSIS_CANVAS_H_
 #define SKIA_EXT_ANALYSIS_CANVAS_H_
 
 #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 {
 
 // Does not render anything, but gathers statistics about a region
 // (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;
 
   // Returns true when a SkColor can be used to represent result.
   bool GetColorIfSolid(SkColor* color) const;
 
   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;
   void onDrawPoints(PointMode,
                   size_t count,
                   const SkPoint pts[],
                   const SkPaint&) override;
   void onDrawOval(const SkRect&, const SkPaint&) override;
   void onDrawRect(const SkRect&, const SkPaint&) override;
   void onDrawRRect(const SkRRect&, const SkPaint&) override;
@@ skipping 84 matching lines @@
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
   int draw_op_count_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_