Source/bindings/core/v8/ScriptValueSerializer.h - Issue 718383003: bindings: fixed incorrect dependency of SerializedScriptValue.

Unified Diff: Source/bindings/core/v8/ScriptValueSerializer.h

Issue 718383003: bindings: fixed incorrect dependency of SerializedScriptValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 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

« no previous file with comments | « Source/bindings/core/v8/PostMessage.h ('k') | Source/bindings/core/v8/ScriptValueSerializer.cpp » ('j') | Source/bindings/core/v8/ScriptValueSerializer.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/bindings/core/v8/ScriptValueSerializer.h

diff --git a/Source/bindings/core/v8/ScriptValueSerializer.h b/Source/bindings/core/v8/ScriptValueSerializer.h

index 1b6c26706641ac48b1f99918cbabdac238a9f41c..bb0c231d36efadbc9e87602288872c82ae4ebf71 100644

--- a/Source/bindings/core/v8/ScriptValueSerializer.h

+++ b/Source/bindings/core/v8/ScriptValueSerializer.h

@@ -8,9 +8,6 @@

#include "bindings/core/v8/SerializationTag.h"

#include "bindings/core/v8/SerializedScriptValue.h"

#include "bindings/core/v8/V8Binding.h"

-#include "public/platform/WebCrypto.h"

-#include "public/platform/WebCryptoKey.h"

-#include "public/platform/WebCryptoKeyAlgorithm.h"

#include "wtf/ArrayBufferContents.h"

#include "wtf/HashMap.h"

#include "wtf/Noncopyable.h"

@@ -30,8 +27,6 @@ namespace blink {

class File;

class FileList;

-namespace SerializedScriptValueInternal {

typedef Vector<WTF::ArrayBufferContents, 1> ArrayBufferContentsArray;

// V8ObjectMap is a map from V8 objects to arbitrary values of type T.

@@ -99,15 +94,15 @@ private:

HandleToT m_map;

};

-// Writer is responsible for serializing primitive types and storing

+// SerializedScriptValueWriter is responsible for serializing primitive types and storing

// information used to reconstruct composite types.

-class Writer {

+class SerializedScriptValueWriter {

STACK_ALLOCATED();

- WTF_MAKE_NONCOPYABLE(Writer);

+ WTF_MAKE_NONCOPYABLE(SerializedScriptValueWriter);

public:

typedef UChar BufferValueType;

- Writer()

+ SerializedScriptValueWriter()

: m_position(0)

{

}

@@ -131,12 +126,10 @@ public:

void writeNumberObject(double number);

void writeBlob(const String& uuid, const String& type, unsigned long long size);

void writeBlobIndex(int blobIndex);

- void writeDOMFileSystem(int type, const String& name, const String& url);

void writeFile(const File&);

void writeFileIndex(int blobIndex);

void writeFileList(const FileList&);

void writeFileListIndex(const Vector<int>& blobIndices);

- bool writeCryptoKey(const WebCryptoKey&);

void writeArrayBuffer(const ArrayBuffer&);

void writeArrayBufferView(const ArrayBufferView&);

void writeImageData(uint32_t width, uint32_t height, const uint8_t* pixelData, uint32_t pixelDataLength);

@@ -158,14 +151,6 @@ protected:

void doWriteArrayBuffer(const ArrayBuffer&);

void doWriteString(const char* data, int length);

void doWriteWebCoreString(const String&);

- void doWriteHmacKey(const WebCryptoKey&);

- void doWriteAesKey(const WebCryptoKey&);

- void doWriteRsaHashedKey(const WebCryptoKey&);

- void doWriteEcKey(const WebCryptoKey&);

- void doWriteAlgorithmId(WebCryptoAlgorithmId);

- void doWriteAsymmetricKeyType(WebCryptoKeyType);

- void doWriteNamedCurve(WebCryptoNamedCurve);

- void doWriteKeyUsages(const WebCryptoKeyUsageMask usages, bool extractable);

int bytesNeededToWireEncode(uint32_t value);

template<class T>

@@ -198,9 +183,9 @@ private:

unsigned m_position;

};

-class Serializer {

+class ScriptValueSerializer {

STACK_ALLOCATED();

- WTF_MAKE_NONCOPYABLE(Serializer);

+ WTF_MAKE_NONCOPYABLE(ScriptValueSerializer);

protected:

class StateBase;

public:

@@ -211,14 +196,14 @@ public:

JSException

};

- Serializer(Writer&, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, WebBlobInfoArray*, BlobDataHandleMap& blobDataHandles, v8::TryCatch&, ScriptState*);

+ ScriptValueSerializer(SerializedScriptValueWriter&, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, WebBlobInfoArray*, BlobDataHandleMap& blobDataHandles, v8::TryCatch&, ScriptState*);

v8::Isolate* isolate() { return m_scriptState->isolate(); }

Status serialize(v8::Handle<v8::Value>);

String errorMessage() { return m_errorMessage; }

// Functions used by serialization states.

- Serializer::StateBase* doSerialize(v8::Handle<v8::Value>, Serializer::StateBase* next);

+ virtual ScriptValueSerializer::StateBase* doSerialize(v8::Handle<v8::Value>, ScriptValueSerializer::StateBase* next);

StateBase* doSerializeArrayBuffer(v8::Handle<v8::Value> arrayBuffer, StateBase* next);

StateBase* checkException(StateBase*);

@@ -241,7 +226,7 @@ protected:

// Serializes (a part of) the current composite and returns

// the next state to process or null when this is the final

// state.

- virtual StateBase* advance(Serializer&) = 0;

+ virtual StateBase* advance(ScriptValueSerializer&) = 0;

protected:

StateBase(v8::Handle<v8::Value> composite, StateBase* next)

@@ -263,7 +248,7 @@ protected:

{

}

- virtual StateBase* advance(Serializer&) override

+ virtual StateBase* advance(ScriptValueSerializer&) override

{

delete this;

return 0;

@@ -293,9 +278,9 @@ protected:

}

protected:

- virtual StateBase* objectDone(unsigned numProperties, Serializer&) = 0;

+ virtual StateBase* objectDone(unsigned numProperties, ScriptValueSerializer&) = 0;

- StateBase* serializeProperties(bool ignoreIndexed, Serializer&);

+ StateBase* serializeProperties(bool ignoreIndexed, ScriptValueSerializer&);

v8::Local<v8::Array> m_propertyNames;

private:

@@ -312,10 +297,10 @@ protected:

{

}

- virtual StateBase* advance(Serializer&) override;

+ virtual StateBase* advance(ScriptValueSerializer&) override;

protected:

- virtual StateBase* objectDone(unsigned numProperties, Serializer&) override;

+ virtual StateBase* objectDone(unsigned numProperties, ScriptValueSerializer&) override;

};

class DenseArrayState final : public AbstractObjectState {

@@ -328,10 +313,10 @@ protected:

m_propertyNames = v8::Local<v8::Array>::New(isolate, propertyNames);

}

- virtual StateBase* advance(Serializer&) override;

+ virtual StateBase* advance(ScriptValueSerializer&) override;

protected:

- virtual StateBase* objectDone(unsigned numProperties, Serializer&) override;

+ virtual StateBase* objectDone(unsigned numProperties, ScriptValueSerializer&) override;

private:

uint32_t m_arrayIndex;

@@ -346,10 +331,10 @@ protected:

m_propertyNames = v8::Local<v8::Array>::New(isolate, propertyNames);

}

- virtual StateBase* advance(Serializer&) override;

+ virtual StateBase* advance(ScriptValueSerializer&) override;

protected:

- virtual StateBase* objectDone(unsigned numProperties, Serializer&) override;

+ virtual StateBase* objectDone(unsigned numProperties, ScriptValueSerializer&) override;

};

private:

@@ -375,10 +360,8 @@ private:

void writeNumberObject(v8::Handle<v8::Value>);

void writeBooleanObject(v8::Handle<v8::Value>);

StateBase* writeBlob(v8::Handle<v8::Value>, StateBase* next);

- StateBase* writeDOMFileSystem(v8::Handle<v8::Value>, StateBase* next);

StateBase* writeFile(v8::Handle<v8::Value>, StateBase* next);

StateBase* writeFileList(v8::Handle<v8::Value>, StateBase* next);

- bool writeCryptoKey(v8::Handle<v8::Value>);

void writeImageData(v8::Handle<v8::Value>);

void writeRegExp(v8::Handle<v8::Value>);

StateBase* writeAndGreyArrayBufferView(v8::Handle<v8::Object>, StateBase* next);

@@ -398,12 +381,12 @@ private:

protected:

StateBase* handleError(Status errorStatus, const String& message, StateBase*);

- Writer& writer() { return m_writer; }

+ SerializedScriptValueWriter& writer() { return m_writer; }

uint32_t nextObjectReference() const { return m_nextObjectReference; }

private:

RefPtr<ScriptState> m_scriptState;

- Writer& m_writer;

+ SerializedScriptValueWriter& m_writer;

v8::TryCatch& m_tryCatch;

int m_depth;

Status m_status;

@@ -417,13 +400,13 @@ private:

BlobDataHandleMap& m_blobDataHandles;

};

-// Interface used by Reader to create objects of composite types.

-class CompositeCreator {

+// Interface used by SerializedScriptValueReader to create objects of composite types.

+class ScriptValueCompositeCreator {

STACK_ALLOCATED();

- WTF_MAKE_NONCOPYABLE(CompositeCreator);

+ WTF_MAKE_NONCOPYABLE(ScriptValueCompositeCreator);

public:

- CompositeCreator() { }

- virtual ~CompositeCreator() { }

+ ScriptValueCompositeCreator() { }

+ virtual ~ScriptValueCompositeCreator() { }

virtual bool consumeTopOfStack(v8::Handle<v8::Value>*) = 0;

virtual uint32_t objectReferenceCount() = 0;

@@ -439,13 +422,13 @@ public:

virtual bool completeDenseArray(uint32_t numProperties, uint32_t length, v8::Handle<v8::Value>*) = 0;

};

-// Reader is responsible for deserializing primitive types and

+// SerializedScriptValueReader is responsible for deserializing primitive types and

// restoring information about saved objects of composite types.

-class Reader {

+class SerializedScriptValueReader {

STACK_ALLOCATED();

- WTF_MAKE_NONCOPYABLE(Reader);

+ WTF_MAKE_NONCOPYABLE(SerializedScriptValueReader);

public:

- Reader(const uint8_t* buffer, int length, const WebBlobInfoArray* blobInfo, BlobDataHandleMap& blobDataHandles, ScriptState* scriptState)

+ SerializedScriptValueReader(const uint8_t* buffer, int length, const WebBlobInfoArray* blobInfo, BlobDataHandleMap& blobDataHandles, ScriptState* scriptState)

: m_scriptState(scriptState)

, m_buffer(buffer)

, m_length(length)

@@ -475,14 +458,20 @@ protected:

}

public:

- bool read(v8::Handle<v8::Value>*, CompositeCreator&);

+ virtual bool read(v8::Handle<v8::Value>*, ScriptValueCompositeCreator&);

bool readVersion(uint32_t& version);

void setVersion(uint32_t);

-private:

+protected:

+ bool readWithTag(SerializationTag, v8::Handle<v8::Value>*, ScriptValueCompositeCreator&);

bool readTag(SerializationTag*);

bool readWebCoreString(String*);

bool readUint32(v8::Handle<v8::Value>*);

+ bool doReadUint32(uint32_t* value);

+private:

void undoReadTag();

bool readArrayBufferViewSubTag(ArrayBufferViewSubTag*);

bool readString(v8::Handle<v8::Value>*);

@@ -495,13 +484,11 @@ private:

bool readImageData(v8::Handle<v8::Value>*);

PassRefPtr<ArrayBuffer> doReadArrayBuffer();

bool readArrayBuffer(v8::Handle<v8::Value>*);

- bool readArrayBufferView(v8::Handle<v8::Value>*, CompositeCreator&);

+ bool readArrayBufferView(v8::Handle<v8::Value>*, ScriptValueCompositeCreator&);

bool readRegExp(v8::Handle<v8::Value>*);

bool readBlob(v8::Handle<v8::Value>*, bool isIndexed);

- bool readDOMFileSystem(v8::Handle<v8::Value>*);

bool readFile(v8::Handle<v8::Value>*, bool isIndexed);

bool readFileList(v8::Handle<v8::Value>*, bool isIndexed);

- bool readCryptoKey(v8::Handle<v8::Value>*);

File* readFileHelper();

File* readFileIndexHelper();

@@ -521,18 +508,9 @@ private:

return true;

}

- bool doReadUint32(uint32_t* value);

bool doReadUint64(uint64_t* value);

bool doReadNumber(double* number);

PassRefPtr<BlobDataHandle> getOrCreateBlobDataHandle(const String& uuid, const String& type, long long size = -1);

- bool doReadHmacKey(WebCryptoKeyAlgorithm&, WebCryptoKeyType&);

- bool doReadAesKey(WebCryptoKeyAlgorithm&, WebCryptoKeyType&);

- bool doReadRsaHashedKey(WebCryptoKeyAlgorithm&, WebCryptoKeyType&);

- bool doReadEcKey(WebCryptoKeyAlgorithm&, WebCryptoKeyType&);

- bool doReadAlgorithmId(WebCryptoAlgorithmId&);

- bool doReadAsymmetricKeyType(WebCryptoKeyType&);

- bool doReadNamedCurve(WebCryptoNamedCurve&);

- bool doReadKeyUsages(WebCryptoKeyUsageMask& usages, bool& extractable);

private:

RefPtr<ScriptState> m_scriptState;

@@ -544,11 +522,11 @@ private:

const BlobDataHandleMap& m_blobDataHandles;

};

-class Deserializer : public CompositeCreator {

+class ScriptValueDeserializer : public ScriptValueCompositeCreator {

STACK_ALLOCATED();

- WTF_MAKE_NONCOPYABLE(Deserializer);

+ WTF_MAKE_NONCOPYABLE(ScriptValueDeserializer);

public:

- Deserializer(Reader& reader, MessagePortArray* messagePorts, ArrayBufferContentsArray* arrayBufferContents)

+ ScriptValueDeserializer(SerializedScriptValueReader& reader, MessagePortArray* messagePorts, ArrayBufferContentsArray* arrayBufferContents)

: m_reader(reader)

, m_transferredMessagePorts(messagePorts)

, m_arrayBufferContents(arrayBufferContents)

@@ -572,8 +550,8 @@ public:

virtual uint32_t objectReferenceCount() override;

protected:

- Reader& reader() { return m_reader; }

- bool read(v8::Local<v8::Value>*);

+ SerializedScriptValueReader& reader() { return m_reader; }

+ virtual bool read(v8::Local<v8::Value>*);

private:

bool initializeObject(v8::Handle<v8::Object>, uint32_t numProperties, v8::Handle<v8::Value>*);

@@ -590,7 +568,7 @@ private:

void openComposite(const v8::Local<v8::Value>&);

bool closeComposite(v8::Handle<v8::Value>*);

- Reader& m_reader;

+ SerializedScriptValueReader& m_reader;

Vector<v8::Local<v8::Value> > m_stack;

Vector<v8::Handle<v8::Value> > m_objectPool;

Vector<uint32_t> m_openCompositeReferenceStack;

@@ -600,8 +578,6 @@ private:

uint32_t m_version;

};

-} // namespace SerializedScriptValueInternal

} // namespace blink

#endif // ScriptValueSerializer_h