Chromium Code Reviews| Index: Source/core/clipboard/DataObjectItem.cpp |
| diff --git a/Source/core/clipboard/DataObjectItem.cpp b/Source/core/clipboard/DataObjectItem.cpp |
| index 4bc529404407e9c83e633ff2ecb5a39ae3bf9395..542d0d9c8636b9b5aea82ae4f00d47f4f9253b1e 100644 |
| --- a/Source/core/clipboard/DataObjectItem.cpp |
| +++ b/Source/core/clipboard/DataObjectItem.cpp |
| @@ -46,7 +46,7 @@ PassRefPtrWillBeRawPtr<DataObjectItem> DataObjectItem::createFromString(const St |
| return item.release(); |
| } |
| -PassRefPtrWillBeRawPtr<DataObjectItem> DataObjectItem::createFromFile(PassRefPtr<File> file) |
| +PassRefPtrWillBeRawPtr<DataObjectItem> DataObjectItem::createFromFile(PassRefPtrWillBeRawPtr<File> file) |
| { |
| RefPtrWillBeRawPtr<DataObjectItem> item = adoptRefWillBeNoop(new DataObjectItem(FileKind, file->type())); |
| item->m_file = file; |
| @@ -100,14 +100,14 @@ DataObjectItem::DataObjectItem(Kind kind, const String& type, uint64_t sequenceN |
| { |
| } |
| -PassRefPtr<Blob> DataObjectItem::getAsFile() const |
| +PassRefPtrWillBeRawPtr<Blob> DataObjectItem::getAsFile() const |
| { |
| if (kind() != FileKind) |
| return nullptr; |
| if (m_source == InternalSource) { |
| if (m_file) |
| - return m_file; |
| + return m_file.get(); |
|
Mads Ager (chromium)
2014/02/26 11:00:29
Just curious: do you remember why you need the .ge
sof
2014/02/26 21:51:25
Yes, unbox m_file (either a RefPtr<T> or Member<T>
|
| ASSERT(m_sharedBuffer); |
| // FIXME: This code is currently impossible--we never populate m_sharedBuffer when dragging |
| // in. At some point though, we may need to support correctly converting a shared buffer |
| @@ -170,5 +170,10 @@ bool DataObjectItem::isFilename() const |
| return m_kind == FileKind && m_file; |
| } |
| +void DataObjectItem::trace(Visitor* visitor) |
| +{ |
| + visitor->trace(m_file); |
| +} |
| + |
| } // namespace WebCore |