Change cc::ElementId to be a uint64_t

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

Index: third_party/WebKit/Source/platform/graphics/paint/PropertyTreeState.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeState.cpp b/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeState.cpp
index 8d9a47dee1cf8c0bc3a8bb45f7ead5ff5f2ee14e..96e70f5cf981e0856054b4fcaa261044e67f1a36 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeState.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeState.cpp
@@ -38,7 +38,7 @@ bool IsAncestorOf(const PropertyNode* ancestor, const PropertyNode* child) {
   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
@@ -53,10 +53,10 @@ const CompositorElementId PropertyTreeState::GetCompositorElementId(
   // 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();
 }