CC Animation: Unify ElementId in Blink Compositor Worker.

third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp

Index: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
index ce69fab63ceb98622605f14ea5d44a4083d3852a..f9215ceed289901e82bb6936a8cb605e88f96b3c 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
@@ -24,6 +24,7 @@
 #include "core/fileapi/File.h"
 #include "core/fileapi/FileList.h"
 #include "platform/RuntimeEnabledFeatures.h"
+#include "platform/graphics/CompositorElementId.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebBlobInfo.h"
 #include "wtf/DateMath.h"
@@ -209,7 +210,8 @@ void SerializedScriptValueWriter::writeBlobIndex(int blobIndex)
 void SerializedScriptValueWriter::writeCompositorProxy(const CompositorProxy& compositorProxy)
 {
     append(CompositorProxyTag);
-    doWriteUint64(compositorProxy.elementId());
+    CompositorElementId elementId = compositorProxy.elementId();
+    doWriteInt32(elementId);
     doWriteUint32(compositorProxy.compositorMutableProperties());
 }
 
@@ -494,6 +496,11 @@ int SerializedScriptValueWriter::bytesNeededToWireEncode(uint32_t value)
     return bytes;
 }
 
+void SerializedScriptValueWriter::doWriteInt32(int32_t value)
+{
+    doWriteUintHelper(value);
+}
+
 void SerializedScriptValueWriter::doWriteUint32(uint32_t value)
 {
     doWriteUintHelper(value);
@@ -1717,13 +1724,13 @@ bool SerializedScriptValueReader::readImageBitmap(v8::Local<v8::Value>* value)
 bool SerializedScriptValueReader::readCompositorProxy(v8::Local<v8::Value>* value)
 {
     uint32_t attributes;
-    uint64_t element;
-    if (!doReadUint64(&element))
+    CompositorElementId elementId;
+    if (!doReadInt32(&elementId))
         return false;
     if (!doReadUint32(&attributes))
         return false;
 
-    CompositorProxy* compositorProxy = CompositorProxy::create(element, attributes);
+    CompositorProxy* compositorProxy = CompositorProxy::create(elementId, attributes);
     *value = toV8(compositorProxy, m_scriptState->context()->Global(), isolate());
     return !value->IsEmpty();
 }
@@ -1997,6 +2004,11 @@ File* SerializedScriptValueReader::readFileIndexHelper()
     return File::createFromIndexedSerialization(info.filePath(), info.fileName(), info.size(), lastModifiedMS, getOrCreateBlobDataHandle(info.uuid(), info.type(), info.size()));
 }
 
+bool SerializedScriptValueReader::doReadInt32(int32_t* value)
+{
+    return doReadUintHelper(value);
+}
+
 bool SerializedScriptValueReader::doReadUint32(uint32_t* value)
 {
     return doReadUintHelper(value);