Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: Source/bindings/core/v8/SerializedScriptValueFactory.cpp

Issue 718383003: bindings: fixed incorrect dependency of SerializedScriptValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added fast/js/structured-clone.html Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/bindings/core/v8/SerializedScriptValueFactory.cpp
diff --git a/Source/bindings/core/v8/SerializedScriptValueFactory.cpp b/Source/bindings/core/v8/SerializedScriptValueFactory.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9c260cb237b76418a5928ee2a6e0f8f9313d338a
--- /dev/null
+++ b/Source/bindings/core/v8/SerializedScriptValueFactory.cpp
@@ -0,0 +1,152 @@
+// 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 "config.h"
+#include "bindings/core/v8/SerializedScriptValueFactory.h"
+
+#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptValueSerializer.h"
+#include "wtf/ByteOrder.h"
+#include "wtf/text/StringBuffer.h"
+
+namespace blink {
+
+SerializedScriptValueFactory* SerializedScriptValueFactory::m_instance = 0;
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::create(v8::Handle<v8::Value> value, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, WebBlobInfoArray* blobInfo, ExceptionState& exceptionState, v8::Isolate* isolate)
+{
+ RefPtr<SerializedScriptValue> serializedValue = create();
+ SerializedScriptValueWriter writer;
+ ScriptValueSerializer::Status status;
+ String errorMessage;
+ {
+ v8::TryCatch tryCatch;
+ status = doSerialize(value, writer, messagePorts, arrayBuffers, blobInfo, serializedValue.get(), tryCatch, errorMessage, isolate);
+ if (status == ScriptValueSerializer::JSException) {
+ // If there was a JS exception thrown, re-throw it.
+ exceptionState.rethrowV8Exception(tryCatch.Exception());
+ return serializedValue.release();
+ }
+ }
+ switch (status) {
+ case ScriptValueSerializer::InputError:
+ case ScriptValueSerializer::DataCloneError:
+ exceptionState.throwDOMException(ScriptValueSerializer::DataCloneError, errorMessage);
+ return serializedValue.release();
+ case ScriptValueSerializer::Success:
+ transferData(serializedValue.get(), writer, arrayBuffers, exceptionState, isolate);
+ return serializedValue.release();
+ case ScriptValueSerializer::JSException:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return serializedValue.release();
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::create(v8::Handle<v8::Value> value, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, ExceptionState& exceptionState, v8::Isolate* isolate)
+{
+ return create(value, messagePorts, arrayBuffers, 0, exceptionState, isolate);
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::createAndSwallowExceptions(v8::Isolate* isolate, v8::Handle<v8::Value> value)
+{
+ TrackExceptionState exceptionState;
+ return create(value, 0, 0, exceptionState, isolate);
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::create(const ScriptValue& value, WebBlobInfoArray* blobInfo, ExceptionState& exceptionState, v8::Isolate* isolate)
+{
+ ASSERT(isolate->InContext());
+ return create(value.v8Value(), 0, 0, blobInfo, exceptionState, isolate);
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::createFromWire(const String& data)
+{
+ return adoptRef(new SerializedScriptValue(data));
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::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> SerializedScriptValueFactory::create(const String& data)
+{
+ return create(data, v8::Isolate::GetCurrent());
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::create(const String& data, v8::Isolate* isolate)
+{
+ ASSERT_NOT_REACHED();
+ SerializedScriptValueWriter writer;
+ writer.writeWebCoreString(data);
+ String wireData = writer.takeWireString();
+ return createFromWire(wireData);
+}
+
+PassRefPtr<SerializedScriptValue> SerializedScriptValueFactory::create()
+{
+ return adoptRef(new SerializedScriptValue());
+}
+
+void SerializedScriptValueFactory::transferData(SerializedScriptValue* serializedValue, SerializedScriptValueWriter& writer, ArrayBufferArray* arrayBuffers, ExceptionState& exceptionState, v8::Isolate* isolate)
+{
+ serializedValue->setData(writer.takeWireString());
+ ASSERT(serializedValue->data().impl()->hasOneRef());
+ if (!arrayBuffers || !arrayBuffers->size())
+ return;
+ serializedValue->transferArrayBuffers(isolate, *arrayBuffers, exceptionState);
+}
+
+ScriptValueSerializer::Status SerializedScriptValueFactory::doSerialize(v8::Handle<v8::Value> value, SerializedScriptValueWriter& writer, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, WebBlobInfoArray* blobInfo, SerializedScriptValue* serializedValue, v8::TryCatch& tryCatch, String& errorMessage, v8::Isolate* isolate)
+{
+ return doSerialize(value, writer, messagePorts, arrayBuffers, blobInfo, serializedValue->blobDataHandles(), tryCatch, errorMessage, isolate);
+}
+
+ScriptValueSerializer::Status SerializedScriptValueFactory::doSerialize(v8::Handle<v8::Value> value, SerializedScriptValueWriter& writer, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, WebBlobInfoArray* blobInfo, BlobDataHandleMap& blobDataHandles, v8::TryCatch& tryCatch, String& errorMessage, v8::Isolate* isolate)
+{
+ ScriptValueSerializer serializer(writer, messagePorts, arrayBuffers, blobInfo, blobDataHandles, tryCatch, ScriptState::current(isolate));
+ ScriptValueSerializer::Status status = serializer.serialize(value);
+ errorMessage = serializer.errorMessage();
+ return status;
+}
+
+v8::Handle<v8::Value> SerializedScriptValueFactory::deserialize(SerializedScriptValue* value, v8::Isolate* isolate, MessagePortArray* messagePorts, const WebBlobInfoArray* blobInfo)
+{
+ // 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(value);
+ return deserialize(value->data(), value->blobDataHandles(), value->arrayBufferContentsArray(), isolate, messagePorts, blobInfo);
+}
+
+v8::Handle<v8::Value> SerializedScriptValueFactory::deserialize(String& data, BlobDataHandleMap& blobDataHandles, ArrayBufferContentsArray* arrayBufferContentsArray, v8::Isolate* isolate, MessagePortArray* messagePorts, const WebBlobInfoArray* blobInfo)
+{
+ if (!data.impl())
+ return v8::Null(isolate);
+ COMPILE_ASSERT(sizeof(SerializedScriptValueWriter::BufferValueType) == 2, BufferValueTypeIsTwoBytes);
+ 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.
+ SerializedScriptValueReader reader(reinterpret_cast<const uint8_t*>(data.impl()->characters16()), 2 * data.length(), blobInfo, blobDataHandles, ScriptState::current(isolate));
+ ScriptValueDeserializer deserializer(reader, messagePorts, arrayBufferContentsArray);
+
+ // 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.
+ return deserializer.deserialize();
+}
+
+
+} // namespace blink
« no previous file with comments | « Source/bindings/core/v8/SerializedScriptValueFactory.h ('k') | Source/bindings/core/v8/SerializedScriptValueTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698