Changeset 199577 in webkit

Timestamp:

Apr 14, 2016 11:35:53 PM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix GTK+ build after r199558.

• UIProcess/API/gtk/WebKitFileChooserRequest.cpp:

(webkitFileChooserRequestCreate):
(webkit_file_chooser_request_select_files):

• UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h:
• UIProcess/API/gtk/WebKitUIClient.cpp:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitFileChooserRequest.cpp (modified) (4 diffs)
• UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h (modified) (1 diff)
• UIProcess/API/gtk/WebKitUIClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK+ build after r199558.
+
+        * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+        (webkitFileChooserRequestCreate):
+        (webkit_file_chooser_request_select_files):
+        * UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h:
+        * UIProcess/API/gtk/WebKitUIClient.cpp:
+
 2016-04-14  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp

@@ -22 +22 @@
 
 #include "APIArray.h"
+#include "APIOpenPanelParameters.h"
 #include "APIString.h"
 #include "WebKitFileChooserRequestPrivate.h"
-#include "WebOpenPanelParameters.h"
 #include "WebOpenPanelResultListenerProxy.h"
 #include <WebCore/FileSystem.h>
@@ -60 +60 @@
 
 struct _WebKitFileChooserRequestPrivate {
-    RefPtr<WebOpenPanelParameters> parameters;
+    RefPtr<API::OpenPanelParameters> parameters;
     RefPtr<WebOpenPanelResultListenerProxy> listener;
     GRefPtr<GtkFileFilter> filter;
@@ -176 +176 @@
 }
 
-WebKitFileChooserRequest* webkitFileChooserRequestCreate(WebOpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener)
+WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener)
 {
     WebKitFileChooserRequest* request = WEBKIT_FILE_CHOOSER_REQUEST(g_object_new(WEBKIT_TYPE_FILE_CHOOSER_REQUEST, NULL));
@@ -300 +300 @@
 
     GRefPtr<GPtrArray> selectedFiles = adoptGRef(g_ptr_array_new_with_free_func(g_free));
-    Vector<RefPtr<API::Object> > chosenFiles;
+    Vector<String> chosenFiles;
     for (int i = 0; files[i]; i++) {
-        GRefPtr<GFile> filename = adoptGRef(g_file_new_for_path(files[i]));
-
-        // Make sure the file path is presented as an URI (escaped
-        // string, with the 'file://' prefix) to WebCore otherwise the
-        // FileChooser won't actually choose it.
-        GUniquePtr<char> uri(g_file_get_uri(filename.get()));
-        chosenFiles.append(API::URL::create(String::fromUTF8(uri.get())));
-
-        // Do not use the URI here because this won't reach WebCore.
+        chosenFiles.append(WebCore::decodeURLEscapeSequences(String::fromUTF8(files[i])));
         g_ptr_array_add(selectedFiles.get(), g_strdup(files[i]));
     }
-    g_ptr_array_add(selectedFiles.get(), 0);
+    g_ptr_array_add(selectedFiles.get(), nullptr);
 
     // Select the files in WebCore and update local private attributes.
-    request->priv->listener->chooseFiles(API::Array::create(WTFMove(chosenFiles)).ptr());
+    request->priv->listener->chooseFiles(chosenFiles);
     request->priv->selectedFiles = selectedFiles;
     request->priv->handledRequest = true;

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h

@@ -24 +24 @@
 #include "WebKitPrivate.h"
 
-WebKitFileChooserRequest* webkitFileChooserRequestCreate(WebKit::WebOpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
+WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
 
 #endif // WebKitFileChooserRequestPrivate_h

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp

@@ -161 +161 @@
     }
 
-    bool runOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
+    bool runOpenPanel(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
     {
         GRefPtr<WebKitFileChooserRequest> request = adoptGRef(webkitFileChooserRequestCreate(parameters, listener));