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

Unified Diff: cc/trees/property_tree.cc

Issue 2632313002: cc: Compute RenderSurfaceImpl's TransformTreeIndex using its effect node (Closed)
Patch Set: Created 3 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/draw_property_utils.cc ('k') | no next file » | 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 e56c0e42662352879120732b062b1eb16e5d1538..87eee55871f05f597ad61e30bfd5db55e2c93a3c 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc
@@ -49,6 +49,7 @@ TransformTree::TransformTree()
device_scale_factor_(1.f),
device_transform_scale_factor_(1.f) {
cached_data_.push_back(TransformCachedNodeData());
+ cached_data_[kRootNodeId].target_id = kRootNodeId;
}
TransformTree::~TransformTree() = default;
@@ -117,6 +118,7 @@ void TransformTree::clear() {
nodes_affected_by_outer_viewport_bounds_delta_.clear();
cached_data_.clear();
cached_data_.push_back(TransformCachedNodeData());
+ cached_data_[kRootNodeId].target_id = kRootNodeId;
sticky_position_data_.clear();
#if DCHECK_IS_ON()
@@ -2066,8 +2068,7 @@ void PropertyTrees::UpdateCachedNumber() {
gfx::Transform PropertyTrees::ToScreenSpaceTransformWithoutSurfaceContentsScale(
int transform_id,
int effect_id) const {
- DCHECK_GT(transform_id, 0);
- if (transform_id == 1) {
+ if (transform_id == TransformTree::kRootNodeId) {
return gfx::Transform();
}
gfx::Transform screen_space_transform = transform_tree.ToScreen(transform_id);
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698