Remove CompositeAndReadback from LayerTreeHost(Impl) and the Proxys.

cc/trees/layer_tree_host_unittest_damage.cc

 // 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.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 222 matching lines @@
   FakeContentLayerClient client_;
   scoped_refptr<FakeContentLayer> content_;
   int expect_swap_and_succeed_;
   int did_swaps_;
   int did_swap_and_succeed_;
 };
 
 SINGLE_AND_MULTI_THREAD_NOIMPL_TEST_F(
     LayerTreeHostDamageTestNoDamageDoesNotSwap);
 
-class LayerTreeHostDamageTestNoDamageReadbackDoesDraw
-    : public LayerTreeHostDamageTest {
-  virtual void BeginTest() OVERRIDE {
-    PostSetNeedsCommitToMainThread();
-  }
-
-  virtual void SetupTree() OVERRIDE {
-    scoped_refptr<FakeContentLayer> root = FakeContentLayer::Create(&client_);
-    root->SetBounds(gfx::Size(10, 10));
-
-    // Most of the layer isn't visible.
-    content_ = FakeContentLayer::Create(&client_);
-    content_->SetBounds(gfx::Size(100, 100));
-    root->AddChild(content_);
-
-    layer_tree_host()->SetRootLayer(root);
-    LayerTreeHostDamageTest::SetupTree();
-  }
-
-  virtual DrawResult PrepareToDrawOnThread(
-      LayerTreeHostImpl* host_impl,
-      LayerTreeHostImpl::FrameData* frame_data,
-      DrawResult draw_result) OVERRIDE {
-    EXPECT_EQ(DRAW_SUCCESS, draw_result);
-
-    int source_frame = host_impl->active_tree()->source_frame_number();
-    switch (source_frame) {
-      case 0:
-        // The first frame draws and clears any damage.
-        break;
-      case 1: {
-        // The second frame is a readback, we should have damage in the readback
-        // rect, but not swap.
-        RenderSurfaceImpl* root_surface =
-            host_impl->active_tree()->root_layer()->render_surface();
-        gfx::RectF root_damage =
-            root_surface->damage_tracker()->current_damage_rect();
-        root_damage.Intersect(root_surface->content_rect());
-        EXPECT_TRUE(root_damage.Contains(gfx::Rect(3, 3, 1, 1)));
-        break;
-      }
-      case 2:
-        // CompositeAndReadback causes a follow-up commit.
-        break;
-      case 3:
-        NOTREACHED();
-        break;
-    }
-    return draw_result;
-  }
-
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int next_frame = layer_tree_host()->source_frame_number();
-    switch (next_frame) {
-      case 1: {
-        char pixels[4];
-        layer_tree_host()->CompositeAndReadback(static_cast<void*>(&pixels),
-                                                gfx::Rect(3, 3, 1, 1));
-        EndTest();
-        break;
-      }
-    }
-  }
-
-  virtual void AfterTest() OVERRIDE {}
-
-  FakeContentLayerClient client_;
-  scoped_refptr<FakeContentLayer> content_;
-};
-
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestNoDamageReadbackDoesDraw);
-
 class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
   virtual void BeginTest() OVERRIDE {
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void SetupTree() OVERRIDE {
     root_ = FakeContentLayer::Create(&client_);
     child_ = FakeContentLayer::Create(&client_);
 
     root_->SetBounds(gfx::Size(500, 500));
@@ skipping 384 matching lines @@
   FakeContentLayerClient client_;
   int swap_count_;
   int prepare_to_draw_count_;
   int update_visible_tile_count_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestVisibleTilesStillTriggerDraws);
 
 }  // namespace
 }  // namespace cc