From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp') 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(request->priv->selectedFiles->pdata); - const Vector selectedFileNames = request->priv->parameters->selectedFileNames(); - size_t numOfFiles = selectedFileNames.size(); + RefPtr 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(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); -- cgit v1.2.1