Add blob serialization support [currently unused] to SerializedScriptValue.

Source/bindings/v8/SerializedScriptValue.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 47 matching lines @@
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/MessagePort.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/File.h"
 #include "core/fileapi/FileList.h"
 #include "core/html/ImageData.h"
 #include "core/html/canvas/DataView.h"
 #include "heap/Handle.h"
 #include "platform/SharedBuffer.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebBlobInfo.h"
 #include "public/platform/WebCrypto.h"
 #include "public/platform/WebCryptoKey.h"
 #include "public/platform/WebCryptoKeyAlgorithm.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/ArrayBufferContents.h"
 #include "wtf/ArrayBufferView.h"
 #include "wtf/Assertions.h"
 #include "wtf/ByteOrder.h"
 #include "wtf/Float32Array.h"
 #include "wtf/Float64Array.h"
 #include "wtf/Int16Array.h"
 #include "wtf/Int32Array.h"
 #include "wtf/Int8Array.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Uint16Array.h"
 #include "wtf/Uint32Array.h"
 #include "wtf/Uint8Array.h"
 #include "wtf/Uint8ClampedArray.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 
 // FIXME: consider crashing in debug mode on deserialization errors
 // NOTE: be sure to change wireFormatVersion as necessary!

[jsbell, 2014/04/03 18:16:33]

So... this is a philosophically interesting change. :)

The wire format does not change at all for existing uses. For new uses, the wire
format changes depending on how the SSV is used - i.e. if it's serialized with
the WebBlobInfo vector, it serialized with indexes; if it's serialized without,
it's serialized with UUID (etc). And the deserialization process MUST match.

That seems fragile. I could imagine someone adding code to deserialize an SSV
and not passing in the vector. The code would work fine until it hits a blob,
and now the decode tries to read a UUID where an index was encoded and *boom*. 

What do you think about making Blob-by-Index and File-by-Index new tag types,
and bumping the version?

[ericu, 2014/04/07 23:14:20]

I think that's an excellent idea.

 
 namespace WebCore {
 
 namespace {
 
 // This code implements the HTML5 Structured Clone algorithm:
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/urls.html#safe-passing-of-structured-data
 
 // V8ObjectMap is a map from V8 objects to arbitrary values of type T.
 // V8 objects (or handles to V8 objects) cannot be used as keys in ordinary wtf::HashMaps;
@@ skipping 90 matching lines @@
     NullTag = '0', // -> <null>
     TrueTag = 'T', // -> <true>
     FalseTag = 'F', // -> <false>
     StringTag = 'S', // string:RawString -> string
     StringUCharTag = 'c', // string:RawUCharString -> string
     Int32Tag = 'I', // value:ZigZag-encoded int32 -> Integer
     Uint32Tag = 'U', // value:uint32_t -> Integer
     DateTag = 'D', // value:double -> Date (ref)
     MessagePortTag = 'M', // index:int -> MessagePort. Fills the result with transferred MessagePort.
     NumberTag = 'N', // value:double -> Number
-    BlobTag = 'b', // url:WebCoreString, type:WebCoreString, size:uint64_t -> Blob (ref)
+    BlobTag = 'b', // uuid:WebCoreString, type:WebCoreString, size:uint64_t -> Blob (ref)
     FileTag = 'f', // file:RawFile -> File (ref)
-    DOMFileSystemTag = 'd', // type:int32_t, name:WebCoreString, url:WebCoreString -> FileSystem (ref)
+    DOMFileSystemTag = 'd', // type:int32_t, name:WebCoreString, uuid:WebCoreString -> FileSystem (ref)
     FileListTag = 'l', // length:uint32_t, files:RawFile[length] -> FileList (ref)
     ImageDataTag = '#', // width:uint32_t, height:uint32_t, pixelDataLength:uint32_t, data:byte[pixelDataLength] -> ImageData (ref)
     ObjectTag = '{', // numProperties:uint32_t -> pops the last object from the open stack;
                      //                           fills it with the last numProperties name,value pairs pushed onto the deserialization stack
     SparseArrayTag = '@', // numProperties:uint32_t, length:uint32_t -> pops the last object from the open stack;
                           //                                            fills it with the last numProperties name,value pairs pushed onto the deserialization stack
     DenseArrayTag = '$', // numProperties:uint32_t, length:uint32_t -> pops the last object from the open stack;
                          //                                            fills it with the last length elements and numProperties name,value pairs pushed onto deserialization stack
     RegExpTag = 'R', // pattern:RawString, flags:uint32_t -> RegExp (ref)
     ArrayBufferTag = 'B', // byteLength:uint32_t, data:byte[byteLength] -> ArrayBuffer (ref)
@@ skipping 236 matching lines @@
     }
 
     void writeBlob(const String& uuid, const String& type, unsigned long long size)
     {
         append(BlobTag);
         doWriteWebCoreString(uuid);
         doWriteWebCoreString(type);
         doWriteUint64(size);
     }
 
+    void writeBlob(int blobIndex)
+    {
+        append(BlobTag);
+        doWriteUint32(blobIndex);
+    }
+
     void writeDOMFileSystem(int type, const String& name, const String& url)
     {
         append(DOMFileSystemTag);
         doWriteUint32(type);
         doWriteWebCoreString(name);
         doWriteWebCoreString(url);
     }
 
     void writeFile(const File& file)
     {
         append(FileTag);
         doWriteFile(file);
     }
 
+    void writeFile(int blobIndex)
+    {
+        append(FileTag);
+        doWriteUint32(blobIndex);
+    }
+
     void writeFileList(const FileList& fileList)
     {
         append(FileListTag);
         uint32_t length = fileList.length();
         doWriteUint32(length);
         for (unsigned i = 0; i < length; ++i)
             doWriteFile(*fileList.item(i));
     }
 
+    void writeFileList(const Vector<int>& blobIndices)
+    {
+        append(FileListTag);
+        uint32_t length = blobIndices.size();
+        doWriteUint32(length);
+        for (unsigned i = 0; i < length; ++i) {

[cmumford, 2014/04/03 16:32:45]

Nit: can ditch the braces in this for loop.

[ericu, 2014/04/07 23:14:20]

Done.

+            doWriteUint32(blobIndices[i]);
+        }
+    }
+
     bool writeCryptoKey(const blink::WebCryptoKey& key)
     {
         append(static_cast<uint8_t>(CryptoKeyTag));
 
         switch (key.algorithm().paramsType()) {
         case blink::WebCryptoKeyAlgorithmParamsTypeAes:
             doWriteAesKey(key);
             break;
         case blink::WebCryptoKeyAlgorithmParamsTypeHmac:
             doWriteHmacKey(key);
@@ skipping 409 matching lines @@
 class Serializer {
     class StateBase;
 public:
     enum Status {
         Success,
         InputError,
         DataCloneError,
         JSException
     };
 
-    Serializer(Writer& writer, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, BlobDataHandleMap& blobDataHandles, v8::TryCatch& tryCatch, v8::Isolate* isolate)
+    Serializer(Writer& writer, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, Vector<blink::WebBlobInfo>* blobInfo, BlobDataHandleMap& blobDataHandles, v8::TryCatch& tryCatch, v8::Isolate* isolate)
         : m_writer(writer)
         , m_tryCatch(tryCatch)
         , m_depth(0)
         , m_status(Success)
         , m_nextObjectReference(0)
+        , m_blobInfo(blobInfo)
         , m_blobDataHandles(blobDataHandles)
         , m_isolate(isolate)
     {
         ASSERT(!tryCatch.HasCaught());
         if (messagePorts) {
             for (size_t i = 0; i < messagePorts->size(); i++)
                 m_transferredMessagePorts.set(toV8Object(messagePorts->at(i).get(), isolate), i);
         }
         if (arrayBuffers) {
             for (size_t i = 0; i < arrayBuffers->size(); i++)  {
@@ skipping 323 matching lines @@
         m_writer.writeBooleanObject(booleanObject->ValueOf());
     }
 
     StateBase* writeBlob(v8::Handle<v8::Value> value, StateBase* next)
     {
         Blob* blob = V8Blob::toNative(value.As<v8::Object>());
         if (!blob)
             return 0;
         if (blob->hasBeenClosed())
             return handleError(DataCloneError, "A Blob object has been closed, and could therefore not be cloned.", next);
-        m_writer.writeBlob(blob->uuid(), blob->type(), blob->size());
+        int blobIndex = -1;
         m_blobDataHandles.add(blob->uuid(), blob->blobDataHandle());
+        if (appendBlobInfo(blob->uuid(), blob->type(), blob->size(), &blobIndex)) {
+            ASSERT(blobIndex >= 0);

[cmumford, 2014/04/03 16:32:45]

What do you think about moving this ASSERT into writeBlob? You could then ditch
the {}'s too.

[ericu, 2014/04/07 23:14:20]

Done.

+            m_writer.writeBlob(blobIndex);
+        } else {
+            m_writer.writeBlob(blob->uuid(), blob->type(), blob->size());
+        }
         return 0;
     }
 
     StateBase* writeDOMFileSystem(v8::Handle<v8::Value> value, StateBase* next)
     {
         DOMFileSystem* fs = V8DOMFileSystem::toNative(value.As<v8::Object>());
         if (!fs)
             return 0;
         if (!fs->clonable())
             return handleError(DataCloneError, "A FileSystem object could not be cloned.", next);
         m_writer.writeDOMFileSystem(fs->type(), fs->name(), fs->rootURL().string());
         return 0;
     }
 
     StateBase* writeFile(v8::Handle<v8::Value> value, StateBase* next)
     {
         File* file = V8File::toNative(value.As<v8::Object>());
         if (!file)
             return 0;
         if (file->hasBeenClosed())
             return handleError(DataCloneError, "A File object has been closed, and could therefore not be cloned.", next);
-        m_writer.writeFile(*file);
+        int blobIndex = -1;
         m_blobDataHandles.add(file->uuid(), file->blobDataHandle());
+        if (appendFileInfo(file->uuid(), file->path(), file->name(), file->type(), &blobIndex)) {
+            ASSERT(blobIndex >= 0);
+            m_writer.writeFile(blobIndex);
+        } else {
+            m_writer.writeFile(*file);
+        }
         return 0;
     }
 
     void writeFileList(v8::Handle<v8::Value> value)
     {
         FileList* fileList = V8FileList::toNative(value.As<v8::Object>());
         if (!fileList)
             return;
-        m_writer.writeFileList(*fileList);
         unsigned length = fileList->length();
-        for (unsigned i = 0; i < length; ++i)
-            m_blobDataHandles.add(fileList->item(i)->uuid(), fileList->item(i)->blobDataHandle());
+        Vector<int> blobIndices;
+        bool useBlobIndices = false;

[cmumford, 2014/04/03 16:32:45]

Do you need useBlobIndices, or can you instead use !blobIndices.isEmpty()?

[ericu, 2014/04/07 23:14:20]

Switched to blobIndices.isEmpty().

+        for (unsigned i = 0; i < length; ++i) {
+            int blobIndex = -1;
+            const File* file = fileList->item(i);
+            m_blobDataHandles.add(file->uuid(), file->blobDataHandle());
+            if (appendFileInfo(file->uuid(), file->path(), file->name(), file->type(), &blobIndex)) {

[cmumford, 2014/04/03 16:32:45]

In writeFile you call file->hasBeenClosed() and return an error. Is that
unnecessary here?

[ericu, 2014/04/07 23:14:20]

No, it should be there; that's new stuff from a merge.  Added, thanks!

+                ASSERT(!i || useBlobIndices);
+                ASSERT(blobIndex >= 0);
+                useBlobIndices = true;
+                blobIndices.append(blobIndex);
+            }
+        }
+        if (useBlobIndices) {
+            m_writer.writeFileList(blobIndices);
+        } else {
+            m_writer.writeFileList(*fileList);
+        }
     }
 
     bool writeCryptoKey(v8::Handle<v8::Value> value)
     {
         Key* key = V8Key::toNative(value.As<v8::Object>());
         if (!key)
             return 0;
         return m_writer.writeCryptoKey(key->key());
     }
 
@@ skipping 98 matching lines @@
 
     // Marks object as having been visited by the serializer and assigns it a unique object reference ID.
     // An object may only be greyed once.
     void greyObject(const v8::Handle<v8::Object>& object)
     {
         ASSERT(!m_objectPool.contains(object));
         uint32_t objectReference = m_nextObjectReference++;
         m_objectPool.set(object, objectReference);
     }
 
+    bool appendBlobInfo(const String& uuid, const String& type, unsigned long long size, int* index)
+    {
+        if (!m_blobInfo)
+            return false;
+        *index = m_blobInfo->size();
+        m_blobInfo->append(blink::WebBlobInfo(uuid, type, size));
+        return true;
+    }
+
+    bool appendFileInfo(const String& uuid, const String& filePath, const String& fileName, const String& type, int* index)
+    {
+        if (!m_blobInfo)
+            return false;
+        *index = m_blobInfo->size();
+        m_blobInfo->append(blink::WebBlobInfo(uuid, filePath, fileName, type));
+        return true;
+    }
+
     Writer& m_writer;
     v8::TryCatch& m_tryCatch;
     int m_depth;
     Status m_status;
     String m_errorMessage;
     typedef V8ObjectMap<v8::Object, uint32_t> ObjectPool;
     ObjectPool m_objectPool;
     ObjectPool m_transferredMessagePorts;
     ObjectPool m_transferredArrayBuffers;
     uint32_t m_nextObjectReference;
+    Vector<blink::WebBlobInfo>* m_blobInfo;
     BlobDataHandleMap& m_blobDataHandles;
     v8::Isolate* m_isolate;
 };
 
 // Returns true if the provided object is to be considered a 'host object', as used in the
 // HTML5 structured clone algorithm.
 static bool isHostObject(v8::Handle<v8::Object> object)
 {
     // If the object has any internal fields, then we won't be able to serialize or deserialize
     // them; conveniently, this is also a quick way to detect DOM wrapper objects, because
@@ skipping 99 matching lines @@
     virtual bool newObject() = 0;
     virtual bool completeObject(uint32_t numProperties, v8::Handle<v8::Value>*) = 0;
     virtual bool completeSparseArray(uint32_t numProperties, uint32_t length, v8::Handle<v8::Value>*) = 0;
     virtual bool completeDenseArray(uint32_t numProperties, uint32_t length, v8::Handle<v8::Value>*) = 0;
 };
 
 // Reader is responsible for deserializing primitive types and
 // restoring information about saved objects of composite types.
 class Reader {
 public:
-    Reader(const uint8_t* buffer, int length, v8::Isolate* isolate,  const BlobDataHandleMap& blobDataHandles)
+    Reader(const uint8_t* buffer, int length, v8::Isolate* isolate, const Vector<blink::WebBlobInfo>* blobInfo, BlobDataHandleMap& blobDataHandles)
         : m_buffer(buffer)
         , m_length(length)
         , m_position(0)
         , m_version(0)
         , m_isolate(isolate)
+        , m_blobInfo(blobInfo)
         , m_blobDataHandles(blobDataHandles)
     {
         ASSERT(!(reinterpret_cast<size_t>(buffer) & 1));
         ASSERT(length >= 0);
     }
 
     bool isEof() const { return m_position >= m_length; }
 
     v8::Isolate* isolate() const { return m_isolate; }
 
@@ skipping 502 matching lines @@
         return true;
     }
 
     bool readBlob(v8::Handle<v8::Value>* value)
     {
         if (m_version < 3)
             return false;
         String uuid;
         String type;
         uint64_t size;
-        if (!readWebCoreString(&uuid))
-            return false;
-        if (!readWebCoreString(&type))
-            return false;
-        if (!doReadUint64(&size))
-            return false;
+        if (m_blobInfo) {
+            uint32_t index;
+            if (!doReadUint32(&index) || index >= m_blobInfo->size())
+                return false;
+            const blink::WebBlobInfo& info = (*m_blobInfo)[index];
+            uuid = info.uuid();
+            type = info.type();
+            size = info.size();
+        } else {
+            if (!readWebCoreString(&uuid))
+                return false;
+            if (!readWebCoreString(&type))
+                return false;
+            if (!doReadUint64(&size))
+                return false;
+        }
         RefPtrWillBeRawPtr<Blob> blob = Blob::create(getOrCreateBlobDataHandle(uuid, type, size));
         *value = toV8(blob.release(), v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
 
     bool readDOMFileSystem(v8::Handle<v8::Value>* value)
     {
         uint32_t type;
         String name;
         String url;
         if (!doReadUint32(&type))
             return false;
         if (!readWebCoreString(&name))
             return false;
         if (!readWebCoreString(&url))
             return false;
         RefPtrWillBeRawPtr<DOMFileSystem> fs = DOMFileSystem::create(currentExecutionContext(m_isolate), name, static_cast<WebCore::FileSystemType>(type), KURL(ParsedURLString, url));
         *value = toV8(fs.release(), v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
 
     bool readFile(v8::Handle<v8::Value>* value)
     {
-        RefPtrWillBeRawPtr<File> file = doReadFileHelper();
+        RefPtrWillBeRawPtr<File> file = readFileHelper();
         if (!file)
             return false;
         *value = toV8(file.release(), v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
 
     bool readFileList(v8::Handle<v8::Value>* value)
     {
         if (m_version < 3)
             return false;
         uint32_t length;
         if (!doReadUint32(&length))
             return false;
         RefPtrWillBeRawPtr<FileList> fileList = FileList::create();
         for (unsigned i = 0; i < length; ++i) {
-            RefPtrWillBeRawPtr<File> file = doReadFileHelper();
+            RefPtrWillBeRawPtr<File> file = readFileHelper();
             if (!file)
                 return false;
             fileList->append(file.release());
         }
         *value = toV8(fileList.release(), v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
 
     bool readCryptoKey(v8::Handle<v8::Value>* value)
     {
@@ skipping 44 matching lines @@
         if (!blink::Platform::current()->crypto()->deserializeKeyForClone(
             algorithm, type, extractable, usages, keyData, keyDataLength, key)) {
             return false;
         }
 
         RefPtrWillBeRawPtr<Key> k = Key::create(key);
         *value = toV8(k.release(), v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
 
-    PassRefPtrWillBeRawPtr<File> doReadFileHelper()
+    PassRefPtr<File> readFileHelper()
     {
         if (m_version < 3)
             return nullptr;
+        if (m_blobInfo) {
+            uint32_t index;
+            if (!doReadUint32(&index) || index >= m_blobInfo->size())
+                return nullptr;
+            const blink::WebBlobInfo& info = (*m_blobInfo)[index];
+            return File::create(info.filePath(), info.fileName(), getOrCreateBlobDataHandle(info.uuid(), info.type(), info.size()), info.lastModified(), info.size());
+        }
         String path;
         String name;
         String relativePath;
         String uuid;
         String type;
         uint32_t hasSnapshot = 0;
         uint64_t size = 0;
         double lastModified = 0;
         if (!readWebCoreString(&path))
             return nullptr;
@@ skipping 56 matching lines @@
     {
         // The containing ssv may have a BDH for this uuid if this ssv is just being
         // passed from main to worker thread (for example). We use those values when creating
         // the new blob instead of cons'ing up a new BDH.
         //
         // FIXME: Maybe we should require that it work that way where the ssv must have a BDH for any
         // blobs it comes across during deserialization. Would require callers to explicitly populate
         // the collection of BDH's for blobs to work, which would encourage lifetimes to be considered
         // when passing ssv's around cross process. At present, we get 'lucky' in some cases because
         // the blob in the src process happens to still exist at the time the dest process is deserializing.
-        // For example in sharedWorker.postMesssage(...).
+        // For example in sharedWorker.postMessage(...).
         BlobDataHandleMap::const_iterator it = m_blobDataHandles.find(uuid);
         if (it != m_blobDataHandles.end()) {
             // make assertions about type and size?
             return it->value;
         }
         return BlobDataHandle::create(uuid, type, size);
     }
 
     bool doReadHmacKey(blink::WebCryptoKeyAlgorithm& algorithm, blink::WebCryptoKeyType& type)
     {
@@ skipping 150 matching lines @@
             usages |= blink::WebCryptoKeyUsageUnwrapKey;
 
         return true;
     }
 
     const uint8_t* m_buffer;
     const unsigned m_length;
     unsigned m_position;
     uint32_t m_version;
     v8::Isolate* m_isolate;
+    const Vector<blink::WebBlobInfo>* m_blobInfo;
     const BlobDataHandleMap& m_blobDataHandles;
 };
 
 
 typedef Vector<WTF::ArrayBufferContents, 1> ArrayBufferContentsArray;
 
 class Deserializer FINAL : public CompositeCreator {
 public:
     Deserializer(Reader& reader, MessagePortArray* messagePorts, ArrayBufferContentsArray* arrayBufferContents)
         : m_reader(reader)
@@ skipping 222 matching lines @@
     MessagePortArray* m_transferredMessagePorts;
     ArrayBufferContentsArray* m_arrayBufferContents;
     Vector<v8::Handle<v8::Object> > m_arrayBuffers;
     uint32_t m_version;
 };
 
 } // namespace
 
 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, exceptionState, isolate));
+    return adoptRef(new SerializedScriptValue(value, messagePorts, arrayBuffers, 0, exceptionState, isolate));
 }
 
 PassRefPtr<SerializedScriptValue> SerializedScriptValue::createAndSwallowExceptions(v8::Handle<v8::Value> value, v8::Isolate* isolate)
 {
     TrackExceptionState exceptionState;
-    return adoptRef(new SerializedScriptValue(value, 0, 0, exceptionState, isolate));
+    return adoptRef(new SerializedScriptValue(value, 0, 0, 0, exceptionState, isolate));
 }
 
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const ScriptValue& value, ExceptionState& exceptionState, ScriptState* state)
+PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const ScriptValue& value, Vector<blink::WebBlobInfo>* blobInfo, ExceptionState& exceptionState, ScriptState* state)
 {
     ScriptScope scope(state);
-    return adoptRef(new SerializedScriptValue(value.v8Value(), 0, 0, exceptionState, state->isolate()));
+    return adoptRef(new SerializedScriptValue(value.v8Value(), 0, 0, blobInfo, exceptionState, state->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.
@@ skipping 103 matching lines @@
         if (!result) {
             exceptionState.throwDOMException(DataCloneError, "ArrayBuffer at index " + String::number(i) + " could not be transferred.");
             return nullptr;
         }
 
         neuterArrayBufferInAllWorlds(arrayBuffers[i].get());
     }
     return contents.release();
 }
 
-SerializedScriptValue::SerializedScriptValue(v8::Handle<v8::Value> value, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, ExceptionState& exceptionState, v8::Isolate* isolate)
+SerializedScriptValue::SerializedScriptValue(v8::Handle<v8::Value> value, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, Vector<blink::WebBlobInfo>* blobInfo, ExceptionState& exceptionState, v8::Isolate* isolate)
     : m_externallyAllocatedMemory(0)
 {
     Writer writer;
     Serializer::Status status;
     String errorMessage;
     {
         v8::TryCatch tryCatch;
-        Serializer serializer(writer, messagePorts, arrayBuffers, m_blobDataHandles, tryCatch, isolate);
+        Serializer serializer(writer, messagePorts, arrayBuffers, blobInfo, m_blobDataHandles, tryCatch, isolate);
         status = serializer.serialize(value);
         if (status == Serializer::JSException) {
             // If there was a JS exception thrown, re-throw it.
             exceptionState.rethrowV8Exception(tryCatch.Exception());
             return;
         }
         errorMessage = serializer.errorMessage();
     }
     switch (status) {
     case Serializer::InputError:
@@ skipping 14 matching lines @@
 }
 
 SerializedScriptValue::SerializedScriptValue(const String& wireData)
     : m_externallyAllocatedMemory(0)
 {
     m_data = wireData.isolatedCopy();
 }
 
 v8::Handle<v8::Value> SerializedScriptValue::deserialize(MessagePortArray* messagePorts)
 {
-    return deserialize(v8::Isolate::GetCurrent(), messagePorts);
+    return deserialize(v8::Isolate::GetCurrent(), messagePorts, 0);
 }
 
-v8::Handle<v8::Value> SerializedScriptValue::deserialize(v8::Isolate* isolate, MessagePortArray* messagePorts)
+v8::Handle<v8::Value> SerializedScriptValue::deserialize(v8::Isolate* isolate, MessagePortArray* messagePorts, const Vector<blink::WebBlobInfo>* blobInfo)
 {
     if (!m_data.impl())
         return v8::Null(isolate);
     COMPILE_ASSERT(sizeof(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.
-    Reader reader(reinterpret_cast<const uint8_t*>(m_data.impl()->characters16()), 2 * m_data.length(), isolate, m_blobDataHandles);
+    Reader reader(reinterpret_cast<const uint8_t*>(m_data.impl()->characters16()), 2 * m_data.length(), isolate, blobInfo, m_blobDataHandles);
     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();
 }
 
 bool SerializedScriptValue::extractTransferables(v8::Local<v8::Value> value, int argumentIndex, MessagePortArray& ports, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState, v8::Isolate* isolate)
 {
@@ skipping 59 matching lines @@
     // If the allocated memory was not registered before, then this class is likely
     // used in a context other then Worker's onmessage environment and the presence of
     // current v8 context is not guaranteed. Avoid calling v8 then.
     if (m_externallyAllocatedMemory) {
         ASSERT(v8::Isolate::GetCurrent());
         v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(-m_externallyAllocatedMemory);
     }
 }
 
 } // namespace WebCore