Change cc::ElementId to be a uint64_t

cc/layers/layer_impl.cc

 // Copyright 2012 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/layers/layer_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 609 matching lines @@
   else
     return 1.f;
 }
 
 const gfx::Transform& LayerImpl::Transform() const {
   DCHECK_NE(GetTransformTree().FindNodeFromOwningLayerId(id()), nullptr);
   return GetTransformTree().FindNodeFromOwningLayerId(id())->local;
 }
 
 void LayerImpl::SetElementId(ElementId element_id) {
-  if (element_id == element_id_)
+  if (element_id.id == element_id_.id)
     return;
 
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
-               "LayerImpl::SetElementId", "element",
-               element_id.AsValue().release());
+               "LayerImpl::SetElementId", "element", element_id.id);
 
   layer_tree_impl_->RemoveFromElementMap(this);
   element_id_ = element_id;
   layer_tree_impl_->AddToElementMap(this);
 
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetMutableProperties(uint32_t properties) {
   if (mutable_properties_ == properties)
@@ skipping 146 matching lines @@
 
   state->SetDouble("opacity", Opacity());
 
   MathUtil::AddToTracedValue("position", position_, state);
 
   state->SetInteger("draws_content", DrawsContent());
   state->SetInteger("gpu_memory_usage",
                     base::saturated_cast<int>(GPUMemoryUsageInBytes()));
 
   if (element_id_)
-    element_id_.AddToTracedValue(state);
+    state->SetInteger("element_id", element_id_.id);
 
   if (mutable_properties_ != MutableProperty::kNone)
     state->SetInteger("mutable_properties", mutable_properties_);
 
   MathUtil::AddToTracedValue("scroll_offset", CurrentScrollOffset(), state);
 
   if (!ScreenSpaceTransform().IsIdentity())
     MathUtil::AddToTracedValue("screen_space_transform", ScreenSpaceTransform(),
                                state);
 
@@ skipping 160 matching lines @@
 
 ScrollTree& LayerImpl::GetScrollTree() const {
   return GetPropertyTrees()->scroll_tree;
 }
 
 TransformTree& LayerImpl::GetTransformTree() const {
   return GetPropertyTrees()->transform_tree;
 }
 
 }  // namespace cc