cc: Merge GatherPixelRefs and AnalyzeInRect

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 "cc/base/cc_export.h"
 #include "cc/resources/picture_pile_base.h"
+#include "skia/ext/analysis_canvas.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 struct RenderingStats;
 
 class CC_EXPORT PicturePileImpl : public PicturePileBase {
  public:
   static scoped_refptr<PicturePileImpl> Create();
   static scoped_refptr<PicturePileImpl> CreateFromOther(
@@ skipping 13 matching lines @@
 
   void GatherPixelRefs(
       gfx::Rect content_rect,
       float contents_scale,
       std::list<skia::LazyPixelRef*>& pixel_refs);
 
   skia::RefPtr<SkPicture> GetFlattenedPicture();
 
   struct Analysis {
     Analysis();
+    ~Analysis();
 
     bool is_solid_color;
     bool is_transparent;
     bool is_cheap_to_raster;
     SkColor solid_color;
+
+    skia::AnalysisCanvas::LazyPixelRefList lazy_pixel_refs;
   };
 
   void AnalyzeInRect(const gfx::Rect& content_rect,
                      float contents_scale,
                      Analysis* analysis);
 
  protected:
   friend class PicturePile;
 
   PicturePileImpl();
@@ skipping 19 matching lines @@
   // This guarantees thread-safe access during the life
   // time of a PicturePileImpl instance.
   const ClonesForDrawing clones_for_drawing_;
 
   DISALLOW_COPY_AND_ASSIGN(PicturePileImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_PILE_IMPL_H_