Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / page / DragData.cpp

diff --git a/src/third_party/WebKit/Source/core/page/DragData.cpp b/src/third_party/WebKit/Source/core/page/DragData.cpp
index d053b0c..fbb264c 100644 (file)
--- a/src/third_party/WebKit/Source/core/page/DragData.cpp
+++ b/src/third_party/WebKit/Source/core/page/DragData.cpp
@@ -53,7 +53,7 @@ DragData::DragData(const String&, const IntPoint& clientPosition, const IntPoint
     DragOperation sourceOperationMask, DragApplicationFlags flags)
     : m_clientPosition(clientPosition)
     , m_globalPosition(globalPosition)
-    , m_platformDragData(0)
+    , m_platformDragData(nullptr)
     , m_draggingSourceOperationMask(sourceOperationMask)
     , m_applicationFlags(flags)
 {
@@ -85,21 +85,18 @@ bool DragData::containsFiles() const
     return m_platformDragData->containsFilenames();
 }
 
-unsigned DragData::numberOfFiles() const
-{
-    return m_platformDragData->filenames().size();
-}
-
 int DragData::modifierKeyState() const
 {
     return m_platformDragData->modifierKeyState();
 }
 
-void DragData::asFilenames(Vector<String>& result) const
+void DragData::asFilePaths(Vector<String>& result) const
 {
     const Vector<String>& filenames = m_platformDragData->filenames();
-    for (size_t i = 0; i < filenames.size(); ++i)
-        result.append(filenames[i]);
+    for (size_t i = 0; i < filenames.size(); ++i) {
+        if (!filenames[i].isEmpty())
+            result.append(filenames[i]);
+    }
 }
 
 bool DragData::containsPlainText() const