Change cc::ElementId to be a uint64_t

third_party/WebKit/Source/platform/graphics/paint/PropertyTreeState.cpp

 // Copyright 2016 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 "platform/graphics/paint/PropertyTreeState.h"
 
 #include "platform/graphics/paint/GeometryMapper.h"
 
 namespace blink {
 
@@ skipping 20 matching lines @@
 }
 
 template <typename PropertyNode>
 bool IsAncestorOf(const PropertyNode* ancestor, const PropertyNode* child) {
   while (child && child != ancestor) {
     child = child->Parent();
   }
   return child == ancestor;
 }
 
-const CompositorElementId PropertyTreeState::GetCompositorElementId(
+CompositorElementId PropertyTreeState::GetCompositorElementId(
     const CompositorElementIdSet& element_ids) const {
 // The effect or transform nodes could have a compositor element id. The order
 // doesn't matter as the element id should be the same on all that have a
 // non-default CompositorElementId.
 //
 // Note that PropertyTreeState acts as a context that accumulates state as we
 // traverse the tree building layers. This means that we could see a compositor
 // element id 'A' for a parent layer in conjunction with a compositor element id
 // 'B' for a child layer. To preserve uniqueness of element ids, then, we check
 // for presence in the |element_ids| set (which represents element ids already
 // previously attached to a layer). This is an interim step while we pursue
 // broader rework of animation subsystem noted in http://crbug.com/709137.
 #if DCHECK_IS_ON()
-  CompositorElementId expected_element_id;
+  CompositorElementId expected_element_id = kInvalidElementId;
   CompositorElementId effect_element_id = Effect()->GetCompositorElementId();
   if (effect_element_id && !element_ids.Contains(effect_element_id)) {
     expected_element_id = effect_element_id;
   }
   CompositorElementId transform_element_id =
       Transform()->GetCompositorElementId();
   if (expected_element_id && transform_element_id &&
       !element_ids.Contains(transform_element_id)) {
     DCHECK_EQ(expected_element_id, transform_element_id);
   }
@@ skipping 59 matching lines @@
 #if DCHECK_IS_ON()
 
 String PropertyTreeState::ToTreeString() const {
   return Transform()->ToTreeString() + "\n" + Clip()->ToTreeString() + "\n" +
          Effect()->ToTreeString();
 }
 
 #endif
 
 }  // namespace blink