[Refactoring] Clean up code for serializing ScriptValues

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 92 matching lines @@
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(SerializedScriptValueWriter);
 public:
     typedef UChar BufferValueType;
 
     SerializedScriptValueWriter()
         : m_position(0)
     {
     }
 
-    // TODO(peria): Protect this mehtod.
-    String takeWireString();
-
 protected:
     friend class ScriptValueSerializer;
 
+    String takeWireString();
+
     // Write functions for primitive types.
     void writeUndefined();
     void writeNull();
     void writeTrue();
     void writeFalse();
     void writeBooleanObject(bool value);
     void writeOneByteString(v8::Local<v8::String>&);
     void writeUCharString(v8::Local<v8::String>&);
     void writeStringObject(const char* data, int length);
     void writeWebCoreString(const String&);
@@ skipping 76 matching lines @@
 protected:
     class StateBase;
     enum class Status {
         Success,
         InputError,
         DataCloneError,
         JSException
     };
 
 public:
-    ScriptValueSerializer(SerializedScriptValueWriter&, const Transferables*, WebBlobInfoArray*, ScriptState*);
+    ScriptValueSerializer(SerializedScriptValueWriter&, WebBlobInfoArray*, ScriptState*);
     v8::Isolate* isolate() { return m_scriptState->isolate(); }
     v8::Local<v8::Context> context() { return m_scriptState->context(); }
 
     PassRefPtr<SerializedScriptValue> serialize(v8::Local<v8::Value>, Transferables*, ExceptionState&);
-    String errorMessage() { return m_errorMessage; }
 
     static String serializeWTFString(const String&);
     static String serializeNullValue();
 
 protected:
     class StateBase {
         USING_FAST_MALLOC(StateBase);
         WTF_MAKE_NONCOPYABLE(StateBase);
     public:
         virtual ~StateBase() { }
@@ skipping 130 matching lines @@
 
     private:
         v8::Local<v8::Array> m_entries;
         uint32_t m_index;
         uint32_t m_length;
     };
 
     typedef CollectionState<v8::Map> MapState;
     typedef CollectionState<v8::Set> SetState;
 
-    // Functions used by serialization states.
     virtual StateBase* doSerializeObject(v8::Local<v8::Object>, StateBase* next);
 
+    // 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::Local<v8::Object>&);
+
+    StateBase* handleError(Status errorStatus, const String& message, StateBase*);
+
+    SerializedScriptValueWriter& writer() { return m_writer; }
+
 private:
     StateBase* doSerialize(v8::Local<v8::Value>, StateBase* next);
     StateBase* doSerializeArrayBuffer(v8::Local<v8::Value> arrayBuffer, StateBase* next);
     void transferData(Transferables*, ExceptionState&, SerializedScriptValue*);
 
     StateBase* checkException(StateBase*);
     StateBase* writeObject(uint32_t numProperties, StateBase*);
     StateBase* writeSparseArray(uint32_t numProperties, uint32_t length, StateBase*);
     StateBase* writeDenseArray(uint32_t numProperties, uint32_t length, StateBase*);
 
@@ skipping 34 matching lines @@
     static bool shouldSerializeDensely(uint32_t length, uint32_t propertyCount);
 
     StateBase* startArrayState(v8::Local<v8::Array>, StateBase* next);
     StateBase* startObjectState(v8::Local<v8::Object>, StateBase* next);
     StateBase* startMapState(v8::Local<v8::Map>, StateBase* next);
     StateBase* startSetState(v8::Local<v8::Set>, StateBase* next);
 
     bool appendBlobInfo(const String& uuid, const String& type, unsigned long long size, int* index);
     bool appendFileInfo(const File*, int* index);
 
-protected:
-    // 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::Local<v8::Object>&);
-
-    StateBase* handleError(Status errorStatus, const String& message, StateBase*);
-
-    SerializedScriptValueWriter& writer() { return m_writer; }
-    uint32_t nextObjectReference() const { return m_nextObjectReference; }
-
-private:
-
     void copyTransferables(const Transferables&);
 
     RefPtr<ScriptState> m_scriptState;
     SerializedScriptValueWriter& 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;
@@ skipping 24 matching lines @@
         , m_blobDataHandles(blobDataHandles)
     {
         ASSERT(!(reinterpret_cast<size_t>(buffer) & 1));
         ASSERT(length >= 0);
     }
 
     bool isEof() const { return m_position >= m_length; }
 
     ScriptState* getScriptState() const { return m_scriptState.get(); }
 
+    virtual bool read(v8::Local<v8::Value>*, ScriptValueDeserializer&);
+    bool readVersion(uint32_t& version);
+    void setVersion(uint32_t);
+
 protected:
     v8::Isolate* isolate() const { return m_scriptState->isolate(); }
     v8::Local<v8::Context> context() const { return m_scriptState->context(); }
     unsigned length() const { return m_length; }
     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>*, ScriptValueDeserializer&);
-    bool readVersion(uint32_t& version);
-    void setVersion(uint32_t);
-
-protected:
     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();
@@ skipping 32 matching lines @@
             *value |= ((currentByte & SerializedScriptValue::varIntMask) << shift);
             shift += SerializedScriptValue::varIntShift;
         } while (currentByte & (1 << SerializedScriptValue::varIntShift));
         return true;
     }
 
     bool doReadUint64(uint64_t* value);
     bool doReadNumber(double* number);
     PassRefPtr<BlobDataHandle> getOrCreateBlobDataHandle(const String& uuid, const String& type, long long size = -1);
 
-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 {
@@ skipping 59 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