Index: trunk/src/cc/layers/tiled_layer.cc |
=================================================================== |
--- trunk/src/cc/layers/tiled_layer.cc (revision 220454) |
+++ trunk/src/cc/layers/tiled_layer.cc (working copy) |
@@ -235,6 +235,8 @@ |
needs_push_properties_ = true; |
} |
+bool TiledLayer::BlocksPendingCommit() const { return true; } |
+ |
PrioritizedResourceManager* TiledLayer::ResourceManager() { |
if (!layer_tree_host()) |
return NULL; |
@@ -729,10 +731,6 @@ |
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; |
{ |