Oilpan: Move core/clipboard/ to oilpan's heap

Source/core/clipboard/DataObject.h

 /*
  * Copyright (c) 2008, 2009, 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef DataObject_h
 #define DataObject_h
 
 #include "core/clipboard/DataObjectItem.h"
+#include "heap/Handle.h"
 #include "platform/PasteMode.h"
 #include "platform/Supplementable.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class KURL;
 class SharedBuffer;
 
 // A data object for holding data that would be in a clipboard or moved
 // during a drag-n-drop operation. This is the data that WebCore is aware
 // of and is not specific to a platform.
-class DataObject : public RefCounted<DataObject>, public Supplementable<DataObject> {
+class DataObject : public RefCountedWillBeGarbageCollected<DataObject>, public Supplementable<DataObject> {

[Mads Ager (chromium), 2014/02/19 09:54:37]

This needs to be finalized. Supplementable has a suplement map that has to be
destructed.

[haraken, 2014/02/19 10:37:24]

Done.

+    DECLARE_GC_INFO;
 public:
-    static PassRefPtr<DataObject> createFromPasteboard(PasteMode);
-    static PassRefPtr<DataObject> create();
+    static PassRefPtrWillBeRawPtr<DataObject> createFromPasteboard(PasteMode);
+    static PassRefPtrWillBeRawPtr<DataObject> create();
 
-    PassRefPtr<DataObject> copy() const;
+    PassRefPtrWillBeRawPtr<DataObject> copy() const;
 
     // DataTransferItemList support.
     size_t length() const;
-    PassRefPtr<DataObjectItem> item(unsigned long index);
+    PassRefPtrWillBeRawPtr<DataObjectItem> item(unsigned long index);
     // FIXME: Implement V8DataTransferItemList::indexedPropertyDeleter to get this called.
     void deleteItem(unsigned long index);
     void clearAll();
     // Returns null if an item already exists with the provided type.
-    PassRefPtr<DataObjectItem> add(const String& data, const String& type);
-    PassRefPtr<DataObjectItem> add(PassRefPtr<File>);
+    PassRefPtrWillBeRawPtr<DataObjectItem> add(const String& data, const String& type);
+    PassRefPtrWillBeRawPtr<DataObjectItem> add(PassRefPtr<File>);
 
     // WebCore helpers.
     void clearData(const String& type);
     void clearAllExceptFiles();
 
     ListHashSet<String> types() const;
     String getData(const String& type) const;
     bool setData(const String& type, const String& data);
 
     void urlAndTitle(String& url, String* title = 0) const;
     void setURLAndTitle(const String& url, const String& title);
     void htmlAndBaseURL(String& html, KURL& baseURL) const;
     void setHTMLAndBaseURL(const String& html, const KURL& baseURL);
 
     // Used for dragging in files from the desktop.
     bool containsFilenames() const;
     Vector<String> filenames() const;
     void addFilename(const String& filename, const String& displayName);
 
     // Used to handle files (images) being dragged out.
     void addSharedBuffer(const String& name, PassRefPtr<SharedBuffer>);
 
     int modifierKeyState() const { return m_modifierKeyState; }
     void setModifierKeyState(int modifierKeyState) { m_modifierKeyState = modifierKeyState; }
 
+    // FIXME: oilpan: This trace() has to trace Supplementable.
+    void trace(Visitor*);
+
 private:
     DataObject();
     explicit DataObject(const DataObject&);
 
-    PassRefPtr<DataObjectItem> findStringItem(const String& type) const;
-    bool internalAddStringItem(PassRefPtr<DataObjectItem>);
-    void internalAddFileItem(PassRefPtr<DataObjectItem>);
+    PassRefPtrWillBeRawPtr<DataObjectItem> findStringItem(const String& type) const;
+    bool internalAddStringItem(PassRefPtrWillBeRawPtr<DataObjectItem>);
+    void internalAddFileItem(PassRefPtrWillBeRawPtr<DataObjectItem>);
 
-    Vector<RefPtr<DataObjectItem> > m_itemList;
+    WillBeHeapVector<RefPtrWillBeMember<DataObjectItem> > m_itemList;
 
     // State of Shift/Ctrl/Alt/Meta keys.
     int m_modifierKeyState;
 };
 
 } // namespace WebCore
 
 #endif