Revert 196713 "cc: Async readback."

Oops, wrong version landed!

> cc: Async readback.
> 
> Provide a path to get a readback of a layer's subtree via an
> asynchronous mechanism.
> 
> This path is used for all the cc pixel tests, to show that it
> works. Also by some unit tests:
> 
> LayerTreeHostTestAsyncReadback.GLRenderer_RunSingleThread
> LayerTreeHostTestAsyncReadback.GLRenderer_RunMultiThread
> LayerTreeHostTestAsyncReadback.SoftwareRenderer_RunSingleThread
> LayerTreeHostTestAsyncReadback.SoftwareRenderer_RunMultiThread
> LayerTreeHostTestAsyncReadbackLayerDestroyed.RunSingleThread
> LayerTreeHostTestAsyncReadbackLayerDestroyed.RunMultiThread
> 
> BUG=179896
> 
> Review URL: https://chromiumcodereview.appspot.com/14060015

TBR=danakj@chromium.org

Review URL: https://codereview.chromium.org/14512003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196715 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 17 deletions

diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc
index 48990cd..ef681df 100644
--- a/cc/quads/render_pass.cc
+++ b/cc/quads/render_pass.cc
@@ -16,9 +16,11 @@ scoped_ptr<RenderPass> RenderPass::Create() {
 RenderPass::RenderPass()
     : id(Id(-1, -1)),
       has_transparent_background(true),
-      has_occlusion_from_outside_target_surface(false) {}
+      has_occlusion_from_outside_target_surface(false) {
+}
 
-RenderPass::~RenderPass() {}
+RenderPass::~RenderPass() {
+}
 
 scoped_ptr<RenderPass> RenderPass::Copy(Id new_id) const {
   DCHECK(new_id != id);
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 1fb011a..bfd0d83 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -9,8 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
-#include "base/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/hash_pair.h"
 #include "cc/base/scoped_ptr_hash_map.h"
@@ -99,14 +97,6 @@ class CC_EXPORT RenderPass {
   // complete, since they are occluded.
   bool has_occlusion_from_outside_target_surface;
 
-  // If non-empty, the renderer should produce a copy of the render pass'
-  // contents as a bitmap, and give a copy of the bitmap to each callback in
-  // this list. This property should not be serialized between compositors, as
-  // it only makes sense in the root compositor.
-  typedef base::Callback<void(scoped_ptr<SkBitmap>)>
-      RequestCopyAsBitmapCallback;
-  std::vector<RequestCopyAsBitmapCallback> copy_callbacks;
-
   QuadList quad_list;
   SharedQuadStateList shared_quad_state_list;
 
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index 9ab0123..f2271b5 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -29,7 +29,6 @@ struct RenderPassSize {
   gfx::RectF damage_rect;
   bool has_transparent_background;
   bool has_occlusion_from_outside_target_surface;
-  std::vector<RenderPass::RequestCopyAsBitmapCallback> copy_callbacks;
 };
 
 TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
@@ -48,7 +47,6 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
                transform_to_root,
                has_transparent_background,
                has_occlusion_from_outside_target_surface);
-  pass->copy_callbacks.push_back(RenderPass::RequestCopyAsBitmapCallback());
 
   // Stick a quad in the pass, this should not get copied.
   scoped_ptr<SharedQuadState> shared_state = SharedQuadState::Create();
@@ -74,9 +72,6 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
             copy->has_occlusion_from_outside_target_surface);
   EXPECT_EQ(0u, copy->quad_list.size());
 
-  // The copy callback should not be copied/duplicated.
-  EXPECT_EQ(0u, copy->copy_callbacks.size());
-
   EXPECT_EQ(sizeof(RenderPassSize), sizeof(RenderPass));
 }