| Index: skia/ext/analysis_canvas.h
|
| diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
|
| index 1ae2a2d11942e57169645c78d727243a00280c5e..5a596475dfda839db753e3fe3f3b90579144ef39 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,7 @@ 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 +26,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;
|
|
|