| Index: Source/core/clipboard/DataObjectItem.h
|
| diff --git a/Source/core/clipboard/DataObjectItem.h b/Source/core/clipboard/DataObjectItem.h
|
| index a356fcafa1cccf9680418476b042d702a7414f27..a04685eaacf487ac91417e57a03309f7ad693158 100644
|
| --- a/Source/core/clipboard/DataObjectItem.h
|
| +++ b/Source/core/clipboard/DataObjectItem.h
|
| @@ -52,7 +52,7 @@ public:
|
| };
|
|
|
| static PassRefPtrWillBeRawPtr<DataObjectItem> createFromString(const String& type, const String& data);
|
| - static PassRefPtrWillBeRawPtr<DataObjectItem> createFromFile(PassRefPtr<File>);
|
| + static PassRefPtrWillBeRawPtr<DataObjectItem> createFromFile(PassRefPtrWillBeRawPtr<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>);
|
| @@ -61,7 +61,7 @@ public:
|
| Kind kind() const { return m_kind; }
|
| String type() const { return m_type; }
|
| String getAsString() const;
|
| - PassRefPtr<Blob> getAsFile() const;
|
| + PassRefPtrWillBeRawPtr<Blob> getAsFile() const;
|
|
|
| // Used to support legacy DataTransfer APIs and renderer->browser serialization.
|
| PassRefPtr<SharedBuffer> sharedBuffer() const { return m_sharedBuffer; }
|
| @@ -69,7 +69,7 @@ public:
|
| KURL baseURL() const { return m_baseURL; }
|
| bool isFilename() const;
|
|
|
| - void trace(Visitor*) { }
|
| + void trace(Visitor*);
|
|
|
| private:
|
| enum DataSource {
|
| @@ -85,7 +85,7 @@ private:
|
| String m_type;
|
|
|
| String m_data;
|
| - RefPtr<File> m_file;
|
| + RefPtrWillBeMember<File> m_file;
|
| RefPtr<SharedBuffer> m_sharedBuffer;
|
| // Optional metadata. Currently used for URL, HTML, and dragging files in.
|
| String m_title;
|
|
|