Change cc::ElementId to be a uint64_t

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/page/scrolling/ScrollState.h"
 
 #include <memory>
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Element.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 75 matching lines @@
 
   if (x)
     data_->caused_scroll_x = true;
   if (y)
     data_->caused_scroll_y = true;
   if (x || y)
     data_->delta_consumed_for_scroll_sequence = true;
 }
 
 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);
 }
 
 void ScrollState::SetCurrentNativeScrollingElement(Element* element) {
   data_->set_current_native_scrolling_element(CreateCompositorElementId(
       DOMNodeIds::IdForNode(element), CompositorSubElementId::kScroll));
 }
 
 void ScrollState::SetCurrentNativeScrollingElementById(int element_id) {
   data_->set_current_native_scrolling_element(
       CreateCompositorElementId(element_id, CompositorSubElementId::kScroll));
 }
 
 }  // namespace blink