Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
index 85ae0efa0..217d06961 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
@@ -345,16 +345,17 @@ const gchar* const* webkit_file_chooser_request_get_selected_files(WebKitFileCho
     if (request->priv->selectedFiles)
         return reinterpret_cast<gchar**>(request->priv->selectedFiles->pdata);
 
-    const Vector<String> selectedFileNames = request->priv->parameters->selectedFileNames();
-    size_t numOfFiles = selectedFileNames.size();
+    RefPtr<ImmutableArray> selectedFileNames = request->priv->parameters->selectedFileNames();
+    size_t numOfFiles = selectedFileNames->size();
     if (!numOfFiles)
         return 0;
 
     request->priv->selectedFiles = adoptGRef(g_ptr_array_new_with_free_func(g_free));
     for (size_t i = 0; i < numOfFiles; ++i) {
-        if (selectedFileNames[i].isEmpty())
+        WebString* webFileName = static_cast<WebString*>(selectedFileNames->at(i));
+        if (webFileName->isEmpty())
             continue;
-        CString filename = fileSystemRepresentation(selectedFileNames[i]);
+        CString filename = fileSystemRepresentation(webFileName->string());
         g_ptr_array_add(request->priv->selectedFiles.get(), g_strdup(filename.data()));
     }
     g_ptr_array_add(request->priv->selectedFiles.get(), 0);