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

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none Created 3 years, 7 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
Index: third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
index c28dc3770c577fcfcaf88c1f737a99ab704d2db8..801034941295c5d5379c64f8fb811f6b8f1dd529 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
@@ -93,10 +93,11 @@ void ScrollState::ConsumeDeltaNative(double x, double y) {
}
Element* ScrollState::CurrentNativeScrollingElement() const {
- uint64_t element_id = data_->current_native_scrolling_element().primaryId;
- if (element_id == 0)
+ DOMNodeId dom_node_id = DomNodeIdFromCompositorElementId(
+ data_->current_native_scrolling_element());
+ if (!dom_node_id)
return nullptr;
- return ElementForId(element_id);
+ return ElementForId(dom_node_id);
}
void ScrollState::SetCurrentNativeScrollingElement(Element* element) {

Powered by Google App Engine
This is Rietveld 408576698