Revert of cc: Combine analysis and raster

cc/resources/picture_pile_impl.h

 // Copyright 2012 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 CC_RESOURCES_PICTURE_PILE_IMPL_H_
 #define CC_RESOURCES_PICTURE_PILE_IMPL_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 34 matching lines @@
 
   // Similar to the above RasterDirect method, but this is a convenience method
   // for when it is known that the raster is going to an intermediate bitmap
   // that itself will then be blended and thus that a canvas clear is required.
   void RasterToBitmap(
       SkCanvas* canvas,
       gfx::Rect canvas_rect,
       float contents_scale,
       RenderingStatsInstrumentation* stats_instrumentation);
 
+  // Called when analyzing a tile. We can use AnalysisCanvas as
+  // SkDrawPictureCallback, which allows us to early out from analysis.
+  void RasterForAnalysis(
+      skia::AnalysisCanvas* canvas,
+      gfx::Rect canvas_rect,
+      float contents_scale,
+      RenderingStatsInstrumentation* stats_instrumentation);
+
   skia::RefPtr<SkPicture> GetFlattenedPicture();
 
   struct CC_EXPORT Analysis {
     Analysis();
     ~Analysis();
 
     bool is_solid_color;
     bool has_text;
     SkColor solid_color;
   };
 
+  void AnalyzeInRect(gfx::Rect content_rect,
+                     float contents_scale,
+                     Analysis* analysis);
+
+  void AnalyzeInRect(gfx::Rect content_rect,
+                     float contents_scale,
+                     Analysis* analysis,
+                     RenderingStatsInstrumentation* stats_instrumentation);
+
   class CC_EXPORT PixelRefIterator {
    public:
     PixelRefIterator(gfx::Rect content_rect,
                      float contents_scale,
                      const PicturePileImpl* picture_pile);
     ~PixelRefIterator();
 
     skia::LazyPixelRef* operator->() const { return *pixel_ref_iterator_; }
     skia::LazyPixelRef* operator*() const { return *pixel_ref_iterator_; }
     PixelRefIterator& operator++();
     operator bool() const { return pixel_ref_iterator_; }
 
    private:
     void AdvanceToTilePictureWithPixelRefs();
 
     const PicturePileImpl* picture_pile_;
     gfx::Rect layer_rect_;
     TilingData::Iterator tile_iterator_;
     Picture::PixelRefIterator pixel_ref_iterator_;
     std::set<const void*> processed_pictures_;
   };
 
-  gfx::Rect AnalysisRectForRaster(gfx::Rect content_rect,
-                                  float contents_scale) const;
-
   void DidBeginTracing();
 
  protected:
   friend class PicturePile;
   friend class PixelRefIterator;
 
   PicturePileImpl();
   explicit PicturePileImpl(const PicturePileBase* other);
   virtual ~PicturePileImpl();
 
@@ skipping 14 matching lines @@
 
  private:
   typedef std::map<Picture*, Region> PictureRegionMap;
   void CoalesceRasters(gfx::Rect canvas_rect,
                        gfx::Rect content_rect,
                        float contents_scale,
                        PictureRegionMap* result);
 
   void RasterCommon(
       SkCanvas* canvas,
+      SkDrawPictureCallback* callback,
       gfx::Rect canvas_rect,
       float contents_scale,
-      RenderingStatsInstrumentation* rendering_stats_instrumentation);
+      RenderingStatsInstrumentation* rendering_stats_instrumentation,
+      bool is_analysis);
 
   // Once instantiated, |clones_for_drawing_| can't be modified.  This
   // guarantees thread-safe access during the life time of a PicturePileImpl
   // instance.  This member variable must be last so that other member
   // variables have already been initialized and can be clonable.
   const ClonesForDrawing clones_for_drawing_;
 
   DISALLOW_COPY_AND_ASSIGN(PicturePileImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_PILE_IMPL_H_