diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/gtk/DragDataGtk.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/gtk/DragDataGtk.cpp')
| -rw-r--r-- | WebCore/platform/gtk/DragDataGtk.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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 |