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

Unified Diff: cc/layers/picture_layer.cc

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « cc/layers/layer_impl_unittest.cc ('k') | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer.cc
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index ca4033f6c39d7e8fabb35b7c0c10d8673f5dc62d..4d44f00b774a3d7ee1b57f5c7dcbcaeb3cdbe2fd 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -41,12 +41,11 @@ void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
// Using layer_impl because either bounds() or paint_properties().bounds
// may disagree and either one could have been pushed to layer_impl.
pile_->SetEmptyBounds();
- } else if (update_source_frame_number_ ==
- layer_tree_host()->source_frame_number()) {
- // TODO(ernstm): This DCHECK is only valid as long as the pile's tiling_rect
- // is identical to the layer_rect.
+ } else {
// If update called, then pile size must match bounds pushed to impl layer.
- DCHECK_EQ(layer_impl->bounds().ToString(), pile_->tiling_size().ToString());
+ DCHECK_IMPLIES(
+ update_source_frame_number_ == layer_tree_host()->source_frame_number(),
+ layer_impl->bounds().ToString() == pile_->tiling_size().ToString());
}
// Unlike other properties, invalidation must always be set on layer_impl.
« no previous file with comments | « cc/layers/layer_impl_unittest.cc ('k') | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698