diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp index 48b258c7a0d..50e69e505e9 100644 --- a/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp @@ -35,9 +35,9 @@ #include "core/dom/ExceptionCode.h" #include "core/dom/StringCallback.h" #include "core/editing/markup.h" -#include "core/fetch/ImageResource.h" #include "core/fileapi/File.h" #include "core/fileapi/FileList.h" +#include "core/loader/cache/ImageResource.h" #include "core/page/Frame.h" #include "core/platform/DragData.h" #include "core/platform/MIMETypeRegistry.h" @@ -64,8 +64,8 @@ public: virtual PassRefPtr<DataTransferItem> item(unsigned long index) OVERRIDE; virtual void deleteItem(unsigned long index, ExceptionState&) OVERRIDE; virtual void clear() OVERRIDE; - virtual PassRefPtr<DataTransferItem> add(const String& data, const String& type, ExceptionState&) OVERRIDE; - virtual PassRefPtr<DataTransferItem> add(PassRefPtr<File>) OVERRIDE; + virtual void add(const String& data, const String& type, ExceptionState&) OVERRIDE; + virtual void add(PassRefPtr<File>) OVERRIDE; private: DataTransferItemListPolicyWrapper(PassRefPtr<ClipboardChromium>, PassRefPtr<ChromiumDataObject>); @@ -119,24 +119,18 @@ void DataTransferItemListPolicyWrapper::clear() m_dataObject->clearAll(); } -PassRefPtr<DataTransferItem> DataTransferItemListPolicyWrapper::add(const String& data, const String& type, ExceptionState& es) +void DataTransferItemListPolicyWrapper::add(const String& data, const String& type, ExceptionState& es) { if (!m_clipboard->canWriteData()) - return 0; - RefPtr<ChromiumDataObjectItem> item = m_dataObject->add(data, type, es); - if (!item) - return 0; - return DataTransferItemPolicyWrapper::create(m_clipboard, item); + return; + m_dataObject->add(data, type, es); } -PassRefPtr<DataTransferItem> DataTransferItemListPolicyWrapper::add(PassRefPtr<File> file) +void DataTransferItemListPolicyWrapper::add(PassRefPtr<File> file) { if (!m_clipboard->canWriteData()) - return 0; - RefPtr<ChromiumDataObjectItem> item = m_dataObject->add(file, m_clipboard->frame()->document()->scriptExecutionContext()); - if (!item) - return 0; - return DataTransferItemPolicyWrapper::create(m_clipboard, item); + return; + m_dataObject->add(file, m_clipboard->frame()->document()->scriptExecutionContext()); } DataTransferItemListPolicyWrapper::DataTransferItemListPolicyWrapper( |