Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Unified Diff: Source/core/clipboard/DataObject.h

Issue 640303002: Enable Oilpan for core/clipboard/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: remove some slightly pointy edges Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/clipboard/DataObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/clipboard/DataObject.h
diff --git a/Source/core/clipboard/DataObject.h b/Source/core/clipboard/DataObject.h
index edcd0062b748073d7580d5951ab6b930532e5ea5..05a4f58a70197815c8ead1af1565250a634199c8 100644
--- a/Source/core/clipboard/DataObject.h
+++ b/Source/core/clipboard/DataObject.h
@@ -37,8 +37,7 @@
#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"
@@ -52,24 +51,24 @@ 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 CORE_EXPORT DataObject : public GarbageCollectedFinalized<DataObject>, public HeapSupplementable<DataObject> {
+ 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);
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);
@@ -105,11 +104,11 @@ public:
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;
« no previous file with comments | « no previous file | Source/core/clipboard/DataObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698