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

trunk/src/cc/layers/tiled_layer.cc

 // 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.
 
 #include "cc/layers/tiled_layer.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 217 matching lines @@
        iter != invalid_tiles.end();
        ++iter)
     tiler_->TakeTile((*iter)->i(), (*iter)->j());
 
   // TiledLayer must push properties every frame, since viewport state and
   // occlusion from anywhere in the tree can change what the layer decides to
   // push to the impl tree.
   needs_push_properties_ = true;
 }
 
+bool TiledLayer::BlocksPendingCommit() const { return true; }
+
 PrioritizedResourceManager* TiledLayer::ResourceManager() {
   if (!layer_tree_host())
     return NULL;
   return layer_tree_host()->contents_texture_manager();
 }
 
 const PrioritizedResource* TiledLayer::ResourceAtForTesting(int i,
                                                             int j) const {
   UpdatableTile* tile = TileAt(i, j);
   if (!tile)
@@ skipping 474 matching lines @@
     predicted_visible_rect_.Intersect(bound);
   }
   previous_content_bounds_ = content_bounds();
   previous_visible_rect_ = visible_content_rect();
 }
 
 bool TiledLayer::Update(ResourceUpdateQueue* queue,
                         const OcclusionTracker* occlusion) {
   DCHECK(!skips_draw_ && !failed_update_);  // Did ResetUpdateState get skipped?
 
-  // Tiled layer always causes commits to wait for activation, as it does
-  // not support pending trees.
-  SetNextCommitWaitsForActivation();
-
   bool updated = false;
 
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
 
     updated |= ContentsScalingLayer::Update(queue, occlusion);
     UpdateBounds();
   }
 
@@ skipping 148 matching lines @@
   gfx::Rect prepaint_rect = visible_content_rect();
   prepaint_rect.Inset(-tiler_->tile_size().width() * kPrepaintColumns,
                       -tiler_->tile_size().height() * kPrepaintRows);
   gfx::Rect content_rect(content_bounds());
   prepaint_rect.Intersect(content_rect);
 
   return prepaint_rect;
 }
 
 }  // namespace cc