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

Unified Diff: cc/input/scroll_state_data.cc

Issue 1973083002: Use element id's for animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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.h ('k') | cc/layers/layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/scroll_state_data.cc
diff --git a/cc/input/scroll_state_data.cc b/cc/input/scroll_state_data.cc
index a3b60322f092d200019b89fa15ce33080a13e7d4..1ba778d95858bbe319222e1d1241885d4c4a4434 100644
--- a/cc/input/scroll_state_data.cc
+++ b/cc/input/scroll_state_data.cc
@@ -23,26 +23,28 @@ ScrollStateData::ScrollStateData()
delta_granularity(0),
caused_scroll_x(false),
caused_scroll_y(false),
- current_native_scrolling_node_(nullptr),
- current_native_scrolling_element_(0) {}
+ current_native_scrolling_node_(nullptr) {}
ScrollStateData::ScrollStateData(const ScrollStateData& other) = default;
ScrollNode* ScrollStateData::current_native_scrolling_node() const {
return current_native_scrolling_node_;
}
+
void ScrollStateData::set_current_native_scrolling_node(
ScrollNode* current_native_scrolling_node) {
current_native_scrolling_node_ = current_native_scrolling_node;
- current_native_scrolling_element_ = 0;
+ current_native_scrolling_element_ = ElementId();
}
-uint64_t ScrollStateData::current_native_scrolling_element() const {
+
+ElementId ScrollStateData::current_native_scrolling_element() const {
if (current_native_scrolling_node_)
return current_native_scrolling_node_->data.element_id;
return current_native_scrolling_element_;
}
+
void ScrollStateData::set_current_native_scrolling_element(
- uint64_t element_id) {
+ ElementId element_id) {
current_native_scrolling_element_ = element_id;
current_native_scrolling_node_ = nullptr;
}
« no previous file with comments | « cc/input/scroll_state_data.h ('k') | cc/layers/layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698