[Refactoring] Clean up code for serializing ScriptValues

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

 /*
  * Copyright (C) 2009, 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 35 matching lines @@
 class Transferables;
 class ExceptionState;
 class StaticBitmapImage;
 class WebBlobInfo;
 
 typedef HashMap<String, RefPtr<BlobDataHandle>> BlobDataHandleMap;
 typedef Vector<WebBlobInfo> WebBlobInfoArray;
 
 class CORE_EXPORT SerializedScriptValue : public ThreadSafeRefCounted<SerializedScriptValue> {
 public:
+    using ArrayBufferContentsArray = Vector<WTF::ArrayBufferContents, 1>;
+    using ImageBitmapContentsArray = Vector<RefPtr<StaticBitmapImage>, 1>;
+
     // Increment this for each incompatible change to the wire format.
     // Version 2: Added StringUCharTag for UChar v8 strings.
     // Version 3: Switched to using uuids as blob data identifiers.
     // Version 4: Extended File serialization to be complete.
     // Version 5: Added CryptoKeyTag for Key objects.
     // Version 6: Added indexed serialization for File, Blob, and FileList.
     // Version 7: Extended File serialization with user visibility.
     // Version 8: File.lastModified in milliseconds (seconds-based in earlier versions.)
     // Version 9: Added Map and Set support.
     static const uint32_t wireFormatVersion = 9;
 
     // VarInt encoding constants.
     static const int varIntShift = 7;
     static const int varIntMask = (1 << varIntShift) - 1;
 
     static PassRefPtr<SerializedScriptValue> serialize(v8::Isolate*, v8::Local<v8::Value>, Transferables*, WebBlobInfoArray*, ExceptionState&);
     static PassRefPtr<SerializedScriptValue> serialize(const String&);
     static PassRefPtr<SerializedScriptValue> serializeAndSwallowExceptions(v8::Isolate*, v8::Local<v8::Value>);
 
-    // TODO(peria): Make these create()s private.
     static PassRefPtr<SerializedScriptValue> create();
     static PassRefPtr<SerializedScriptValue> create(const String&);
     static PassRefPtr<SerializedScriptValue> create(const char* data, size_t length);
 
     virtual ~SerializedScriptValue();
 
     static PassRefPtr<SerializedScriptValue> nullValue();
 
     String toWireString() const { return m_data; }
     void toWireBytes(Vector<char>&) const;
@@ skipping 11 matching lines @@
 
     // Informs the V8 about external memory allocated and owned by this object. Large values should contribute
     // to GC counters to eventually trigger a GC, otherwise flood of postMessage() can cause OOM.
     // Ok to invoke multiple times (only adds memory once).
     // The memory registration is revoked automatically in destructor.
     void registerMemoryAllocatedWithCurrentScriptContext();
 
     // Returns true if the value contains a transferable ArrayBuffer.
     bool containsTransferableArrayBuffer() const;
 
+    String& data() { return m_data; }
+    BlobDataHandleMap& blobDataHandles() { return m_blobDataHandles; }
+    ArrayBufferContentsArray* getArrayBufferContentsArray() { return m_arrayBufferContentsArray.get(); }
+    ImageBitmapContentsArray* getImageBitmapContentsArray() { return m_imageBitmapContentsArray.get(); }
+
 private:
-    // The followings are private, but used by SerializedScriptValueFactory.
+    friend class ScriptValueSerializer;
+
     enum StringDataMode {
         StringValue,
         WireData
     };
-    typedef Vector<WTF::ArrayBufferContents, 1> ArrayBufferContentsArray;
-    typedef Vector<RefPtr<StaticBitmapImage>, 1> ImageBitmapContentsArray;
 
     SerializedScriptValue();
     explicit SerializedScriptValue(const String& wireData);
 
-    BlobDataHandleMap& blobDataHandles() { return m_blobDataHandles; }
-    String& data() { return m_data; }
     void setData(const String& data) { m_data = data; }
     void transferArrayBuffers(v8::Isolate*, const ArrayBufferArray&, ExceptionState&);
     void transferImageBitmaps(v8::Isolate*, const ImageBitmapArray&, ExceptionState&);
     void transferOffscreenCanvas(v8::Isolate*, const OffscreenCanvasArray&, ExceptionState&);
-    ArrayBufferContentsArray* getArrayBufferContentsArray() { return m_arrayBufferContentsArray.get(); }
-    ImageBitmapContentsArray* getImageBitmapContentsArray() { return m_imageBitmapContentsArray.get(); }
 
-private:
     String m_data;
     std::unique_ptr<ArrayBufferContentsArray> m_arrayBufferContentsArray;
     std::unique_ptr<ImageBitmapContentsArray> m_imageBitmapContentsArray;
     BlobDataHandleMap m_blobDataHandles;
     intptr_t m_externallyAllocatedMemory;
-
-    // TODO(peria): remove SerializedScriptValueFactory from friend class
-    friend class SerializedScriptValueFactory;
-    friend class ScriptValueSerializer;
 };
 
 } // namespace blink
 
 #endif // SerializedScriptValue_h