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

Unified Diff: cc/trees/property_tree.h

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/mutator_host_client.h ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree.h
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
index 2bbc9be9d0b780764075223759b5d10d5a6d80ea..4264a1c6962fb911ae170753e3f01bf2751dce09 100644
--- a/cc/trees/property_tree.h
+++ b/cc/trees/property_tree.h
@@ -11,7 +11,6 @@
#include <unordered_map>
#include <vector>
-#include "cc/animation/element_id.h"
#include "cc/base/cc_export.h"
#include "cc/base/synced_property.h"
#include "ui/gfx/geometry/rect_f.h"
@@ -325,7 +324,7 @@
bool should_flatten;
bool user_scrollable_horizontal;
bool user_scrollable_vertical;
- ElementId element_id;
+ int element_id;
int transform_id;
// Number of drawn layers pointing to this node or any of its descendants.
int num_drawn_descendants;
« no previous file with comments | « cc/trees/mutator_host_client.h ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698