Change cc::ElementId to be a uint64_t

cc/trees/layer_tree_host.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.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1193 matching lines @@
     tree_impl->SetPendingPageScaleAnimation(
         std::move(pending_page_scale_animation_));
   }
 
   DCHECK(!tree_impl->ViewportSizeInvalid());
 
   tree_impl->set_has_ever_been_drawn(false);
 }
 
 Layer* LayerTreeHost::LayerByElementId(ElementId element_id) const {
-  auto iter = element_layers_map_.find(element_id);
+  auto iter = element_layers_map_.find(element_id.id);
   return iter != element_layers_map_.end() ? iter->second : nullptr;
 }
 
 void LayerTreeHost::RegisterElement(ElementId element_id,
                                     ElementListType list_type,
                                     Layer* layer) {
   if (layer->element_id()) {
-    element_layers_map_[layer->element_id()] = layer;
+    element_layers_map_[layer->element_id().id] = layer;
   }
 
   mutator_host_->RegisterElement(element_id, list_type);
 }
 
 void LayerTreeHost::UnregisterElement(ElementId element_id,
                                       ElementListType list_type,
                                       Layer* layer) {
   mutator_host_->UnregisterElement(element_id, list_type);
 
   if (layer->element_id()) {
-    element_layers_map_.erase(layer->element_id());
+    element_layers_map_.erase(layer->element_id().id);
   }
 }
 
 static void SetElementIdForTesting(Layer* layer) {
-  layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
+  ElementId element_id;
+  element_id.id = layer->id();
+  layer->SetElementId(element_id);
 }
 
 void LayerTreeHost::SetElementIdsForTesting() {
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, SetElementIdForTesting);
 }
 
 void LayerTreeHost::BuildPropertyTreesForTesting() {
   gfx::Transform identity_transform;
   PropertyTreeBuilder::BuildPropertyTrees(
       root_layer(), page_scale_layer(), inner_viewport_scroll_layer(),
@@ skipping 193 matching lines @@
 void LayerTreeHost::SetNeedsDisplayOnAllLayers() {
   for (auto* layer : *this)
     layer->SetNeedsDisplay();
 }
 
 void LayerTreeHost::SetHasCopyRequest(bool has_copy_request) {
   has_copy_request_ = has_copy_request;
 }
 
 }  // namespace cc