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

Unified Diff: Source/core/clipboard/DataObjectItem.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 | « Source/core/clipboard/DataObject.cpp ('k') | Source/core/clipboard/DataObjectItem.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/clipboard/DataObjectItem.h
diff --git a/Source/core/clipboard/DataObjectItem.h b/Source/core/clipboard/DataObjectItem.h
index 5d3b5f280641aeb24924e17d8c1748c7703a1223..e22645ed2b80f38e664c3d9a1567b4ae617ae31b 100644
--- a/Source/core/clipboard/DataObjectItem.h
+++ b/Source/core/clipboard/DataObjectItem.h
@@ -36,27 +36,25 @@
#include "platform/SharedBuffer.h"
#include "platform/heap/Handle.h"
#include "platform/weborigin/KURL.h"
-#include "wtf/RefCounted.h"
-#include "wtf/RefPtr.h"
-#include "wtf/text/WTFString.h"
+#include "wtf/Forward.h"
namespace blink {
class Blob;
-class CORE_EXPORT DataObjectItem : public RefCountedWillBeGarbageCollectedFinalized<DataObjectItem> {
+class CORE_EXPORT DataObjectItem : public GarbageCollectedFinalized<DataObjectItem> {
public:
enum Kind {
StringKind,
FileKind
};
- static PassRefPtrWillBeRawPtr<DataObjectItem> createFromString(const String& type, const String& data);
- static PassRefPtrWillBeRawPtr<DataObjectItem> createFromFile(File*);
- static PassRefPtrWillBeRawPtr<DataObjectItem> createFromURL(const String& url, const String& title);
- static PassRefPtrWillBeRawPtr<DataObjectItem> createFromHTML(const String& html, const KURL& baseURL);
- static PassRefPtrWillBeRawPtr<DataObjectItem> createFromSharedBuffer(const String& filename, PassRefPtr<SharedBuffer>);
- static PassRefPtrWillBeRawPtr<DataObjectItem> createFromPasteboard(const String& type, uint64_t sequenceNumber);
+ static DataObjectItem* createFromString(const String& type, const String& data);
+ static DataObjectItem* createFromFile(File*);
+ static DataObjectItem* createFromURL(const String& url, const String& title);
+ static DataObjectItem* createFromHTML(const String& html, const KURL& baseURL);
+ static DataObjectItem* createFromSharedBuffer(const String& filename, PassRefPtr<SharedBuffer>);
+ static DataObjectItem* createFromPasteboard(const String& type, uint64_t sequenceNumber);
Kind kind() const { return m_kind; }
String type() const { return m_type; }
@@ -85,7 +83,7 @@ private:
String m_type;
String m_data;
- PersistentWillBeMember<File> m_file;
+ Member<File> m_file;
RefPtr<SharedBuffer> m_sharedBuffer;
// Optional metadata. Currently used for URL, HTML, and dragging files in.
String m_title;
« no previous file with comments | « Source/core/clipboard/DataObject.cpp ('k') | Source/core/clipboard/DataObjectItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698