[Binding] [Refactoring] Remove ScriptValueCompositeCreator

third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h

 // 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.
 
 #ifndef ScriptValueSerializer_h
 #define ScriptValueSerializer_h
 
 #include "bindings/core/v8/SerializationTag.h"
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
@@ skipping 430 matching lines @@
     ObjectPool m_objectPool;
     ObjectPool m_transferredMessagePorts;
     ObjectPool m_transferredArrayBuffers;
     ObjectPool m_transferredImageBitmaps;
     ObjectPool m_transferredOffscreenCanvas;
     uint32_t m_nextObjectReference;
     WebBlobInfoArray* m_blobInfo;
     BlobDataHandleMap& m_blobDataHandles;
 };
 
-// Interface used by SerializedScriptValueReader to create objects of composite types.
-class CORE_EXPORT ScriptValueCompositeCreator {
-    STACK_ALLOCATED();
-    WTF_MAKE_NONCOPYABLE(ScriptValueCompositeCreator);
-public:
-    ScriptValueCompositeCreator() { }
-    virtual ~ScriptValueCompositeCreator() { }
-
-    virtual bool consumeTopOfStack(v8::Local<v8::Value>*) = 0;
-    virtual uint32_t objectReferenceCount() = 0;
-    virtual void pushObjectReference(const v8::Local<v8::Value>&) = 0;
-    virtual bool tryGetObjectFromObjectReference(uint32_t reference, v8::Local<v8::Value>*) = 0;
-    virtual bool tryGetTransferredMessagePort(uint32_t index, v8::Local<v8::Value>*) = 0;
-    virtual bool tryGetTransferredArrayBuffer(uint32_t index, v8::Local<v8::Value>*) = 0;
-    virtual bool tryGetTransferredImageBitmap(uint32_t index, v8::Local<v8::Value>*) = 0;
-    virtual bool tryGetTransferredOffscreenCanvas(uint32_t index, uint32_t width, uint32_t height, uint32_t id, v8::Local<v8::Value>*) = 0;
-    virtual bool tryGetTransferredSharedArrayBuffer(uint32_t index, v8::Local<v8::Value>*) = 0;
-    virtual bool newSparseArray(uint32_t length) = 0;
-    virtual bool newDenseArray(uint32_t length) = 0;
-    virtual bool newMap() = 0;
-    virtual bool newSet() = 0;
-    virtual bool newObject() = 0;
-    virtual bool completeObject(uint32_t numProperties, v8::Local<v8::Value>*) = 0;
-    virtual bool completeSparseArray(uint32_t numProperties, uint32_t length, v8::Local<v8::Value>*) = 0;
-    virtual bool completeDenseArray(uint32_t numProperties, uint32_t length, v8::Local<v8::Value>*) = 0;
-    virtual bool completeMap(uint32_t length, v8::Local<v8::Value>*) = 0;
-    virtual bool completeSet(uint32_t length, v8::Local<v8::Value>*) = 0;
-};
+class ScriptValueDeserializer;
 
 // SerializedScriptValueReader is responsible for deserializing primitive types and
 // restoring information about saved objects of composite types.
 class CORE_EXPORT SerializedScriptValueReader {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(SerializedScriptValueReader);
 public:
     SerializedScriptValueReader(const uint8_t* buffer, int length, const WebBlobInfoArray* blobInfo, BlobDataHandleMap& blobDataHandles, ScriptState* scriptState)
         : m_scriptState(scriptState)
         , m_buffer(buffer)
@@ skipping 18 matching lines @@
     unsigned position() const { return m_position; }
 
     const uint8_t* allocate(uint32_t size)
     {
         const uint8_t* allocated = m_buffer + m_position;
         m_position += size;
         return allocated;
     }
 
 public:
-    virtual bool read(v8::Local<v8::Value>*, ScriptValueCompositeCreator&);
+    virtual bool read(v8::Local<v8::Value>*, ScriptValueDeserializer&);
     bool readVersion(uint32_t& version);
     void setVersion(uint32_t);
 
 protected:
-    bool readWithTag(SerializationTag, v8::Local<v8::Value>*, ScriptValueCompositeCreator&);
+    bool readWithTag(SerializationTag, v8::Local<v8::Value>*, ScriptValueDeserializer&);
 
     bool readTag(SerializationTag*);
     bool readWebCoreString(String*);
     bool readUint32(v8::Local<v8::Value>*);
 
     bool doReadUint32(uint32_t* value);
 
 private:
     void undoReadTag();
     bool readArrayBufferViewSubTag(ArrayBufferViewSubTag*);
     bool readString(v8::Local<v8::Value>*);
     bool readUCharString(v8::Local<v8::Value>*);
     bool readStringObject(v8::Local<v8::Value>*);
     bool readInt32(v8::Local<v8::Value>*);
     bool readDate(v8::Local<v8::Value>*);
     bool readNumber(v8::Local<v8::Value>*);
     bool readNumberObject(v8::Local<v8::Value>*);
     ImageData* doReadImageData();
     bool readImageData(v8::Local<v8::Value>*);
     bool readImageBitmap(v8::Local<v8::Value>*);
     bool readCompositorProxy(v8::Local<v8::Value>*);
     DOMArrayBuffer* doReadArrayBuffer();
     bool readArrayBuffer(v8::Local<v8::Value>*);
-    bool readArrayBufferView(v8::Local<v8::Value>*, ScriptValueCompositeCreator&);
+    bool readArrayBufferView(v8::Local<v8::Value>*, ScriptValueDeserializer&);
     bool readRegExp(v8::Local<v8::Value>*);
     bool readBlob(v8::Local<v8::Value>*, bool isIndexed);
     bool readFile(v8::Local<v8::Value>*, bool isIndexed);
     bool readFileList(v8::Local<v8::Value>*, bool isIndexed);
     File* readFileHelper();
     File* readFileIndexHelper();
 
     template<class T>
     bool doReadUintHelper(T* value)
     {
@@ skipping 17 matching lines @@
 private:
     RefPtr<ScriptState> m_scriptState;
     const uint8_t* m_buffer;
     const unsigned m_length;
     unsigned m_position;
     uint32_t m_version;
     const WebBlobInfoArray* m_blobInfo;
     const BlobDataHandleMap& m_blobDataHandles;
 };
 
-class CORE_EXPORT ScriptValueDeserializer : public ScriptValueCompositeCreator {
+class CORE_EXPORT ScriptValueDeserializer {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(ScriptValueDeserializer);
 public:
     ScriptValueDeserializer(SerializedScriptValueReader& reader, MessagePortArray* messagePorts, ArrayBufferContentsArray* arrayBufferContents, ImageBitmapContentsArray* imageBitmapContents)
         : m_reader(reader)
         , m_transferredMessagePorts(messagePorts)
         , m_arrayBufferContents(arrayBufferContents)
         , m_imageBitmapContents(imageBitmapContents)
         , m_arrayBuffers(arrayBufferContents ? arrayBufferContents->size() : 0)
         , m_imageBitmaps(imageBitmapContents ? imageBitmapContents->size() : 0)
         , m_version(0)
     {
     }
 
     v8::Local<v8::Value> deserialize();
-    bool newSparseArray(uint32_t) override;
-    bool newDenseArray(uint32_t length) override;
-    bool newMap() override;
-    bool newSet() override;
-    bool consumeTopOfStack(v8::Local<v8::Value>*) override;
-    bool newObject() override;
-    bool completeObject(uint32_t numProperties, v8::Local<v8::Value>*) override;
-    bool completeSparseArray(uint32_t numProperties, uint32_t length, v8::Local<v8::Value>*) override;
-    bool completeDenseArray(uint32_t numProperties, uint32_t length, v8::Local<v8::Value>*) override;
-    bool completeMap(uint32_t length, v8::Local<v8::Value>*) override;
-    bool completeSet(uint32_t length, v8::Local<v8::Value>*) override;
-    void pushObjectReference(const v8::Local<v8::Value>&) override;
-    bool tryGetTransferredMessagePort(uint32_t index, v8::Local<v8::Value>*) override;
-    bool tryGetTransferredArrayBuffer(uint32_t index, v8::Local<v8::Value>*) override;
-    bool tryGetTransferredImageBitmap(uint32_t index, v8::Local<v8::Value>*) override;
-    bool tryGetTransferredOffscreenCanvas(uint32_t index, uint32_t width, uint32_t height, uint32_t id, v8::Local<v8::Value>*) override;
-    bool tryGetTransferredSharedArrayBuffer(uint32_t index, v8::Local<v8::Value>*) override;
-    bool tryGetObjectFromObjectReference(uint32_t reference, v8::Local<v8::Value>*) override;
-    uint32_t objectReferenceCount() override;
+    bool newSparseArray(uint32_t);
+    bool newDenseArray(uint32_t length);
+    bool newMap();
+    bool newSet();
+    bool consumeTopOfStack(v8::Local<v8::Value>*);
+    bool newObject();
+    bool completeObject(uint32_t numProperties, v8::Local<v8::Value>*);
+    bool completeSparseArray(uint32_t numProperties, uint32_t length, v8::Local<v8::Value>*);
+    bool completeDenseArray(uint32_t numProperties, uint32_t length, v8::Local<v8::Value>*);
+    bool completeMap(uint32_t length, v8::Local<v8::Value>*);
+    bool completeSet(uint32_t length, v8::Local<v8::Value>*);
+    void pushObjectReference(const v8::Local<v8::Value>&);
+    bool tryGetTransferredMessagePort(uint32_t index, v8::Local<v8::Value>*);
+    bool tryGetTransferredArrayBuffer(uint32_t index, v8::Local<v8::Value>*);
+    bool tryGetTransferredImageBitmap(uint32_t index, v8::Local<v8::Value>*);
+    bool tryGetTransferredOffscreenCanvas(uint32_t index, uint32_t width, uint32_t height, uint32_t id, v8::Local<v8::Value>*);
+    bool tryGetTransferredSharedArrayBuffer(uint32_t index, v8::Local<v8::Value>*);
+    bool tryGetObjectFromObjectReference(uint32_t reference, v8::Local<v8::Value>*);
+    uint32_t objectReferenceCount();
 
 protected:
     SerializedScriptValueReader& reader() { return m_reader; }
     virtual bool read(v8::Local<v8::Value>*);
 
 private:
     bool initializeObject(v8::Local<v8::Object>, uint32_t numProperties, v8::Local<v8::Value>*);
     bool doDeserialize();
     void push(v8::Local<v8::Value> value) { m_stack.append(value); };
     void pop(unsigned length)
@@ skipping 15 matching lines @@
     ArrayBufferContentsArray* m_arrayBufferContents;
     ImageBitmapContentsArray* m_imageBitmapContents;
     Vector<v8::Local<v8::Value>> m_arrayBuffers;
     Vector<v8::Local<v8::Value>> m_imageBitmaps;
     uint32_t m_version;
 };
 
 } // namespace blink
 
 #endif // ScriptValueSerializer_h