Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Unified Diff: Source/core/clipboard/DataTransferItemList.cpp

Issue 640303002: Enable Oilpan for core/clipboard/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: remove some slightly pointy edges Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/clipboard/DataTransferItemList.h ('k') | Source/core/clipboard/DataTransferItemList.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/clipboard/DataTransferItemList.cpp
diff --git a/Source/core/clipboard/DataTransferItemList.cpp b/Source/core/clipboard/DataTransferItemList.cpp
index 0df60527a200d44a5ac057fe0ee8900a2e60c2f8..d051b9c86c66c6b603c9be97db5aee848f035ef5 100644
--- a/Source/core/clipboard/DataTransferItemList.cpp
+++ b/Source/core/clipboard/DataTransferItemList.cpp
@@ -35,11 +35,9 @@
namespace blink {
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DataTransferItemList);
-
-PassRefPtrWillBeRawPtr<DataTransferItemList> DataTransferItemList::create(PassRefPtrWillBeRawPtr<DataTransfer> dataTransfer, PassRefPtrWillBeRawPtr<DataObject> list)
+DataTransferItemList* DataTransferItemList::create(DataTransfer* dataTransfer, DataObject* list)
{
- return adoptRefWillBeNoop(new DataTransferItemList(dataTransfer, list));
+ return new DataTransferItemList(dataTransfer, list);
}
size_t DataTransferItemList::length() const
@@ -49,11 +47,11 @@ size_t DataTransferItemList::length() const
return m_dataObject->length();
}
-PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::item(unsigned long index)
+DataTransferItem* DataTransferItemList::item(unsigned long index)
{
if (!m_dataTransfer->canReadTypes())
return nullptr;
- RefPtrWillBeRawPtr<DataObjectItem> item = m_dataObject->item(index);
+ DataObjectItem* item = m_dataObject->item(index);
if (!item)
return nullptr;
@@ -76,11 +74,11 @@ void DataTransferItemList::clear()
m_dataObject->clearAll();
}
-PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::add(const String& data, const String& type, ExceptionState& exceptionState)
+DataTransferItem* DataTransferItemList::add(const String& data, const String& type, ExceptionState& exceptionState)
{
if (!m_dataTransfer->canWriteData())
return nullptr;
- RefPtrWillBeRawPtr<DataObjectItem> item = m_dataObject->add(data, type);
+ DataObjectItem* item = m_dataObject->add(data, type);
if (!item) {
exceptionState.throwDOMException(NotSupportedError, "An item already exists for type '" + type + "'.");
return nullptr;
@@ -88,17 +86,17 @@ PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::add(const String&
return DataTransferItem::create(m_dataTransfer, item);
}
-PassRefPtrWillBeRawPtr<DataTransferItem> DataTransferItemList::add(File* file)
+DataTransferItem* DataTransferItemList::add(File* file)
{
if (!m_dataTransfer->canWriteData())
return nullptr;
- RefPtrWillBeRawPtr<DataObjectItem> item = m_dataObject->add(file);
+ DataObjectItem* item = m_dataObject->add(file);
if (!item)
return nullptr;
return DataTransferItem::create(m_dataTransfer, item);
}
-DataTransferItemList::DataTransferItemList(PassRefPtrWillBeRawPtr<DataTransfer> dataTransfer, PassRefPtrWillBeRawPtr<DataObject> dataObject)
+DataTransferItemList::DataTransferItemList(DataTransfer* dataTransfer, DataObject* dataObject)
: m_dataTransfer(dataTransfer)
, m_dataObject(dataObject)
{
« no previous file with comments | « Source/core/clipboard/DataTransferItemList.h ('k') | Source/core/clipboard/DataTransferItemList.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698