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..f1d4b356bc2b44fc22dfbec1a079ffc9b3bf816b 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(
+      data_->current_native_scrolling_element());
+  if (element_id == kInvalidElementId)
     return nullptr;
   return ElementForId(element_id);
 }