| Index: Source/core/clipboard/DataTransferItemList.cpp
|
| diff --git a/Source/core/clipboard/DataTransferItemList.cpp b/Source/core/clipboard/DataTransferItemList.cpp
|
| index 063a740dafee48a71d050e0a60c4bf1f3f448584..2ad17c8d1142d2314276c8caf1b3e25c66be6f9e 100644
|
| --- a/Source/core/clipboard/DataTransferItemList.cpp
|
| +++ b/Source/core/clipboard/DataTransferItemList.cpp
|
| @@ -35,9 +35,11 @@
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<DataTransferItemList> DataTransferItemList::create(PassRefPtr<Clipboard> clipboard, PassRefPtr<DataObject> list)
|
| +DEFINE_GC_INFO(DataTransferItemList);
|
| +
|
| +PassRefPtrWillBeRawPtr<DataTransferItemList> DataTransferItemList::create(PassRefPtrWillBeRawPtr<Clipboard> clipboard, PassRefPtrWillBeRawPtr<DataObject> list)
|
| {
|
| - return adoptRef(new DataTransferItemList(clipboard, list));
|
| + return adoptRefWillBeNoop(new DataTransferItemList(clipboard, list));
|
| }
|
|
|
| DataTransferItemList::~DataTransferItemList()
|
| @@ -51,11 +53,11 @@ size_t DataTransferItemList::length() const
|
| return m_dataObject->length();
|
| }
|
|
|
| -PassRefPtr<DataTransferItem> DataTransferItemList::item(unsigned long index)
|
| +PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::item(unsigned long index)
|
| {
|
| if (!m_clipboard->canReadTypes())
|
| return 0;
|
| - RefPtr<DataObjectItem> item = m_dataObject->item(index);
|
| + RefPtrWillBeRawPtr<DataObjectItem> item = m_dataObject->item(index);
|
| if (!item)
|
| return 0;
|
|
|
| @@ -78,11 +80,11 @@ void DataTransferItemList::clear()
|
| m_dataObject->clearAll();
|
| }
|
|
|
| -PassRefPtr<DataTransferItem> DataTransferItemList::add(const String& data, const String& type, ExceptionState& exceptionState)
|
| +PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::add(const String& data, const String& type, ExceptionState& exceptionState)
|
| {
|
| if (!m_clipboard->canWriteData())
|
| return 0;
|
| - RefPtr<DataObjectItem> item = m_dataObject->add(data, type);
|
| + RefPtrWillBeRawPtr<DataObjectItem> item = m_dataObject->add(data, type);
|
| if (!item) {
|
| exceptionState.throwDOMException(NotSupportedError, "An item already exists for type '" + type + "'.");
|
| return 0;
|
| @@ -90,21 +92,27 @@ PassRefPtr<DataTransferItem> DataTransferItemList::add(const String& data, const
|
| return DataTransferItem::create(m_clipboard, item);
|
| }
|
|
|
| -PassRefPtr<DataTransferItem> DataTransferItemList::add(PassRefPtr<File> file)
|
| +PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::add(PassRefPtr<File> file)
|
| {
|
| if (!m_clipboard->canWriteData())
|
| return 0;
|
| - RefPtr<DataObjectItem> item = m_dataObject->add(file);
|
| + RefPtrWillBeRawPtr<DataObjectItem> item = m_dataObject->add(file);
|
| if (!item)
|
| return 0;
|
| return DataTransferItem::create(m_clipboard, item);
|
| }
|
|
|
| -DataTransferItemList::DataTransferItemList(PassRefPtr<Clipboard> clipboard, PassRefPtr<DataObject> dataObject)
|
| +DataTransferItemList::DataTransferItemList(PassRefPtrWillBeRawPtr<Clipboard> clipboard, PassRefPtrWillBeRawPtr<DataObject> dataObject)
|
| : m_clipboard(clipboard)
|
| , m_dataObject(dataObject)
|
| {
|
| ScriptWrappable::init(this);
|
| }
|
|
|
| +void DataTransferItemList::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_clipboard);
|
| + visitor->trace(m_dataObject);
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|