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

Unified Diff: cc/trees/property_tree.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.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/property_tree.cc
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
index fbedc16878b0cfe83a49df79688311b9513bdcab..974c0b2693930e1e201796e0876e6e3f3ea74c50 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc
@@ -1622,8 +1622,6 @@ bool PropertyTrees::operator==(const PropertyTrees& other) const {
other.element_id_to_scroll_node_index &&
element_id_to_transform_node_index ==
other.element_id_to_transform_node_index &&
- always_use_active_tree_opacity_effect_ids ==
- other.always_use_active_tree_opacity_effect_ids &&
needs_rebuild == other.needs_rebuild && changed == other.changed &&
full_tree_damaged == other.full_tree_damaged &&
is_main_thread == other.is_main_thread &&
@@ -1637,8 +1635,6 @@ PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) {
effect_tree = from.effect_tree;
clip_tree = from.clip_tree;
scroll_tree = from.scroll_tree;
- always_use_active_tree_opacity_effect_ids =
- from.always_use_active_tree_opacity_effect_ids;
element_id_to_effect_node_index = from.element_id_to_effect_node_index;
element_id_to_scroll_node_index = from.element_id_to_scroll_node_index;
element_id_to_transform_node_index = from.element_id_to_transform_node_index;
@@ -1671,7 +1667,6 @@ void PropertyTrees::clear() {
element_id_to_effect_node_index.clear();
element_id_to_scroll_node_index.clear();
element_id_to_transform_node_index.clear();
- always_use_active_tree_opacity_effect_ids.clear();
needs_rebuild = true;
full_tree_damaged = false;
@@ -1717,22 +1712,6 @@ void PropertyTrees::SetInnerViewportScrollBoundsDelta(
inner_viewport_scroll_bounds_delta_ = bounds_delta;
}
-void PropertyTrees::PushOpacityIfNeeded(PropertyTrees* target_tree) {
- for (int id : target_tree->always_use_active_tree_opacity_effect_ids) {
- if (const EffectNode* source_effect_node =
- effect_tree.FindNodeFromOwningLayerId(id)) {
- EffectNode* target_effect_node =
- target_tree->effect_tree.UpdateNodeFromOwningLayerId(id);
- float source_opacity = source_effect_node->opacity;
- float target_opacity = target_effect_node->opacity;
- if (source_opacity == target_opacity)
- continue;
- target_effect_node->opacity = source_opacity;
- target_tree->effect_tree.set_needs_update(true);
- }
- }
-}
-
void PropertyTrees::RemoveIdFromIdToIndexMaps(int id) {
transform_tree.SetOwningLayerIdForNode(nullptr, id);
clip_tree.SetOwningLayerIdForNode(nullptr, id);
« no previous file with comments | « cc/trees/property_tree.h ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698