bindings: fixed incorrect dependency of SerializedScriptValue.

Source/bindings/core/v8/SerializedScriptValue.cpp

Index: Source/bindings/core/v8/SerializedScriptValue.cpp
diff --git a/Source/bindings/core/v8/SerializedScriptValue.cpp b/Source/bindings/core/v8/SerializedScriptValue.cpp
index 86e1afa712d4e6143f4cccb3111d79ca3b90b4de..2723da17ad440155ee6a1dbfeac61393830dba17 100644
--- a/Source/bindings/core/v8/SerializedScriptValue.cpp
+++ b/Source/bindings/core/v8/SerializedScriptValue.cpp
@@ -34,85 +34,26 @@
 #include "bindings/core/v8/DOMDataStore.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ScriptValueSerializer.h"
+#include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
-#include "bindings/core/v8/V8ArrayBufferView.h"
-#include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8MessagePort.h"
-#include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/SharedBuffer.h"
 #include "platform/blob/BlobData.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/Platform.h"
-#include "wtf/ArrayBufferContents.h"
 #include "wtf/Assertions.h"
 #include "wtf/ByteOrder.h"
-#include "wtf/Uint8ClampedArray.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringHash.h"
-#include "wtf/text/StringUTF8Adaptor.h"
 
 namespace blink {
 
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(v8::Handle<v8::Value> value, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, ExceptionState& exceptionState, v8::Isolate* isolate)
-{
-    return adoptRef(new SerializedScriptValue(value, messagePorts, arrayBuffers, 0, exceptionState, isolate));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::createAndSwallowExceptions(v8::Isolate* isolate, v8::Handle<v8::Value> value)
-{
-    TrackExceptionState exceptionState;
-    return adoptRef(new SerializedScriptValue(value, 0, 0, 0, exceptionState, isolate));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const ScriptValue& value, WebBlobInfoArray* blobInfo, ExceptionState& exceptionState, v8::Isolate* isolate)
-{
-    ASSERT(isolate->InContext());
-    return adoptRef(new SerializedScriptValue(value.v8Value(), 0, 0, blobInfo, exceptionState, isolate));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::createFromWire(const String& data)
-{
-    return adoptRef(new SerializedScriptValue(data));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::createFromWireBytes(const Vector<uint8_t>& data)
-{
-    // Decode wire data from big endian to host byte order.
-    ASSERT(!(data.size() % sizeof(UChar)));
-    size_t length = data.size() / sizeof(UChar);
-    StringBuffer<UChar> buffer(length);
-    const UChar* src = reinterpret_cast<const UChar*>(data.data());
-    UChar* dst = buffer.characters();
-    for (size_t i = 0; i < length; i++)
-        dst[i] = ntohs(src[i]);
-
-    return createFromWire(String::adopt(buffer));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const String& data)
-{
-    return create(data, v8::Isolate::GetCurrent());
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const String& data, v8::Isolate* isolate)
-{
-    SerializedScriptValueInternal::Writer writer;
-    writer.writeWebCoreString(data);
-    String wireData = writer.takeWireString();
-    return adoptRef(new SerializedScriptValue(wireData));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create()
-{
-    return adoptRef(new SerializedScriptValue());
-}
-
 PassRefPtr<SerializedScriptValue> SerializedScriptValue::nullValue()
 {
-    SerializedScriptValueInternal::Writer writer;
+    SerializedScriptValueWriter writer;
     writer.writeNull();
     String wireData = writer.takeWireString();
     return adoptRef(new SerializedScriptValue(wireData));
@@ -164,7 +105,7 @@ static void neuterArrayBufferInAllWorlds(DOMArrayBuffer* object)
     }
 }
 
-PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValue::transferArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
+PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValue::createArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
 {
     ASSERT(arrayBuffers.size());
 
@@ -194,41 +135,6 @@ PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValu
     return contents.release();
 }
 
-SerializedScriptValue::SerializedScriptValue(v8::Handle<v8::Value> value, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, WebBlobInfoArray* blobInfo, ExceptionState& exceptionState, v8::Isolate* isolate)
-    : m_externallyAllocatedMemory(0)
-{
-    SerializedScriptValueInternal::Writer writer;
-    SerializedScriptValueInternal::Serializer::Status status;
-    String errorMessage;
-    {
-        v8::TryCatch tryCatch;
-        SerializedScriptValueInternal::Serializer serializer(writer, messagePorts, arrayBuffers, blobInfo, m_blobDataHandles, tryCatch, ScriptState::current(isolate));
-        status = serializer.serialize(value);
-        if (status == SerializedScriptValueInternal::Serializer::JSException) {
-            // If there was a JS exception thrown, re-throw it.
-            exceptionState.rethrowV8Exception(tryCatch.Exception());
-            return;
-        }
-        errorMessage = serializer.errorMessage();
-    }
-    switch (status) {
-    case SerializedScriptValueInternal::Serializer::InputError:
-    case SerializedScriptValueInternal::Serializer::DataCloneError:
-        exceptionState.throwDOMException(DataCloneError, errorMessage);
-        return;
-    case SerializedScriptValueInternal::Serializer::Success:
-        m_data = writer.takeWireString();
-        ASSERT(m_data.impl()->hasOneRef());
-        if (arrayBuffers && arrayBuffers->size())
-            m_arrayBufferContentsArray = transferArrayBuffers(isolate, *arrayBuffers, exceptionState);
-        return;
-    case SerializedScriptValueInternal::Serializer::JSException:
-        ASSERT_NOT_REACHED();
-        break;
-    }
-    ASSERT_NOT_REACHED();
-}
-
 SerializedScriptValue::SerializedScriptValue(const String& wireData)
     : m_externallyAllocatedMemory(0)
 {
@@ -242,21 +148,7 @@ v8::Handle<v8::Value> SerializedScriptValue::deserialize(MessagePortArray* messa
 
 v8::Handle<v8::Value> SerializedScriptValue::deserialize(v8::Isolate* isolate, MessagePortArray* messagePorts, const WebBlobInfoArray* blobInfo)
 {
-    if (!m_data.impl())
-        return v8::Null(isolate);
-    COMPILE_ASSERT(sizeof(SerializedScriptValueInternal::Writer::BufferValueType) == 2, BufferValueTypeIsTwoBytes);
-    m_data.ensure16Bit();
-    // FIXME: SerializedScriptValue shouldn't use String for its underlying
-    // storage. Instead, it should use SharedBuffer or Vector<uint8_t>. The
-    // information stored in m_data isn't even encoded in UTF-16. Instead,
-    // unicode characters are encoded as UTF-8 with two code units per UChar.
-    SerializedScriptValueInternal::Reader reader(reinterpret_cast<const uint8_t*>(m_data.impl()->characters16()), 2 * m_data.length(), blobInfo, m_blobDataHandles, ScriptState::current(isolate));
-    SerializedScriptValueInternal::Deserializer deserializer(reader, messagePorts, m_arrayBufferContentsArray.get());
-
-    // deserialize() can run arbitrary script (e.g., setters), which could result in |this| being destroyed.
-    // Holding a RefPtr ensures we are alive (along with our internal data) throughout the operation.
-    RefPtr<SerializedScriptValue> protect(this);
-    return deserializer.deserialize();
+    return SerializedScriptValueFactory::instance().deserialize(this, isolate, messagePorts, blobInfo);
 }
 
 bool SerializedScriptValue::extractTransferables(v8::Isolate* isolate, v8::Local<v8::Value> value, int argumentIndex, MessagePortArray& ports, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
@@ -330,4 +222,9 @@ SerializedScriptValue::~SerializedScriptValue()
     }
 }
 
+void SerializedScriptValue::transferArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
+{
+    m_arrayBufferContentsArray = createArrayBuffers(isolate, arrayBuffers, exceptionState);
+}
+
 } // namespace blink