Change cc::ElementId to be a uint64_t

cc/trees/layer_tree_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_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 362 matching lines @@
   property_trees_.is_active = IsActiveTree();
   property_trees_.transform_tree.set_source_to_parent_updates_allowed(false);
 }
 
 void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
   // The request queue should have been processed and does not require a push.
   DCHECK_EQ(ui_resource_request_queue_.size(), 0u);
 
   // To maintain the current scrolling node we need to use element ids which
   // are stable across the property tree update in SetPropertyTrees.
-  ElementId scrolling_element_id;
+  ElementId scrolling_element_id = 0;

[wkorman, 2017/05/05 20:06:10]

kInvalidElementId here?

[chrishtr, 2017/05/05 20:46:09]

Done.

   if (ScrollNode* scrolling_node = target_tree->CurrentlyScrollingNode())
     scrolling_element_id = scrolling_node->element_id;
 
   target_tree->SetPropertyTrees(&property_trees_);
 
   ScrollNode* scrolling_node = nullptr;
   if (scrolling_element_id) {
     auto& scroll_tree = target_tree->property_trees()->scroll_tree;
     scrolling_node = scroll_tree.FindNodeFromElementId(scrolling_element_id);
   }
@@ skipping 135 matching lines @@
 LayerImpl* LayerTreeImpl::LayerByElementId(ElementId element_id) const {
   return LayerById(LayerIdByElementId(element_id));
 }
 
 void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
   ElementId element_id = layer->element_id();
   if (!element_id)
     return;
 
   TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
-               "LayerTreeImpl::AddToElementMap", "element",
-               element_id.AsValue().release(), "layer_id", layer->id());
+               "LayerTreeImpl::AddToElementMap", "element", element_id,
+               "layer_id", layer->id());
 
 #if DCHECK_IS_ON()
   LayerImpl* existing_layer = LayerByElementId(element_id);
   bool element_id_collision_detected =
       existing_layer && existing_layer != layer;
 
   // TODO(pdr): Remove this suppression and always check for id collisions.
   // This is a temporary suppression for SPV2 which generates unnecessary
   // layers that collide. Remove once crbug.com/693693 is fixed.
   if (!settings().use_layer_lists)
     DCHECK(!element_id_collision_detected);
 #endif
 
   element_layers_map_[element_id] = layer->id();
 
   layer_tree_host_impl_->mutator_host()->RegisterElement(
       element_id,
       IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING);
 }
 
 void LayerTreeImpl::RemoveFromElementMap(LayerImpl* layer) {
   if (!layer->element_id())
     return;
 
   TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "LayerTreeImpl::RemoveFromElementMap", "element",
-               layer->element_id().AsValue().release(), "layer_id",
-               layer->id());
+               layer->element_id(), "layer_id", layer->id());
 
   layer_tree_host_impl_->mutator_host()->UnregisterElement(
       layer->element_id(),
       IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING);
 
   element_layers_map_.erase(layer->element_id());
 }
 
 void LayerTreeImpl::AddToOpacityAnimationsMap(int id, float opacity) {
   if (LayerImpl* layer = LayerById(id))
@@ skipping 399 matching lines @@
 
 void LayerTreeImpl::ClearViewportLayers() {
   overscroll_elasticity_layer_id_ = Layer::INVALID_ID;
   page_scale_layer_id_ = Layer::INVALID_ID;
   inner_viewport_scroll_layer_id_ = Layer::INVALID_ID;
   outer_viewport_scroll_layer_id_ = Layer::INVALID_ID;
 }
 
 // For unit tests, we use the layer's id as its element id.
 static void SetElementIdForTesting(LayerImpl* layer) {
-  layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
+  layer->SetElementId(layer->id());
 }
 
 void LayerTreeImpl::SetElementIdsForTesting() {
   LayerListIterator<LayerImpl> it(root_layer_for_testing_);
   for (; it != LayerListIterator<LayerImpl>(nullptr); ++it) {
     if (!it->element_id())
       SetElementIdForTesting(*it);
   }
 }
 
@@ skipping 1093 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc