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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 926023003: cc: Fix bug in generating picture layer pairs from 2 lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layerlistbug: . Created 5 years, 10 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/test/fake_picture_layer_impl.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 95e1ab1866834c9582ad4f95a117bbdbc44f97f2..ec302df1a267a74e3e97a20383f29a42a874e95f 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1238,9 +1238,12 @@ void LayerTreeHostImpl::GetPictureLayerImplPairs(
for (auto& layer : pending_tree_->picture_layers()) {
if (need_valid_tile_priorities && !layer->HasValidTilePriorities())
continue;
- if (layer->GetPendingOrActiveTwinLayer()) {
- // Already captured from the active tree.
- continue;
+ if (PictureLayerImpl* twin_layer = layer->GetPendingOrActiveTwinLayer()) {
+ if (!need_valid_tile_priorities ||
+ twin_layer->HasValidTilePriorities()) {
+ // Already captured from the active tree.
+ continue;
+ }
}
layer_pairs->push_back(PictureLayerImpl::Pair(nullptr, layer));
}
« no previous file with comments | « cc/test/fake_picture_layer_impl.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698