[Binding] [Refactoring] Remove ScriptValueCompositeCreator

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"
@@ skipping 1231 matching lines @@
     long long size = -1;
     double lastModifiedMS = invalidFileTime();
     file->captureSnapshot(size, lastModifiedMS);
     *index = m_blobInfo->size();
     // FIXME: transition WebBlobInfo.lastModified to be milliseconds-based also.
     double lastModified = lastModifiedMS / msPerSecond;
     m_blobInfo->append(WebBlobInfo(file->uuid(), file->path(), file->name(), file->type(), lastModified, size));
     return true;
 }
 
-bool SerializedScriptValueReader::read(v8::Local<v8::Value>* value, ScriptValueCompositeCreator& creator)
+bool SerializedScriptValueReader::read(v8::Local<v8::Value>* value, ScriptValueDeserializer& deserializer)
 {
     SerializationTag tag;
     if (!readTag(&tag))
         return false;
-    return readWithTag(tag, value, creator);
+    return readWithTag(tag, value, deserializer);
 }
 
-bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8::Value>* value, ScriptValueCompositeCreator& creator)
+bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8::Value>* value, ScriptValueDeserializer& deserializer)
 {
     switch (tag) {
     case ReferenceCountTag: {
         if (!m_version)
             return false;
         uint32_t referenceTableSize;
         if (!doReadUint32(&referenceTableSize))
             return false;
         // If this test fails, then the serializer and deserializer disagree about the assignment
         // of object reference IDs. On the deserialization side, this means there are too many or too few
         // calls to pushObjectReference.
-        if (referenceTableSize != creator.objectReferenceCount())
+        if (referenceTableSize != deserializer.objectReferenceCount())
             return false;
         return true;
     }
     case InvalidTag:
         return false;
     case PaddingTag:
         return true;
     case UndefinedTag:
         *value = v8::Undefined(isolate());
         break;
     case NullTag:
         *value = v8::Null(isolate());
         break;
     case TrueTag:
         *value = v8Boolean(true, isolate());
         break;
     case FalseTag:
         *value = v8Boolean(false, isolate());
         break;
     case TrueObjectTag:
         *value = v8::BooleanObject::New(isolate(), true);
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case FalseObjectTag:
         *value = v8::BooleanObject::New(isolate(), false);
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case StringTag:
         if (!readString(value))
             return false;
         break;
     case StringUCharTag:
         if (!readUCharString(value))
             return false;
         break;
     case StringObjectTag:
         if (!readStringObject(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case Int32Tag:
         if (!readInt32(value))
             return false;
         break;
     case Uint32Tag:
         if (!readUint32(value))
             return false;
         break;
     case DateTag:
         if (!readDate(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case NumberTag:
         if (!readNumber(value))
             return false;
         break;
     case NumberObjectTag:
         if (!readNumberObject(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case BlobTag:
     case BlobIndexTag:
         if (!readBlob(value, tag == BlobIndexTag))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case FileTag:
     case FileIndexTag:
         if (!readFile(value, tag == FileIndexTag))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case FileListTag:
     case FileListIndexTag:
         if (!readFileList(value, tag == FileListIndexTag))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case CompositorProxyTag:
         if (!readCompositorProxy(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
 
     case ImageDataTag:
         if (!readImageData(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case ImageBitmapTag:
         if (!readImageBitmap(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
 
     case RegExpTag:
         if (!readRegExp(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case ObjectTag: {
         uint32_t numProperties;
         if (!doReadUint32(&numProperties))
             return false;
-        if (!creator.completeObject(numProperties, value))
+        if (!deserializer.completeObject(numProperties, value))
             return false;
         break;
     }
     case SparseArrayTag: {
         uint32_t numProperties;
         uint32_t length;
         if (!doReadUint32(&numProperties))
             return false;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeSparseArray(numProperties, length, value))
+        if (!deserializer.completeSparseArray(numProperties, length, value))
             return false;
         break;
     }
     case DenseArrayTag: {
         uint32_t numProperties;
         uint32_t length;
         if (!doReadUint32(&numProperties))
             return false;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeDenseArray(numProperties, length, value))
+        if (!deserializer.completeDenseArray(numProperties, length, value))
             return false;
         break;
     }
     case MapTag: {
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeMap(length, value))
+        if (!deserializer.completeMap(length, value))
             return false;
         break;
     }
     case SetTag: {
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeSet(length, value))
+        if (!deserializer.completeSet(length, value))
             return false;
         break;
     }
     case ArrayBufferViewTag: {
         if (!m_version)
             return false;
-        if (!readArrayBufferView(value, creator))
+        if (!readArrayBufferView(value, deserializer))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     }
     case ArrayBufferTag: {
         if (!m_version)
             return false;
         if (!readArrayBuffer(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     }
     case GenerateFreshObjectTag: {
         if (!m_version)
             return false;
-        if (!creator.newObject())
+        if (!deserializer.newObject())
             return false;
         return true;
     }
     case GenerateFreshSparseArrayTag: {
         if (!m_version)
             return false;
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.newSparseArray(length))
+        if (!deserializer.newSparseArray(length))
             return false;
         return true;
     }
     case GenerateFreshDenseArrayTag: {
         if (!m_version)
             return false;
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.newDenseArray(length))
+        if (!deserializer.newDenseArray(length))
             return false;
         return true;
     }
     case GenerateFreshMapTag: {
         if (!m_version)
             return false;
-        if (!creator.newMap())
+        if (!deserializer.newMap())
             return false;
         return true;
     }
     case GenerateFreshSetTag: {
         if (!m_version)
             return false;
-        if (!creator.newSet())
+        if (!deserializer.newSet())
             return false;
         return true;
     }
     case MessagePortTag: {
         if (!m_version)
             return false;
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredMessagePort(index, value))
+        if (!deserializer.tryGetTransferredMessagePort(index, value))
             return false;
         break;
     }
     case ArrayBufferTransferTag: {
         if (!m_version)
             return false;
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredArrayBuffer(index, value))
+        if (!deserializer.tryGetTransferredArrayBuffer(index, value))
             return false;
         break;
     }
     case ImageBitmapTransferTag: {
         if (!m_version)
             return false;
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredImageBitmap(index, value))
+        if (!deserializer.tryGetTransferredImageBitmap(index, value))
             return false;
         break;
     }
     case OffscreenCanvasTransferTag: {
         if (!m_version)
             return false;
         uint32_t index, width, height, id;
         if (!doReadUint32(&index))
             return false;
         if (!doReadUint32(&width))
             return false;
         if (!doReadUint32(&height))
             return false;
         if (!doReadUint32(&id))
             return false;
-        if (!creator.tryGetTransferredOffscreenCanvas(index, width, height, id, value))
+        if (!deserializer.tryGetTransferredOffscreenCanvas(index, width, height, id, value))
             return false;
         break;
     }
     case SharedArrayBufferTransferTag: {
         if (!m_version)
             return false;
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredSharedArrayBuffer(index, value))
+        if (!deserializer.tryGetTransferredSharedArrayBuffer(index, value))
             return false;
         break;
     }
     case ObjectReferenceTag: {
         if (!m_version)
             return false;
         uint32_t reference;
         if (!doReadUint32(&reference))
             return false;
-        if (!creator.tryGetObjectFromObjectReference(reference, value))
+        if (!deserializer.tryGetObjectFromObjectReference(reference, value))
             return false;
         break;
     }
     case DOMFileSystemTag:
     case CryptoKeyTag:
         ASSERT_NOT_REACHED();
     default:
         return false;
     }
     return !value->IsEmpty();
@@ skipping 212 matching lines @@
 
 bool SerializedScriptValueReader::readArrayBuffer(v8::Local<v8::Value>* value)
 {
     DOMArrayBuffer* arrayBuffer = doReadArrayBuffer();
     if (!arrayBuffer)
         return false;
     *value = toV8(arrayBuffer, m_scriptState->context()->Global(), isolate());
     return !value->IsEmpty();
 }
 
-bool SerializedScriptValueReader::readArrayBufferView(v8::Local<v8::Value>* value, ScriptValueCompositeCreator& creator)
+bool SerializedScriptValueReader::readArrayBufferView(v8::Local<v8::Value>* value, ScriptValueDeserializer& deserializer)
 {
     ArrayBufferViewSubTag subTag;
     uint32_t byteOffset;
     uint32_t byteLength;
     DOMArrayBufferBase* arrayBuffer = nullptr;
     v8::Local<v8::Value> arrayBufferV8Value;
     if (!readArrayBufferViewSubTag(&subTag))
         return false;
     if (!doReadUint32(&byteOffset))
         return false;
     if (!doReadUint32(&byteLength))
         return false;
-    if (!creator.consumeTopOfStack(&arrayBufferV8Value))
+    if (!deserializer.consumeTopOfStack(&arrayBufferV8Value))
         return false;
     if (arrayBufferV8Value.IsEmpty())
         return false;
     if (arrayBufferV8Value->IsArrayBuffer()) {
         arrayBuffer = V8ArrayBuffer::toImpl(arrayBufferV8Value.As<v8::Object>());
         if (!arrayBuffer)
             return false;
     } else if (arrayBufferV8Value->IsSharedArrayBuffer()) {
         arrayBuffer = V8SharedArrayBuffer::toImpl(arrayBufferV8Value.As<v8::Object>());
         if (!arrayBuffer)
@@ skipping 583 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