Change cc::ElementId to be a uint64_t

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 3524 matching lines @@
       tree_impl->InnerViewportScrollLayer()
           ? tree_impl->InnerViewportScrollLayer()->id()
           : Layer::INVALID_ID;
 
   tree_impl->property_trees()->scroll_tree.CollectScrollDeltas(
       scroll_info, inner_viewport_layer_id);
 }
 
 static void CollectScrollbarUpdates(
     ScrollAndScaleSet* scroll_info,
-    std::unordered_map<ElementId,
-                       std::unique_ptr<ScrollbarAnimationController>,
-                       ElementIdHash>* controllers) {
+    std::unordered_map<ElementId::Id,
+                       std::unique_ptr<ScrollbarAnimationController>>*
+        controllers) {
   scroll_info->scrollbars.reserve(controllers->size());
   for (auto& pair : *controllers) {
+    ElementId element_id;
+    element_id.id = pair.first;
     scroll_info->scrollbars.push_back(LayerTreeHostCommon::ScrollbarsUpdateInfo(
-        pair.first, pair.second->ScrollbarsHidden()));
+        element_id, pair.second->ScrollbarsHidden()));
   }
 }
 
 std::unique_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {
   std::unique_ptr<ScrollAndScaleSet> scroll_info(new ScrollAndScaleSet());
 
   CollectScrollDeltas(scroll_info.get(), active_tree_.get());
   CollectScrollbarUpdates(scroll_info.get(), &scrollbar_animation_controllers_);
   scroll_info->page_scale_delta =
       active_tree_->page_scale_factor()->PullDeltaForMainThread();
@@ skipping 125 matching lines @@
   return str;
 }
 
 void LayerTreeHostImpl::RegisterScrollbarAnimationController(
     ElementId scroll_element_id) {
   if (settings().scrollbar_animator == LayerTreeSettings::NO_ANIMATOR)
     return;
   if (ScrollbarAnimationControllerForElementId(scroll_element_id))
     return;
 
-  scrollbar_animation_controllers_[scroll_element_id] =
+  scrollbar_animation_controllers_[scroll_element_id.id] =
       active_tree_->CreateScrollbarAnimationController(scroll_element_id);
 }
 
 void LayerTreeHostImpl::UnregisterScrollbarAnimationController(
     ElementId scroll_element_id) {
-  scrollbar_animation_controllers_.erase(scroll_element_id);
+  scrollbar_animation_controllers_.erase(scroll_element_id.id);
 }
 
 ScrollbarAnimationController*
 LayerTreeHostImpl::ScrollbarAnimationControllerForElementId(
     ElementId scroll_element_id) const {
   // The viewport layers have only one set of scrollbars and their controller
   // is registered with the outer viewport.
   if (InnerViewportScrollLayer() && OuterViewportScrollLayer() &&
       scroll_element_id == InnerViewportScrollLayer()->element_id())
     scroll_element_id = OuterViewportScrollLayer()->element_id();
-  auto i = scrollbar_animation_controllers_.find(scroll_element_id);
+  auto i = scrollbar_animation_controllers_.find(scroll_element_id.id);
   if (i == scrollbar_animation_controllers_.end())
     return nullptr;
   return i->second.get();
 }
 
 void LayerTreeHostImpl::PostDelayedScrollbarAnimationTask(
     const base::Closure& task,
     base::TimeDelta delay) {
   client_->PostDelayedAnimationTaskOnImplThread(task, delay);
 }
@@ skipping 573 matching lines @@
 
 void LayerTreeHostImpl::ShowScrollbarsForImplScroll(ElementId element_id) {
   if (!element_id)
     return;
   if (ScrollbarAnimationController* animation_controller =
           ScrollbarAnimationControllerForElementId(element_id))
     animation_controller->DidScrollUpdate();
 }
 
 }  // namespace cc