Change cc::ElementId to be a uint64_t

third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp

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..9aad9b5a2d7e9bfa5e46df2f64ae72c5196cf4da 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
@@ -93,8 +93,9 @@ 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)
+  uint64_t element_id = DomNodeIdFromCompositorElementId(

[suzyh_UTC10 (ex-contributor), 2017/05/08 01:04:15]

DOMNodeId instead of uint64_t? Also consider renaming the variable, since it's
not an ElementId.

[chrishtr, 2017/05/08 16:32:13]

Done.

+      data_->current_native_scrolling_element());
+  if (!element_id)
     return nullptr;
   return ElementForId(element_id);
 }