| Index: Source/core/clipboard/DataObjectItem.h
|
| diff --git a/Source/core/clipboard/DataObjectItem.h b/Source/core/clipboard/DataObjectItem.h
|
| index 6896a93086c242a2a759f7cb72bd29a4d33f1aed..a356fcafa1cccf9680418476b042d702a7414f27 100644
|
| --- a/Source/core/clipboard/DataObjectItem.h
|
| +++ b/Source/core/clipboard/DataObjectItem.h
|
| @@ -32,6 +32,7 @@
|
| #define DataObjectItem_h
|
|
|
| #include "core/fileapi/File.h"
|
| +#include "heap/Handle.h"
|
| #include "platform/SharedBuffer.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -42,19 +43,20 @@ namespace WebCore {
|
|
|
| class Blob;
|
|
|
| -class DataObjectItem : public RefCounted<DataObjectItem> {
|
| +class DataObjectItem : public RefCountedWillBeGarbageCollectedFinalized<DataObjectItem> {
|
| + DECLARE_GC_INFO;
|
| public:
|
| enum Kind {
|
| StringKind,
|
| FileKind
|
| };
|
|
|
| - static PassRefPtr<DataObjectItem> createFromString(const String& type, const String& data);
|
| - static PassRefPtr<DataObjectItem> createFromFile(PassRefPtr<File>);
|
| - static PassRefPtr<DataObjectItem> createFromURL(const String& url, const String& title);
|
| - static PassRefPtr<DataObjectItem> createFromHTML(const String& html, const KURL& baseURL);
|
| - static PassRefPtr<DataObjectItem> createFromSharedBuffer(const String& filename, PassRefPtr<SharedBuffer>);
|
| - static PassRefPtr<DataObjectItem> createFromPasteboard(const String& type, uint64_t sequenceNumber);
|
| + static PassRefPtrWillBeRawPtr<DataObjectItem> createFromString(const String& type, const String& data);
|
| + static PassRefPtrWillBeRawPtr<DataObjectItem> createFromFile(PassRefPtr<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);
|
|
|
| Kind kind() const { return m_kind; }
|
| String type() const { return m_type; }
|
| @@ -67,6 +69,8 @@ public:
|
| KURL baseURL() const { return m_baseURL; }
|
| bool isFilename() const;
|
|
|
| + void trace(Visitor*) { }
|
| +
|
| private:
|
| enum DataSource {
|
| PasteboardSource,
|
|
|