CC Animation: Unify ElementId in Blink Compositor Worker.

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

 // Copyright 2014 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 "bindings/core/v8/ScriptValueSerializer.h"
 
 #include "bindings/core/v8/Transferables.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8ArrayBufferView.h"
 #include "bindings/core/v8/V8Blob.h"
 #include "bindings/core/v8/V8CompositorProxy.h"
 #include "bindings/core/v8/V8File.h"
 #include "bindings/core/v8/V8FileList.h"
 #include "bindings/core/v8/V8ImageBitmap.h"
 #include "bindings/core/v8/V8ImageData.h"
 #include "bindings/core/v8/V8MessagePort.h"
 #include "bindings/core/v8/V8OffscreenCanvas.h"
 #include "bindings/core/v8/V8SharedArrayBuffer.h"
 #include "core/dom/CompositorProxy.h"
 #include "core/dom/DOMDataView.h"
 #include "core/dom/DOMSharedArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/fileapi/Blob.h"
 #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"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 
 // FIXME: consider crashing in debug mode on deserialization errors
 // NOTE: be sure to change wireFormatVersion as necessary!
 
 namespace blink {
@@ skipping 165 matching lines @@
 void SerializedScriptValueWriter::writeBlobIndex(int blobIndex)
 {
     ASSERT(blobIndex >= 0);
     append(BlobIndexTag);
     doWriteUint32(blobIndex);
 }
 
 void SerializedScriptValueWriter::writeCompositorProxy(const CompositorProxy& compositorProxy)
 {
     append(CompositorProxyTag);
-    doWriteUint64(compositorProxy.elementId());
+    CompositorElementId elementId = compositorProxy.elementId();
+    doWriteInt32(elementId);
     doWriteUint32(compositorProxy.compositorMutableProperties());
 }
 
 void SerializedScriptValueWriter::writeFile(const File& file)
 {
     append(FileTag);
     doWriteFile(file);
 }
 
 void SerializedScriptValueWriter::writeFileIndex(int blobIndex)
@@ skipping 264 matching lines @@
     while (true) {
         value >>= SerializedScriptValue::varIntShift;
         if (!value)
             break;
         ++bytes;
     }
 
     return bytes;
 }
 
+void SerializedScriptValueWriter::doWriteInt32(int32_t value)
+{
+    doWriteUintHelper(value);
+}
+
 void SerializedScriptValueWriter::doWriteUint32(uint32_t value)
 {
     doWriteUintHelper(value);
 }
 
 void SerializedScriptValueWriter::doWriteUint64(uint64_t value)
 {
     doWriteUintHelper(value);
 }
 
@@ skipping 1203 matching lines @@
     ImageBitmap* imageBitmap = ImageBitmap::create(imageData, IntRect(0, 0, imageData->width(), imageData->height()), options, true);
     if (!imageBitmap)
         return false;
     *value = toV8(imageBitmap, m_scriptState->context()->Global(), isolate());
     return !value->IsEmpty();
 }
 
 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();
 }
 
 DOMArrayBuffer* SerializedScriptValueReader::doReadArrayBuffer()
 {
     uint32_t byteLength;
     if (!doReadUint32(&byteLength))
         return nullptr;
     if (m_position + byteLength > m_length)
@@ skipping 253 matching lines @@
     ASSERT(m_blobInfo);
     uint32_t index;
     if (!doReadUint32(&index) || index >= m_blobInfo->size())
         return nullptr;
     const WebBlobInfo& info = (*m_blobInfo)[index];
     // FIXME: transition WebBlobInfo.lastModified to be milliseconds-based also.
     double lastModifiedMS = info.lastModified() * msPerSecond;
     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);
 }
 
 bool SerializedScriptValueReader::doReadUint64(uint64_t* value)
 {
     return doReadUintHelper(value);
 }
 
@@ skipping 349 matching lines @@
         return false;
     uint32_t objectReference = m_openCompositeReferenceStack[m_openCompositeReferenceStack.size() - 1];
     m_openCompositeReferenceStack.shrink(m_openCompositeReferenceStack.size() - 1);
     if (objectReference >= m_objectPool.size())
         return false;
     *object = m_objectPool[objectReference];
     return true;
 }
 
 } // namespace blink