cc: Add CopyAsBitmapRequest class to hold the readback callback.

cc/layers/layer.h

 // Copyright 2010 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_LAYERS_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <string>
-#include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/layer_animation_value_observer.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
+#include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/draw_properties.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/layers/paint_properties.h"
 #include "cc/layers/render_surface.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace WebKit {
 class WebAnimationDelegate;
 class WebLayerScrollClient;
 }
 
 namespace cc {
 
 class Animation;
 struct AnimationEvent;
+class CopyOutputRequest;
 class LayerAnimationDelegate;
 class LayerAnimationEventObserver;
 class LayerImpl;
 class LayerTreeHost;
 class LayerTreeImpl;
 class PriorityCalculator;
 class RenderingStatsInstrumentation;
 class ResourceUpdateQueue;
 class ScrollbarLayer;
 struct AnimationEvent;
@@ skipping 18 matching lines @@
   void AddChild(scoped_refptr<Layer> child);
   void InsertChild(scoped_refptr<Layer> child, size_t index);
   void ReplaceChild(Layer* reference, scoped_refptr<Layer> new_layer);
   void RemoveFromParent();
   void RemoveAllChildren();
   void SetChildren(const LayerList& children);
 
   const LayerList& children() const { return children_; }
   Layer* child_at(size_t index) { return children_[index].get(); }
 
-  typedef base::Callback<void(scoped_ptr<SkBitmap>)>
-      RequestCopyAsBitmapCallback;
-
-  // This requests the layer and its subtree be rendered into an SkBitmap and
-  // call the given callback when the SkBitmap has been produced. If the copy
-  // is unable to be produced (the layer is destroyed first), then the callback
-  // is called with a NULL bitmap.
-  void RequestCopyAsBitmap(RequestCopyAsBitmapCallback callback);
-  bool HasRequestCopyCallback() const {
-    return !request_copy_callbacks_.empty();
+  // This requests the layer and its subtree be rendered and given to the
+  // callback. If the copy is unable to be produced (the layer is destroyed
+  // first), then the callback is called with a NULL/empty result.
+  void RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> request);
+  bool HasCopyRequest() const {
+    return !copy_requests_.empty();
   }
 
   void SetAnchorPoint(gfx::PointF anchor_point);
   gfx::PointF anchor_point() const { return anchor_point_; }
 
   void SetAnchorPointZ(float anchor_point_z);
   float anchor_point_z() const { return anchor_point_z_; }
 
   virtual void SetBackgroundColor(SkColor background_color);
   SkColor background_color() const { return background_color_; }
@@ skipping 371 matching lines @@
 
   gfx::Transform transform_;
   gfx::Transform sublayer_transform_;
 
   // Replica layer used for reflections.
   scoped_refptr<Layer> replica_layer_;
 
   // Transient properties.
   float raster_scale_;
 
-  std::vector<RequestCopyAsBitmapCallback> request_copy_callbacks_;
+  ScopedPtrVector<CopyOutputRequest> copy_requests_;
 
   WebKit::WebLayerScrollClient* layer_scroll_client_;
 
   DrawProperties<Layer, RenderSurface> draw_properties_;
 
   PaintProperties paint_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_