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

Unified Diff: cc/layers/layer.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/input/scroll_state_data.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 2ab8108aa403ba382d8801dcbaa480ce41853759..c56ff2998d920c18605c3655be549ae6450d3cf4 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -17,7 +17,6 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
-#include "cc/animation/element_id.h"
#include "cc/animation/target_property.h"
#include "cc/base/cc_export.h"
#include "cc/base/region.h"
@@ -489,8 +488,8 @@
int num_copy_requests_in_target_subtree();
- void SetElementId(ElementId id);
- ElementId element_id() const { return element_id_; }
+ void SetElementId(uint64_t id);
+ uint64_t element_id() const { return element_id_; }
void SetMutableProperties(uint32_t properties);
uint32_t mutable_properties() const { return mutable_properties_; }
@@ -626,7 +625,7 @@
int clip_tree_index_;
int scroll_tree_index_;
int property_tree_sequence_number_;
- ElementId element_id_;
+ uint64_t element_id_;
uint32_t mutable_properties_;
gfx::Vector2dF offset_to_transform_parent_;
uint32_t main_thread_scrolling_reasons_;
« no previous file with comments | « cc/input/scroll_state_data.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698