Remove CompositeAndReadback from LayerTreeHost(Impl) and the Proxys.

cc/trees/layer_tree_host_impl.h

 // Copyright 2011 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_TREES_LAYER_TREE_HOST_IMPL_H_
 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
 
 #include <list>
 #include <set>
 #include <string>
@@ skipping 174 matching lines @@
   void UpdateBackgroundAnimateTicking(bool should_background_tick);
   void DidAnimateScrollOffset();
   void SetViewportDamage(const gfx::Rect& damage_rect);
 
   virtual void ManageTiles();
 
   // Returns false if problems occured preparing the frame, and we should try
   // to avoid displaying the frame. If PrepareToDraw is called, DidDrawAllLayers
   // must also be called, regardless of whether DrawLayers is called between the
   // two.
-  virtual DrawSwapReadbackResult::DrawResult PrepareToDraw(
-      FrameData* frame,
-      const gfx::Rect& damage_rect);
+  virtual DrawSwapReadbackResult::DrawResult PrepareToDraw(FrameData* frame);

[brianderson, 2014/05/10 00:47:53]

I would say rename this to DrawSwapResult, but Simon is in the process of
removing this already.

[danakj, 2014/05/10 15:30:55]

I was planning to change this to a bool or rename it etc in next CL since this
would require changes in the scheduler. 

   virtual void DrawLayers(FrameData* frame, base::TimeTicks frame_begin_time);
   // Must be called if and only if PrepareToDraw was called.
   void DidDrawAllLayers(const FrameData& frame);
 
   const LayerTreeSettings& settings() const { return settings_; }
 
   // Evict all textures by enforcing a memory policy with an allocation of 0.
   void EvictTexturesForTesting();
 
   // When blocking, this prevents client_->NotifyReadyToActivate() from being
@@ skipping 67 matching lines @@
   TileManager* tile_manager() { return tile_manager_.get(); }
   ResourcePool* resource_pool() { return resource_pool_.get(); }
   Renderer* renderer() { return renderer_.get(); }
   const RendererCapabilitiesImpl& GetRendererCapabilities() const;
 
   virtual bool SwapBuffers(const FrameData& frame);
   void SetNeedsBeginFrame(bool enable);
   virtual void WillBeginImplFrame(const BeginFrameArgs& args);
   void DidModifyTilePriorities();
 
-  void Readback(void* pixels, const gfx::Rect& rect_in_device_viewport);
-
   LayerTreeImpl* active_tree() { return active_tree_.get(); }
   const LayerTreeImpl* active_tree() const { return active_tree_.get(); }
   LayerTreeImpl* pending_tree() { return pending_tree_.get(); }
   const LayerTreeImpl* pending_tree() const { return pending_tree_.get(); }
   const LayerTreeImpl* recycle_tree() const { return recycle_tree_.get(); }
   virtual void CreatePendingTree();
   virtual void UpdateVisibleTiles();
   virtual void ActivatePendingTree();
 
   // Shortcuts to layers on the active tree.
@@ skipping 76 matching lines @@
   Proxy* proxy() const { return proxy_; }
 
   AnimationRegistrar* animation_registrar() const {
     return animation_registrar_.get();
   }
 
   void SetDebugState(const LayerTreeDebugState& new_debug_state);
   const LayerTreeDebugState& debug_state() const { return debug_state_; }
 
   class CC_EXPORT CullRenderPassesWithNoQuads {
- public:
+   public:
     bool ShouldRemoveRenderPass(const RenderPassDrawQuad& quad,
                                 const FrameData& frame) const;
 
     // Iterates in draw order, so that when a surface is removed, and its
     // target becomes empty, then its target can be removed also.
     size_t RenderPassListBegin(const RenderPassList& list) const { return 0; }
     size_t RenderPassListEnd(const RenderPassList& list) const {
       return list.size();
     }
     size_t RenderPassListNext(size_t it) const { return it + 1; }
@@ skipping 287 matching lines @@
   std::set<SwapPromiseMonitor*> swap_promise_monitor_;
 
   size_t transfer_buffer_memory_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_IMPL_H_