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

trunk/src/cc/layers/delegated_renderer_layer.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/layers/delegated_renderer_layer.h"
 
 #include "cc/layers/delegated_renderer_layer_client.h"
 #include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/delegated_frame_data.h"
 
@@ skipping 11 matching lines @@
     client_(client) {}
 
 DelegatedRendererLayer::~DelegatedRendererLayer() {}
 
 scoped_ptr<LayerImpl> DelegatedRendererLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return DelegatedRendererLayerImpl::Create(
       tree_impl, layer_id_).PassAs<LayerImpl>();
 }
 
-void DelegatedRendererLayer::SetLayerTreeHost(LayerTreeHost* host) {
-  if (layer_tree_host() == host) {
-    Layer::SetLayerTreeHost(host);
-    return;
-  }
-
-  if (!host) {
-    // The active frame needs to be removed from the active tree and resources
-    // returned before the commit is called complete.
-    // TODO(danakj): Don't need to do this if the last frame commited was empty
-    // or we never commited a frame with resources.
-    SetNextCommitWaitsForActivation();
-  }
-
-  Layer::SetLayerTreeHost(host);
-}
-
 bool DelegatedRendererLayer::DrawsContent() const {
   return Layer::DrawsContent() && !frame_size_.IsEmpty();
 }
 
 void DelegatedRendererLayer::PushPropertiesTo(LayerImpl* impl) {
   Layer::PushPropertiesTo(impl);
 
   DelegatedRendererLayerImpl* delegated_impl =
       static_cast<DelegatedRendererLayerImpl*>(impl);
 
@@ skipping 34 matching lines @@
   }
   frame_data_ = new_frame_data.Pass();
   if (!frame_data_->render_pass_list.empty()) {
     RenderPass* root_pass = frame_data_->render_pass_list.back();
     damage_in_frame_.Union(root_pass->damage_rect);
     frame_size_ = root_pass->output_rect.size();
   } else {
     frame_size_ = gfx::Size();
   }
   SetNeedsCommit();
-  // The active frame needs to be replaced and resources returned before the
-  // commit is called complete.
-  SetNextCommitWaitsForActivation();
 }
 
 void DelegatedRendererLayer::TakeUnusedResourcesForChildCompositor(
     ReturnedResourceArray* array) {
   DCHECK(array->empty());
   array->clear();
 
   array->swap(unused_resources_for_child_compositor_);
 }
 
+bool DelegatedRendererLayer::BlocksPendingCommit() const {
+  // The active frame needs to be replaced and resources returned before the
+  // commit is called complete. This is true even whenever there may be
+  // resources to return, regardless of if the layer will draw in its new
+  // state.
+  return true;
+}
+
 }  // namespace cc