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

Unified Diff: cc/layers/tiled_layer.cc

Issue 21839004: cc: Push valid property values when CalcDrawProps skips layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: pushpaintprops: stuff Created 7 years, 5 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
Index: cc/layers/tiled_layer.cc
diff --git a/cc/layers/tiled_layer.cc b/cc/layers/tiled_layer.cc
index 753cdfa2862e1b5140ca692aba9825c352d7169d..57a7e9e788b2823cf0b02d7fada8b0384ea11d79 100644
--- a/cc/layers/tiled_layer.cc
+++ b/cc/layers/tiled_layer.cc
@@ -734,7 +734,11 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue,
base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
true);
- ContentsScalingLayer::Update(queue, occlusion);
+ bool contents_scaling_layer_updated =
+ ContentsScalingLayer::Update(queue, occlusion);
+ DCHECK(!contents_scaling_layer_updated) <<
+ "If this is true, then any return value below would need to " <<
+ "return true.";
UpdateBounds();
}

Powered by Google App Engine
This is Rietveld 408576698