Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Unified Diff: trunk/src/cc/layers/tiled_layer.cc

Issue 23702010: Revert 220418 "cc: Block commit on activate by setting a flag on..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/cc/layers/tiled_layer.h ('k') | trunk/src/cc/test/fake_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
{
« no previous file with comments | « trunk/src/cc/layers/tiled_layer.h ('k') | trunk/src/cc/test/fake_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698