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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2877033002: Fix cc scrollbar layer issues with initialization, and use element ids throughout. (Closed)
Patch Set: none Created 3 years, 7 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/property_tree.cc ('k') | third_party/WebKit/Source/core/animation/Animation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 3a3e1dbaf8682a54815be47e65b07eb614f65381..696e5c48b0589f3ccfbb117cdda910b660e1b029 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -708,14 +708,6 @@ static inline bool HideLayerAndSubtree(LayerImpl* layer) {
return layer->test_properties()->hide_layer_and_subtree;
}
-static inline bool AlwaysUseActiveTreeOpacity(Layer* layer) {
- return layer->AlwaysUseActiveTreeOpacity();
-}
-
-static inline bool AlwaysUseActiveTreeOpacity(LayerImpl* layer) {
- return false;
-}
-
static inline bool HasCopyRequest(Layer* layer) {
return layer->HasCopyRequest();
}
@@ -918,11 +910,6 @@ bool AddEffectNodeIfNeeded(
EffectNode* node = effect_tree.back();
node->owning_layer_id = layer->id();
- if (AlwaysUseActiveTreeOpacity(layer)) {
- data_for_children->property_trees->always_use_active_tree_opacity_effect_ids
- .push_back(node->owning_layer_id);
- }
-
node->opacity = Opacity(layer);
node->blend_mode = BlendMode(layer);
node->unscaled_mask_target_size = layer->bounds();
« no previous file with comments | « cc/trees/property_tree.cc ('k') | third_party/WebKit/Source/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698