cc: Merge GatherPixelRefs and AnalyzeInRect

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 <list>
+#include <set>
+
+#include "base/hash_tables.h"
+#include "skia/ext/lazy_pixel_ref.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.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 isCheap().
 class SK_API AnalysisCanvas : public SkCanvas {
  public:
   AnalysisCanvas(AnalysisDevice*);
   virtual ~AnalysisCanvas();
 
   // Returns true if the estimated cost of drawing is below an
   // arbitrary threshold.
   bool isCheap() const;
   bool getColorIfSolid(SkColor* color) const;
   bool isTransparent() const;
+  void consumeLazyPixelRefs(std::list<LazyPixelRef*>& pixelRefs);

[Tom Hudson, 2013/03/18 11:52:39]

This name is really unclear to me; "consume" doesn't describe what's happening
from the caller's point of view, but a detail of internal implementation, right?

[Sami, 2013/03/18 12:14:33]

Use a pointer instead of reference (all reference parameters must be const).

 
   // Returns the estimated cost of drawing, in arbitrary units.
   int getEstimatedCost() const;
 
   virtual bool clipRect(const SkRect& rect,
                         SkRegion::Op op = SkRegion::kIntersect_Op,
                         bool doAntiAlias = false) OVERRIDE;
   virtual bool clipPath(const SkPath& path,
                         SkRegion::Op op = SkRegion::kIntersect_Op,
                         bool doAntiAlias = false) OVERRIDE;
@@ skipping 17 matching lines @@
 };
 
 class SK_API AnalysisDevice : public SkDevice {
  public:
   AnalysisDevice(const SkBitmap& bm);
   virtual ~AnalysisDevice();
 
   int getEstimatedCost() const;
   bool getColorIfSolid(SkColor* color) const;
   bool isTransparent() const;
+  void consumeLazyPixelRefs(std::list<LazyPixelRef*>& pixelRefs);
 
   void setForceNotSolid(bool flag);
   void setForceNotTransparent(bool flag);
 
  protected:
   virtual void clear(SkColor color) OVERRIDE;
   virtual void drawPaint(const SkDraw&, const SkPaint& paint) OVERRIDE;
   virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode,
                           size_t count, const SkPoint[],
                           const SkPaint& paint) OVERRIDE;
@@ skipping 35 matching lines @@
                             const SkPoint verts[], const SkPoint texs[],
                             const SkColor colors[], SkXfermode* xmode,
                             const uint16_t indices[], int indexCount,
                             const SkPaint& paint) OVERRIDE;
   virtual void drawDevice(const SkDraw&, SkDevice*, int x, int y,
                           const SkPaint&) OVERRIDE;
 
   int estimatedCost_;
 
  private:
+
   typedef SkDevice INHERITED;
 
+  void addPixelRefIfLazy(SkPixelRef* pixelRef);
+  void addBitmap(const SkBitmap& bitmap);
+  void addBitmapFromPaint(const SkPaint& paint);
+
   bool isForcedNotSolid_;
   bool isForcedNotTransparent_;
   bool isSolidColor_;
   SkColor color_;
   bool isTransparent_;
+  base::hash_set<uint32_t> existingPixelRefIDs_;

[Sami, 2013/03/18 12:14:33]

This could be a typedef too.

+  std::list<skia::LazyPixelRef*> lazyPixelRefs_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_