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

trunk/src/cc/trees/layer_tree_host.cc

Index: trunk/src/cc/trees/layer_tree_host.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host.cc	(revision 220454)
+++ trunk/src/cc/trees/layer_tree_host.cc	(working copy)
@@ -518,10 +518,6 @@
   return proxy_->CommitRequested();
 }
 
-void LayerTreeHost::SetNextCommitWaitsForActivation() {
-  proxy_->SetNextCommitWaitsForActivation();
-}
-
 void LayerTreeHost::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events,
                                        base::Time wall_clock_time) {
   DCHECK(proxy_->IsMainThread());
@@ -1093,6 +1089,12 @@
                  animate));
 }
 
+bool LayerTreeHost::BlocksPendingCommit() const {
+  if (!root_layer_.get())
+    return false;
+  return root_layer_->BlocksPendingCommitRecursive();
+}
+
 scoped_ptr<base::Value> LayerTreeHost::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   state->Set("proxy", proxy_->AsValue().release());