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

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

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: Merge branch 'master' into secondaryid 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 12053e2f735c1fceb889ad83582c232b706f73cc..eb27f48b164067978908c2909661bfcb7ab2074e 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 == kInvalidDOMNodeId)
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