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

Side by Side Diff: cc/trees/property_tree.cc

Issue 2702053002: Remove ScrollNode's layer_id_to_scrollbars_enabled_map (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « cc/trees/property_tree.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 1135
1136 bool is_currently_scrolling_node_equal = 1136 bool is_currently_scrolling_node_equal =
1137 currently_scrolling_node_id_ == other.currently_scrolling_node_id_; 1137 currently_scrolling_node_id_ == other.currently_scrolling_node_id_;
1138 1138
1139 return PropertyTree::operator==(other) && is_currently_scrolling_node_equal; 1139 return PropertyTree::operator==(other) && is_currently_scrolling_node_equal;
1140 } 1140 }
1141 1141
1142 #if DCHECK_IS_ON() 1142 #if DCHECK_IS_ON()
1143 void ScrollTree::CopyCompleteTreeState(const ScrollTree& other) { 1143 void ScrollTree::CopyCompleteTreeState(const ScrollTree& other) {
1144 currently_scrolling_node_id_ = other.currently_scrolling_node_id_; 1144 currently_scrolling_node_id_ = other.currently_scrolling_node_id_;
1145 layer_id_to_scrollbars_enabled_map_ =
1146 other.layer_id_to_scrollbars_enabled_map_;
1147 layer_id_to_scroll_offset_map_ = other.layer_id_to_scroll_offset_map_; 1145 layer_id_to_scroll_offset_map_ = other.layer_id_to_scroll_offset_map_;
1148 layer_id_to_synced_scroll_offset_map_ = 1146 layer_id_to_synced_scroll_offset_map_ =
1149 other.layer_id_to_synced_scroll_offset_map_; 1147 other.layer_id_to_synced_scroll_offset_map_;
1150 } 1148 }
1151 #endif 1149 #endif
1152 1150
1153 void ScrollTree::clear() { 1151 void ScrollTree::clear() {
1154 PropertyTree<ScrollNode>::clear(); 1152 PropertyTree<ScrollNode>::clear();
1155 1153
1156 if (property_trees()->is_main_thread) { 1154 if (property_trees()->is_main_thread) {
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 2094
2097 const EffectNode* effect_node = effect_tree.Node(effect_id); 2095 const EffectNode* effect_node = effect_tree.Node(effect_id);
2098 2096
2099 bool success = GetFromTarget(transform_id, effect_id, transform); 2097 bool success = GetFromTarget(transform_id, effect_id, transform);
2100 transform->Scale(effect_node->surface_contents_scale.x(), 2098 transform->Scale(effect_node->surface_contents_scale.x(),
2101 effect_node->surface_contents_scale.y()); 2099 effect_node->surface_contents_scale.y());
2102 return success; 2100 return success;
2103 } 2101 }
2104 2102
2105 } // namespace cc 2103 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698