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..4f753214a243690f7c6ab8a0c22d6da52bfa75a6 100644
--- a/cc/picture.h
+++ b/cc/picture.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "cc/cc_export.h"
+#include "skia/ext/analysis_canvas.h"
 #include "skia/ext/lazy_pixel_ref.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
@@ -42,10 +43,13 @@ 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,
+                     bool* is_solid,
+                     SkColor* solid_color,
+                     bool* is_transparent,
+                     bool* is_cheap);
 
   void GatherPixelRefs(
       const gfx::Rect& layer_rect,