<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213637] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213637">213637</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-09 05:42:39 -0800 (Thu, 09 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use GtkFileChooserNative for open/save dialogs
https://bugs.webkit.org/show_bug.cgi?id=169278
Patch by Adrian Perez de Castro <aperez@igalia.com> on 2017-03-09
Reviewed by Carlos Garcia Campos.
When building with GTK+ 3.20.0 or newer, use GtkFileChooserNative instead of GtkFileChooserDialog to allow for
better integration with the runtime environment and use native open/save dialogs. This also makes WebKitGTK+ use
portal-based load/save dialogs when running inside the Flatpak sandbox.
The existing GtkFileChooserDialog implementation will still be used when building against older versions of
GTK+, so this change does not require a new version of the toolkit.
* UIProcess/API/gtk/WebKitWebView.cpp:
(fileChooserDialogResponseCallback):
(webkitWebViewRunFileChooser):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213636 => 213637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-09 13:10:20 UTC (rev 213636)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-09 13:42:39 UTC (rev 213637)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-09 Adrian Perez de Castro <aperez@igalia.com>
+
+ [GTK] Use GtkFileChooserNative for open/save dialogs
+ https://bugs.webkit.org/show_bug.cgi?id=169278
+
+ Reviewed by Carlos Garcia Campos.
+
+ When building with GTK+ 3.20.0 or newer, use GtkFileChooserNative instead of GtkFileChooserDialog to allow for
+ better integration with the runtime environment and use native open/save dialogs. This also makes WebKitGTK+ use
+ portal-based load/save dialogs when running inside the Flatpak sandbox.
+
+ The existing GtkFileChooserDialog implementation will still be used when building against older versions of
+ GTK+, so this change does not require a new version of the toolkit.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (fileChooserDialogResponseCallback):
+ (webkitWebViewRunFileChooser):
+
</ins><span class="cx"> 2017-03-08 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Add plumbing for WebCore to notify WebKit2 when an edit drag has concluded
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (213636 => 213637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-03-09 13:10:20 UTC (rev 213636)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-03-09 13:42:39 UTC (rev 213637)
</span><span class="lines">@@ -536,11 +536,11 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void fileChooserDialogResponseCallback(GtkDialog* dialog, gint responseID, WebKitFileChooserRequest* request)
</del><ins>+static void fileChooserDialogResponseCallback(GtkFileChooser* dialog, gint responseID, WebKitFileChooserRequest* request)
</ins><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitFileChooserRequest> adoptedRequest = adoptGRef(request);
</span><span class="cx"> if (responseID == GTK_RESPONSE_ACCEPT) {
</span><del>- GUniquePtr<GSList> filesList(gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)));
</del><ins>+ GUniquePtr<GSList> filesList(gtk_file_chooser_get_filenames(dialog));
</ins><span class="cx"> GRefPtr<GPtrArray> filesArray = adoptGRef(g_ptr_array_new());
</span><span class="cx"> for (GSList* file = filesList.get(); file; file = g_slist_next(file))
</span><span class="cx"> g_ptr_array_add(filesArray.get(), file->data);
</span><span class="lines">@@ -549,7 +549,11 @@
</span><span class="cx"> } else
</span><span class="cx"> webkit_file_chooser_request_cancel(adoptedRequest.get());
</span><span class="cx">
</span><ins>+#if GTK_CHECK_VERSION(3, 20, 0)
+ g_object_unref(dialog);
+#else
</ins><span class="cx"> gtk_widget_destroy(GTK_WIDGET(dialog));
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean webkitWebViewRunFileChooser(WebKitWebView* webView, WebKitFileChooserRequest* request)
</span><span class="lines">@@ -559,6 +563,11 @@
</span><span class="cx"> toplevel = 0;
</span><span class="cx">
</span><span class="cx"> gboolean allowsMultipleSelection = webkit_file_chooser_request_get_select_multiple(request);
</span><ins>+
+#if GTK_CHECK_VERSION(3, 20, 0)
+ GtkFileChooserNative* dialog = gtk_file_chooser_native_new(allowsMultipleSelection ? _("Select Files") : _("Select File"),
+ toplevel ? GTK_WINDOW(toplevel) : nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, nullptr, nullptr);
+#else
</ins><span class="cx"> GtkWidget* dialog = gtk_file_chooser_dialog_new(allowsMultipleSelection ? _("Select Files") : _("Select File"),
</span><span class="cx"> toplevel ? GTK_WINDOW(toplevel) : 0,
</span><span class="cx"> GTK_FILE_CHOOSER_ACTION_OPEN,
</span><span class="lines">@@ -565,6 +574,7 @@
</span><span class="cx"> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
</span><span class="cx"> GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
</span><span class="cx"> NULL);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (GtkFileFilter* filter = webkit_file_chooser_request_get_mime_types_filter(request))
</span><span class="cx"> gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
</span><span class="lines">@@ -574,7 +584,12 @@
</span><span class="cx"> gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(dialog), selectedFiles[0]);
</span><span class="cx">
</span><span class="cx"> g_signal_connect(dialog, "response", G_CALLBACK(fileChooserDialogResponseCallback), g_object_ref(request));
</span><ins>+
+#if GTK_CHECK_VERSION(3, 20, 0)
+ gtk_native_dialog_show(GTK_NATIVE_DIALOG(dialog));
+#else
</ins><span class="cx"> gtk_widget_show(dialog);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>