Revert of cc: Combine analysis and raster

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/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace skia {
 
 class AnalysisDevice;
 
 // 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: create a SkBitmap with kNo_Config, create an AnalysisDevice
 // using that bitmap, and create an AnalysisCanvas using the device.
 // Play a picture into the canvas, and then check result.
-class SK_API AnalysisCanvas : public SkCanvas {
+class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
  public:
-  explicit AnalysisCanvas(AnalysisDevice* device);
+  AnalysisCanvas(AnalysisDevice*);
   virtual ~AnalysisCanvas();
 
   // Returns true when a SkColor can be used to represent result.
   bool GetColorIfSolid(SkColor* color) const;
   bool HasText() const;
 
+  // SkDrawPictureCallback override.
+  virtual bool abortDrawing() OVERRIDE;
+
   // SkCanvas overrides.
   virtual bool clipRect(const SkRect& rect,
                         SkRegion::Op op = SkRegion::kIntersect_Op,
                         bool do_anti_alias = false) OVERRIDE;
   virtual bool clipPath(const SkPath& path,
                         SkRegion::Op op = SkRegion::kIntersect_Op,
                         bool do_anti_alias = false) OVERRIDE;
   virtual bool clipRRect(const SkRRect& rrect,
                          SkRegion::Op op = SkRegion::kIntersect_Op,
                          bool do_anti_alias = false) OVERRIDE;
@@ skipping 11 matching lines @@
   int saved_stack_size_;
   int force_not_solid_stack_level_;
   int force_not_transparent_stack_level_;
 };
 
 // TODO(robertphillips): Once Skia's SkBaseDevice API is refactored to
 // remove the bitmap-specific entry points, it might make sense for this
 // to be derived from SkBaseDevice (rather than SkBitmapDevice)
 class SK_API AnalysisDevice : public SkBitmapDevice {
  public:
-  // |analysis_rect| is in device space.
-  AnalysisDevice(const SkBitmap& bitmap, SkRect analysis_rect);
-  // Analyze the entire bitmap.
   AnalysisDevice(const SkBitmap& bitmap);
   virtual ~AnalysisDevice();
 
   bool GetColorIfSolid(SkColor* color) const;
   bool HasText() const;
 
   void SetForceNotSolid(bool flag);
   void SetForceNotTransparent(bool flag);
 
-  SkRect AnalysisRect() const { return analysis_rect_; }
-
  protected:
   // SkBaseDevice overrides.
   virtual void clear(SkColor color) OVERRIDE;
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
   virtual void drawPoints(const SkDraw& draw,
                           SkCanvas::PointMode mode,
                           size_t count,
                           const SkPoint points[],
                           const SkPaint& paint) OVERRIDE;
   virtual void drawRect(const SkDraw& draw,
@@ skipping 65 matching lines @@
                             const SkPaint& paint) OVERRIDE;
   virtual void drawDevice(const SkDraw& draw,
                           SkBaseDevice* device,
                           int x,
                           int y,
                           const SkPaint& paint) OVERRIDE;
 
  private:
   typedef SkBitmapDevice INHERITED;
 
-  SkRect analysis_rect_;
   bool is_forced_not_solid_;
   bool is_forced_not_transparent_;
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
   bool has_text_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_