Enable Oilpan for core/clipboard/

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 19 matching lines @@
 
 #ifndef DataObject_h
 #define DataObject_h
 
 #include "core/CoreExport.h"
 #include "core/clipboard/DataObjectItem.h"
 #include "platform/PasteMode.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "wtf/ListHashSet.h"
-#include "wtf/RefCounted.h"
-#include "wtf/RefPtr.h"
+#include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class KURL;
 class SharedBuffer;
 class WebDragData;
 
 // 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 CORE_EXPORT DataObject : public RefCountedWillBeGarbageCollectedFinalized<DataObject>, public WillBeHeapSupplementable<DataObject> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DataObject);
+class DataObject : public GarbageCollectedFinalized<DataObject>, public HeapSupplementable<DataObject> {

[sof, 2015/04/22 21:48:11]

Will add back CORE_EXPORT.

[sof, 2015/04/23 08:01:53]

Done.

+    USING_GARBAGE_COLLECTED_MIXIN(DataObject);
 public:
-    static PassRefPtrWillBeRawPtr<DataObject> createFromPasteboard(PasteMode);
-    static PassRefPtrWillBeRawPtr<DataObject> create();
-    static PassRefPtrWillBeRawPtr<DataObject> create(WebDragData);
+    static DataObject* createFromPasteboard(PasteMode);
+    static DataObject* create();
+    static DataObject* create(WebDragData);
+
+    DataObject* copy() const;

[haraken, 2015/04/23 04:47:08]

What is this for?

[sof, 2015/04/23 08:01:53]

Oops, an unmoored declaration that was removed in r190285, which I managed to
bring back. Gone again now.

 
     virtual ~DataObject();
 
     // DataTransferItemList support.
     size_t length() const;
-    PassRefPtrWillBeRawPtr<DataObjectItem> item(unsigned long index);
+    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.
-    PassRefPtrWillBeRawPtr<DataObjectItem> add(const String& data, const String& type);
-    PassRefPtrWillBeRawPtr<DataObjectItem> add(File*);
+    DataObjectItem* add(const String& data, const String& type);
+    DataObjectItem* add(File*);
 
     // WebCore helpers.
     void clearData(const String& type);
 
     ListHashSet<String> types() const;
     String getData(const String& type) const;
     void setData(const String& type, const String& data);
 
     void urlAndTitle(String& url, String* title = 0) const;
     void setURLAndTitle(const String& url, const String& title);
@@ skipping 15 matching lines @@
     int modifiers() const { return m_modifiers; }
     void setModifiers(int modifiers) { m_modifiers = modifiers; }
 
     DECLARE_TRACE();
 
     WebDragData toWebDragData();
 
 private:
     DataObject();
 
-    PassRefPtrWillBeRawPtr<DataObjectItem> findStringItem(const String& type) const;
-    bool internalAddStringItem(PassRefPtrWillBeRawPtr<DataObjectItem>);
-    void internalAddFileItem(PassRefPtrWillBeRawPtr<DataObjectItem>);
+    DataObjectItem* findStringItem(const String& type) const;
+    bool internalAddStringItem(DataObjectItem*);
+    void internalAddFileItem(DataObjectItem*);
 
-    WillBeHeapVector<RefPtrWillBeMember<DataObjectItem>> m_itemList;
+    HeapVector<Member<DataObjectItem>> m_itemList;
 
     // State of Shift/Ctrl/Alt/Meta keys and Left/Right/Middle mouse buttons
     int m_modifiers;
     String m_filesystemId;
 };
 
 } // namespace blink
 
 #endif