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 (Effect()->GetCompositorElementId() &&
-      !element_ids.Contains(Effect()->GetCompositorElementId()))
+      !element_ids.Contains(Effect()->GetCompositorElementId().id))

[wkorman, 2017/05/08 18:23:25]

These bum me out and there's no STL help here due to wtf unless we go back to
the wtf hash def this change was aiming to avoid.

     return Effect()->GetCompositorElementId();
   if (Transform()->GetCompositorElementId() &&
-      !element_ids.Contains(Transform()->GetCompositorElementId()))
+      !element_ids.Contains(Transform()->GetCompositorElementId().id))
     return Transform()->GetCompositorElementId();
   return CompositorElementId();
 }
 
 PropertyTreeState::InnermostNode PropertyTreeState::GetInnermostNode() const {
   // TODO(chrishtr): this is very inefficient when innermostNode() is called
   // repeatedly.
   bool clip_transform_strict_ancestor_of_transform =
       clip_->LocalTransformSpace() != transform_.Get() &&
       IsAncestorOf<TransformPaintPropertyNode>(clip_->LocalTransformSpace(),
@@ skipping 43 matching lines @@
 #if DCHECK_IS_ON()
 
 String PropertyTreeState::ToTreeString() const {
   return Transform()->ToTreeString() + "\n" + Clip()->ToTreeString() + "\n" +
          Effect()->ToTreeString();
 }
 
 #endif
 
 }  // namespace blink