Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 14 insertions, 8 deletions

diff --git a/Source/WebKit/chromium/src/WebFileChooserCompletionImpl.cpp b/Source/WebKit/chromium/src/WebFileChooserCompletionImpl.cpp
index d7583c5dd..73452d0d0 100644
--- a/Source/WebKit/chromium/src/WebFileChooserCompletionImpl.cpp
+++ b/Source/WebKit/chromium/src/WebFileChooserCompletionImpl.cpp
@@ -44,14 +44,20 @@ WebFileChooserCompletionImpl::~WebFileChooserCompletionImpl()
 
 void WebFileChooserCompletionImpl::didChooseFile(const WebVector<WebString>& fileNames)
 {
-    if (fileNames.size() == 1)
-        m_fileChooser->chooseFile(fileNames[0]);
-    else if (fileNames.size() > 0) {
-        Vector<WTF::String> paths;
-        for (size_t i = 0; i < fileNames.size(); ++i)
-            paths.append(fileNames[i]);
-        m_fileChooser->chooseFiles(paths);
-    }
+    Vector<WebCore::FileChooserFileInfo> fileInfo;
+    for (size_t i = 0; i < fileNames.size(); ++i)
+        fileInfo.append(WebCore::FileChooserFileInfo(fileNames[i]));
+    m_fileChooser->chooseFiles(fileInfo);
+    // This object is no longer needed.
+    delete this;
+}
+
+void WebFileChooserCompletionImpl::didChooseFile(const WebVector<SelectedFileInfo>& files)
+{
+    Vector<WebCore::FileChooserFileInfo> fileInfo;
+    for (size_t i = 0; i < files.size(); ++i)
+        fileInfo.append(WebCore::FileChooserFileInfo(files[i].path, files[i].displayName));
+    m_fileChooser->chooseFiles(fileInfo);
     // This object is no longer needed.
     delete this;
 }