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

trunk/src/cc/layers/layer.cc

 // Copyright 2010 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/layer.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/location.h"
@@ skipping 134 matching lines @@
   layer_tree_host_->SetNeedsCommit();
 }
 
 void Layer::SetNeedsFullTreeSync() {
   if (!layer_tree_host_)
     return;
 
   layer_tree_host_->SetNeedsFullTreeSync();
 }
 
-void Layer::SetNextCommitWaitsForActivation() {
+bool Layer::IsPropertyChangeAllowed() const {
   if (!layer_tree_host_)
-    return;
+    return true;
 
-  layer_tree_host_->SetNextCommitWaitsForActivation();
+  if (!layer_tree_host_->settings().strict_layer_property_change_checking)
+    return true;
+
+  return !layer_tree_host_->in_paint_layer_contents();
 }
 
 void Layer::SetNeedsPushProperties() {
   if (needs_push_properties_)
     return;
   if (!parent_should_know_need_push_properties() && parent_)
     parent_->AddDependentNeedsPushProperties();
   needs_push_properties_ = true;
 }
 
 void Layer::AddDependentNeedsPushProperties() {
   DCHECK_GE(num_dependents_need_push_properties_, 0);
 
   if (!parent_should_know_need_push_properties() && parent_)
     parent_->AddDependentNeedsPushProperties();
 
   num_dependents_need_push_properties_++;
 }
 
 void Layer::RemoveDependentNeedsPushProperties() {
   num_dependents_need_push_properties_--;
   DCHECK_GE(num_dependents_need_push_properties_, 0);
 
   if (!parent_should_know_need_push_properties() && parent_)
       parent_->RemoveDependentNeedsPushProperties();
 }
 
-bool Layer::IsPropertyChangeAllowed() const {
-  if (!layer_tree_host_)
-    return true;
-
-  if (!layer_tree_host_->settings().strict_layer_property_change_checking)
-    return true;
-
-  return !layer_tree_host_->in_paint_layer_contents();
-}
-
 gfx::Rect Layer::LayerRectToContentRect(const gfx::RectF& layer_rect) const {
   gfx::RectF content_rect =
       gfx::ScaleRect(layer_rect, contents_scale_x(), contents_scale_y());
   // Intersect with content rect to avoid the extra pixel because for some
   // values x and y, ceil((x / y) * y) may be x + 1.
   content_rect.Intersect(gfx::Rect(content_bounds()));
   return gfx::ToEnclosingRect(content_rect);
 }
 
+bool Layer::BlocksPendingCommit() const {
+  return false;
+}
+
 skia::RefPtr<SkPicture> Layer::GetPicture() const {
   return skia::RefPtr<SkPicture>();
 }
 
 bool Layer::CanClipSelf() const {
   return false;
 }
 
+bool Layer::BlocksPendingCommitRecursive() const {
+  if (BlocksPendingCommit())
+    return true;
+  if (mask_layer() && mask_layer()->BlocksPendingCommitRecursive())
+    return true;
+  if (replica_layer() && replica_layer()->BlocksPendingCommitRecursive())
+    return true;
+  for (size_t i = 0; i < children_.size(); ++i) {
+    if (children_[i]->BlocksPendingCommitRecursive())
+      return true;
+  }
+  return false;
+}
+
 void Layer::SetParent(Layer* layer) {
   DCHECK(!layer || !layer->HasAncestor(this));
 
   if (parent_should_know_need_push_properties()) {
     if (parent_)
       parent_->RemoveDependentNeedsPushProperties();
     if (layer)
       layer->AddDependentNeedsPushProperties();
   }
 
@@ skipping 868 matching lines @@
       (*it)->clip_parent_ = NULL;
   }
 
   if (clip_parent_)
     clip_parent_->RemoveClipChild(this);
 
   clip_parent_ = NULL;
 }
 
 }  // namespace cc