Title: [199577] trunk/Source/WebKit2
- Revision
- 199577
- Author
- [email protected]
- Date
- 2016-04-14 23:35:53 -0700 (Thu, 14 Apr 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199576 => 199577)
--- trunk/Source/WebKit2/ChangeLog 2016-04-15 06:27:44 UTC (rev 199576)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-15 06:35:53 UTC (rev 199577)
@@ -1,3 +1,13 @@
+2016-04-14 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
Make <a download> a runtime enabled option
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (199576 => 199577)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2016-04-15 06:27:44 UTC (rev 199576)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2016-04-15 06:35:53 UTC (rev 199577)
@@ -21,9 +21,9 @@
#include "WebKitFileChooserRequest.h"
#include "APIArray.h"
+#include "APIOpenPanelParameters.h"
#include "APIString.h"
#include "WebKitFileChooserRequestPrivate.h"
-#include "WebOpenPanelParameters.h"
#include "WebOpenPanelResultListenerProxy.h"
#include <WebCore/FileSystem.h>
#include <glib/gi18n-lib.h>
@@ -59,7 +59,7 @@
*/
struct _WebKitFileChooserRequestPrivate {
- RefPtr<WebOpenPanelParameters> parameters;
+ RefPtr<API::OpenPanelParameters> parameters;
RefPtr<WebOpenPanelResultListenerProxy> listener;
GRefPtr<GtkFileFilter> filter;
GRefPtr<GPtrArray> mimeTypes;
@@ -175,7 +175,7 @@
WEBKIT_PARAM_READABLE));
}
-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));
request->priv->parameters = parameters;
@@ -299,23 +299,15 @@
g_return_if_fail(files);
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;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h (199576 => 199577)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h 2016-04-15 06:27:44 UTC (rev 199576)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h 2016-04-15 06:35:53 UTC (rev 199577)
@@ -23,6 +23,6 @@
#include "WebKitFileChooserRequest.h"
#include "WebKitPrivate.h"
-WebKitFileChooserRequest* webkitFileChooserRequestCreate(WebKit::WebOpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
+WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
#endif // WebKitFileChooserRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (199576 => 199577)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2016-04-15 06:27:44 UTC (rev 199576)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2016-04-15 06:35:53 UTC (rev 199577)
@@ -160,7 +160,7 @@
completionHandler(defaultQuota);
}
- 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));
webkitWebViewRunFileChooserRequest(m_webView, request.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
