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

Unified Diff: cc/trees/property_tree.cc

Issue 2049063002: Revert of Use element id's for animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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') | 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.cc
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
index 89b8cea7b73672e2e48c315628d41d4c8a22a2e6..894b2d5da469a38121fc404424b943c810b494e4 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc
@@ -608,6 +608,7 @@
should_flatten(false),
user_scrollable_horizontal(false),
user_scrollable_vertical(false),
+ element_id(0),
transform_id(0),
num_drawn_descendants(0) {}
@@ -652,7 +653,7 @@
data->set_should_flatten(should_flatten);
data->set_user_scrollable_horizontal(user_scrollable_horizontal);
data->set_user_scrollable_vertical(user_scrollable_vertical);
- element_id.ToProtobuf(data->mutable_element_id());
+ data->set_element_id(element_id);
data->set_transform_id(transform_id);
}
@@ -675,7 +676,7 @@
should_flatten = data.should_flatten();
user_scrollable_horizontal = data.user_scrollable_horizontal();
user_scrollable_vertical = data.user_scrollable_vertical();
- element_id.FromProtobuf(data.element_id());
+ element_id = data.element_id();
transform_id = data.transform_id();
}
@@ -689,8 +690,7 @@
value->SetBoolean("should_flatten", should_flatten);
value->SetBoolean("user_scrollable_horizontal", user_scrollable_horizontal);
value->SetBoolean("user_scrollable_vertical", user_scrollable_vertical);
-
- element_id.AddToTracedValue(value);
+ value->SetInteger("element_id", element_id);
value->SetInteger("transform_id", transform_id);
}
« no previous file with comments | « cc/trees/property_tree.h ('k') | third_party/WebKit/Source/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698