CC Animation: Unify ElementId in Blink Compositor Worker.

third_party/WebKit/Source/core/dom/CompositorProxy.h

Index: third_party/WebKit/Source/core/dom/CompositorProxy.h
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.h b/third_party/WebKit/Source/core/dom/CompositorProxy.h
index cbf97665072115c48045db6919c5cd836a409b38..1d3750d243a22ebab1e0dcfc6fdbf76a975f5d7c 100644
--- a/third_party/WebKit/Source/core/dom/CompositorProxy.h
+++ b/third_party/WebKit/Source/core/dom/CompositorProxy.h
@@ -8,6 +8,7 @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/DOMMatrix.h"
 #include "core/dom/Element.h"
+#include "platform/graphics/CompositorElementId.h"
 #include "platform/heap/Handle.h"
 #include "wtf/text/WTFString.h"
 
@@ -21,7 +22,7 @@ class CompositorProxy final : public GarbageCollectedFinalized<CompositorProxy>,
     DEFINE_WRAPPERTYPEINFO();
 public:
     static CompositorProxy* create(ExecutionContext*, Element*, const Vector<String>& attributeArray, ExceptionState&);
-    static CompositorProxy* create(uint64_t element, uint32_t compositorMutableProperties);
+    static CompositorProxy* create(CompositorElementId, uint32_t compositorMutableProperties);
     virtual ~CompositorProxy();
 
     DEFINE_INLINE_TRACE()
@@ -29,7 +30,7 @@ public:
         visitor->trace(m_transform);
     }
 
-    uint64_t elementId() const { return m_elementId; }
+    CompositorElementId elementId() const { return m_elementId; }
     uint32_t compositorMutableProperties() const { return m_compositorMutableProperties; }
     bool supports(const String& attribute) const;
 
@@ -48,12 +49,12 @@ public:
 
 protected:
     CompositorProxy(Element&, const Vector<String>& attributeArray);
-    CompositorProxy(uint64_t element, uint32_t compositorMutableProperties);
+    CompositorProxy(CompositorElementId, uint32_t compositorMutableProperties);
 
 private:
     bool raiseExceptionIfNotMutable(uint32_t compositorMutableProperty, ExceptionState&) const;
 
-    const uint64_t m_elementId = 0;
+    const CompositorElementId m_elementId = 0;
     const uint32_t m_compositorMutableProperties = 0;
     uint32_t m_mutatedProperties = 0;