Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / clipboard / DataObject.cpp

diff --git a/src/third_party/WebKit/Source/core/clipboard/DataObject.cpp b/src/third_party/WebKit/Source/core/clipboard/DataObject.cpp
index 5e7901f..7edeaec 100644 (file)
--- a/src/third_party/WebKit/Source/core/clipboard/DataObject.cpp
+++ b/src/third_party/WebKit/Source/core/clipboard/DataObject.cpp
@@ -103,7 +103,7 @@ PassRefPtrWillBeRawPtr<DataObjectItem> DataObject::add(const String& data, const
     return item;
 }
 
-PassRefPtrWillBeRawPtr<DataObjectItem> DataObject::add(PassRefPtrWillBeRawPtr<File> file)
+PassRefPtrWillBeRawPtr<DataObjectItem> DataObject::add(File* file)
 {
     if (!file)
         return nullptr;
@@ -204,7 +204,7 @@ Vector<String> DataObject::filenames() const
     Vector<String> results;
     for (size_t i = 0; i < m_itemList.size(); ++i) {
         if (m_itemList[i]->isFilename())
-            results.append(static_cast<File*>(m_itemList[i]->getAsFile().get())->path());
+            results.append(toFile(m_itemList[i]->getAsFile())->path());
     }
     return results;
 }
@@ -259,8 +259,10 @@ void DataObject::internalAddFileItem(PassRefPtrWillBeRawPtr<DataObjectItem> item
 
 void DataObject::trace(Visitor* visitor)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_itemList);
-    WillBeHeapSupplementable<DataObject>::trace(visitor);
+    HeapSupplementable<DataObject>::trace(visitor);
+#endif
 }
 
 } // namespace blink