Ensure conservative raster clipping for AnalysisCanvas

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 <stddef.h>
 #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 {
 
 // 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 SkPicture::AbortCallback {
+class SK_API AnalysisCanvas final : public SkNoDrawCanvas,
+                                    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);
 
@@ skipping 86 matching lines @@
                       SkScalar x,
                       SkScalar y,
                       const SkPaint& paint) override;
   void onDrawDRRect(const SkRRect& outer,
                     const SkRRect& inner,
                     const SkPaint&) override;
 
   void OnComplexClip();
 
  private:
-  typedef SkCanvas INHERITED;
+  typedef SkNoDrawCanvas INHERITED;
 
   int saved_stack_size_;
   int force_not_solid_stack_level_;
   int force_not_transparent_stack_level_;
 
   bool is_forced_not_solid_;
   bool is_forced_not_transparent_;
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
   int draw_op_count_;
   int rejected_op_count_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_