Ensure conservative raster clipping for AnalysisCanvas

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 ca2c31530ce578f57379e2c61eaadcab2fee8830..f13bfad4091990c614238c5381f09c4749336b19 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -9,8 +9,8 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/utils/SkNoDrawCanvas.h"
 
 namespace skia {
 
@@ -18,7 +18,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 SkPicture::AbortCallback {
+class SK_API AnalysisCanvas final : public SkNoDrawCanvas,
+                                    public SkPicture::AbortCallback {
  public:
   AnalysisCanvas(int width, int height);
   ~AnalysisCanvas() override;
@@ -125,7 +126,7 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkPicture::AbortCallback {
   void OnComplexClip();
 
  private:
-  typedef SkCanvas INHERITED;
+  typedef SkNoDrawCanvas INHERITED;
 
   int saved_stack_size_;
   int force_not_solid_stack_level_;