Revert 220418 "cc: Block commit on activate by setting a flag on..."

http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/14025/steps/cc_unittests/logs/stdio#failure7

> cc: Block commit on activate by setting a flag on LayerTreeHost.
> 
> Currently the ThreadProxy recursively asks all layers in the tree if
> they should block the commit. This is problematic as when you remove
> a layer from a the tree, it may want to block the commit to get back
> resources from its active-tree impl-layer.
> 
> Instead, have layers call SetNextCommitWaitsForActivation() when they
> want the next commit to block on activate. This way we only block
> commits that matter, not every commit when there's a texture layer
> present. And we can allow a layer to block the commit when it is
> leaving the tree.
> 
> Tests:
> TextureLayerNoMailboxIsActivatedDuringCommit
> TextureLayerMailboxIsActivatedDuringCommit
> DelegatedFrameIsActivatedDuringCommit
> 
> R=enne, piman
> BUG=277953
> 
> Review URL: https://chromiumcodereview.appspot.com/23530003

TBR=danakj@chromium.org

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

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

1 files changed, 2 insertions, 1 deletions

diff --git a/cc/layers/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h
index afee475f..f16217b 100644
--- a/cc/layers/delegated_renderer_layer.h
+++ b/cc/layers/delegated_renderer_layer.h
@@ -21,7 +21,6 @@ class CC_EXPORT DelegatedRendererLayer : public Layer {
 
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
-  virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* impl) OVERRIDE;
   virtual bool DrawsContent() const OVERRIDE;
 
@@ -37,6 +36,8 @@ class CC_EXPORT DelegatedRendererLayer : public Layer {
   // compositor to the given array, so they can be given back to the child.
   void TakeUnusedResourcesForChildCompositor(ReturnedResourceArray* array);
 
+  virtual bool BlocksPendingCommit() const OVERRIDE;
+
  protected:
   explicit DelegatedRendererLayer(DelegatedRendererLayerClient* client);
   virtual ~DelegatedRendererLayer();