[Binding] [Refactoring] Remove ScriptValueCompositeCreator

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 21f16e3585fc7b16665bf770b98e53161faefab3..4ec6386081d5fd0d60d8af102ac3f34bde91dd0f 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
@@ -1249,15 +1249,15 @@ bool ScriptValueSerializer::appendFileInfo(const File* file, int* index)
     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: {
@@ -1269,7 +1269,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         // 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;
     }
@@ -1291,11 +1291,11 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         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))
@@ -1308,7 +1308,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
     case StringObjectTag:
         if (!readStringObject(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case Int32Tag:
         if (!readInt32(value))
@@ -1321,7 +1321,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
     case DateTag:
         if (!readDate(value))
             return false;
-        creator.pushObjectReference(*value);
+        deserializer.pushObjectReference(*value);
         break;
     case NumberTag:
         if (!readNumber(value))
@@ -1330,53 +1330,53 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
     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;
     }
@@ -1387,7 +1387,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
             return false;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeSparseArray(numProperties, length, value))
+        if (!deserializer.completeSparseArray(numProperties, length, value))
             return false;
         break;
     }
@@ -1398,7 +1398,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
             return false;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeDenseArray(numProperties, length, value))
+        if (!deserializer.completeDenseArray(numProperties, length, value))
             return false;
         break;
     }
@@ -1406,7 +1406,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.completeMap(length, value))
+        if (!deserializer.completeMap(length, value))
             return false;
         break;
     }
@@ -1414,16 +1414,16 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         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: {
@@ -1431,13 +1431,13 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
             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;
     }
@@ -1447,7 +1447,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
-        if (!creator.newSparseArray(length))
+        if (!deserializer.newSparseArray(length))
             return false;
         return true;
     }
@@ -1457,21 +1457,21 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         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;
     }
@@ -1481,7 +1481,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredMessagePort(index, value))
+        if (!deserializer.tryGetTransferredMessagePort(index, value))
             return false;
         break;
     }
@@ -1491,7 +1491,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredArrayBuffer(index, value))
+        if (!deserializer.tryGetTransferredArrayBuffer(index, value))
             return false;
         break;
     }
@@ -1501,7 +1501,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredImageBitmap(index, value))
+        if (!deserializer.tryGetTransferredImageBitmap(index, value))
             return false;
         break;
     }
@@ -1517,7 +1517,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
             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;
     }
@@ -1527,7 +1527,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t index;
         if (!doReadUint32(&index))
             return false;
-        if (!creator.tryGetTransferredSharedArrayBuffer(index, value))
+        if (!deserializer.tryGetTransferredSharedArrayBuffer(index, value))
             return false;
         break;
     }
@@ -1537,7 +1537,7 @@ bool SerializedScriptValueReader::readWithTag(SerializationTag tag, v8::Local<v8
         uint32_t reference;
         if (!doReadUint32(&reference))
             return false;
-        if (!creator.tryGetObjectFromObjectReference(reference, value))
+        if (!deserializer.tryGetObjectFromObjectReference(reference, value))
             return false;
         break;
     }
@@ -1770,7 +1770,7 @@ bool SerializedScriptValueReader::readArrayBuffer(v8::Local<v8::Value>* value)
     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;
@@ -1783,7 +1783,7 @@ bool SerializedScriptValueReader::readArrayBufferView(v8::Local<v8::Value>* valu
         return false;
     if (!doReadUint32(&byteLength))
         return false;
-    if (!creator.consumeTopOfStack(&arrayBufferV8Value))
+    if (!deserializer.consumeTopOfStack(&arrayBufferV8Value))
         return false;
     if (arrayBufferV8Value.IsEmpty())
         return false;