From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 22 Oct 2010 13:02:20 +0100
Subject: Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
---
 WebCore/platform/gtk/DragDataGtk.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'WebCore/platform/gtk/DragDataGtk.cpp')

diff --git a/WebCore/platform/gtk/DragDataGtk.cpp b/WebCore/platform/gtk/DragDataGtk.cpp
index 69966aa..42ddb16 100644
--- a/WebCore/platform/gtk/DragDataGtk.cpp
+++ b/WebCore/platform/gtk/DragDataGtk.cpp
@@ -37,14 +37,12 @@ bool DragData::containsColor() const
 
 bool DragData::containsFiles() const
 {
-    return !m_platformDragData->files().isEmpty();
+    return m_platformDragData->hasFilenames();
 }
 
 void DragData::asFilenames(Vector<String>& result) const
 {
-    Vector<String> files(m_platformDragData->files());
-    for (size_t i = 0; i < files.size(); i++)
-        result.append(files[i]);
+    result = m_platformDragData->filenames();
 }
 
 bool DragData::containsPlainText() const
-- 
cgit v1.1