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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 1547893003: WIP - compositor worker mega patch. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 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/trees/layer_tree_impl.h ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 513ce5e5bd5b267efe90f41ba05f87519af69e0d..78c75c6ccbe3f276fbc65b262450c86263141e24 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -379,15 +379,12 @@ void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
ElementLayers& layers = element_layers_map_[layer->element_id()];
if (layer->mutable_properties() & kMainLayerFlags) {
- if (!layers.main || layer->IsActive())
- layers.main = layer;
+ layers.main = layer;
}
if (layer->mutable_properties() & kScrollLayerFlags) {
- if (!layers.scroll || layer->IsActive()) {
- TRACE_EVENT2("compositor-worker", "LayerTreeImpl::AddToElementMap scroll",
- "element_id", layer->element_id(), "layer_id", layer->id());
- layers.scroll = layer;
- }
+ TRACE_EVENT2("compositor-worker", "LayerTreeImpl::AddToElementMap scroll",
+ "element_id", layer->element_id(), "layer_id", layer->id());
+ layers.scroll = layer;
}
}
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698