cc: Consolidate the analysis_canvas operations

cc/picture.h

Index: cc/picture.h
diff --git a/cc/picture.h b/cc/picture.h
index 118bcb39a5c4fc32a241335e8fde1290cb6190ff..19cbe4ceb488a1170345a3fa7750344b9b2cea15 100644
--- a/cc/picture.h
+++ b/cc/picture.h
@@ -16,6 +16,10 @@
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "ui/gfx/rect.h"
 
+namespace skia {
+  class AnalysisCanvas;
+} // namespace skia
+
 namespace cc {
 
 class ContentLayerClient;
@@ -42,10 +46,9 @@ class CC_EXPORT Picture
   // Apply this contents scale and raster the content rect into the canvas.
   void Raster(SkCanvas* canvas, gfx::Rect content_rect, float contents_scale);
 
-  // Estimate the cost of rasterizing. To predict the cost of a particular
-  // call to Raster(), pass this the bounds of the canvas that will
-  // be rastered into.
-  bool IsCheapInRect(const gfx::Rect& layer_rect) const;
+  void AnalyzeInRect(skia::AnalysisCanvas* canvas,
+                     const gfx::Rect& content_rect,
+                     float contents_scale);
 
   void GatherPixelRefs(
       const gfx::Rect& layer_rect,