<!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>[199577] 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/199577">199577</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-14 23:35:53 -0700 (Thu, 14 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed. Fix GTK+ build after <a href="http://trac.webkit.org/projects/webkit/changeset/199558">r199558</a>.
* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
(webkitFileChooserRequestCreate):
(webkit_file_chooser_request_select_files):
* UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h:
* UIProcess/API/gtk/WebKitUIClient.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199576 => 199577)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-04-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Make <a download> a runtime enabled option
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (199576 => 199577)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> #include "WebKitFileChooserRequest.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIOpenPanelParameters.h"
</ins><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "WebKitFileChooserRequestPrivate.h"
</span><del>-#include "WebOpenPanelParameters.h"
</del><span class="cx"> #include "WebOpenPanelResultListenerProxy.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> struct _WebKitFileChooserRequestPrivate {
</span><del>- RefPtr<WebOpenPanelParameters> parameters;
</del><ins>+ RefPtr<API::OpenPanelParameters> parameters;
</ins><span class="cx"> RefPtr<WebOpenPanelResultListenerProxy> listener;
</span><span class="cx"> GRefPtr<GtkFileFilter> filter;
</span><span class="cx"> GRefPtr<GPtrArray> mimeTypes;
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitFileChooserRequest* webkitFileChooserRequestCreate(WebOpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener)
</del><ins>+WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener)
</ins><span class="cx"> {
</span><span class="cx"> WebKitFileChooserRequest* request = WEBKIT_FILE_CHOOSER_REQUEST(g_object_new(WEBKIT_TYPE_FILE_CHOOSER_REQUEST, NULL));
</span><span class="cx"> request->priv->parameters = parameters;
</span><span class="lines">@@ -299,23 +299,15 @@
</span><span class="cx"> g_return_if_fail(files);
</span><span class="cx">
</span><span class="cx"> GRefPtr<GPtrArray> selectedFiles = adoptGRef(g_ptr_array_new_with_free_func(g_free));
</span><del>- Vector<RefPtr<API::Object> > chosenFiles;
</del><ins>+ Vector<String> chosenFiles;
</ins><span class="cx"> for (int i = 0; files[i]; i++) {
</span><del>- 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.
</del><ins>+ chosenFiles.append(WebCore::decodeURLEscapeSequences(String::fromUTF8(files[i])));
</ins><span class="cx"> g_ptr_array_add(selectedFiles.get(), g_strdup(files[i]));
</span><span class="cx"> }
</span><del>- g_ptr_array_add(selectedFiles.get(), 0);
</del><ins>+ g_ptr_array_add(selectedFiles.get(), nullptr);
</ins><span class="cx">
</span><span class="cx"> // Select the files in WebCore and update local private attributes.
</span><del>- request->priv->listener->chooseFiles(API::Array::create(WTFMove(chosenFiles)).ptr());
</del><ins>+ request->priv->listener->chooseFiles(chosenFiles);
</ins><span class="cx"> request->priv->selectedFiles = selectedFiles;
</span><span class="cx"> request->priv->handledRequest = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h (199576 => 199577)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,6 +23,6 @@
</span><span class="cx"> #include "WebKitFileChooserRequest.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx">
</span><del>-WebKitFileChooserRequest* webkitFileChooserRequestCreate(WebKit::WebOpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
</del><ins>+WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
</ins><span class="cx">
</span><span class="cx"> #endif // WebKitFileChooserRequestPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (199576 => 199577)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> completionHandler(defaultQuota);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool runOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
</del><ins>+ bool runOpenPanel(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
</ins><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitFileChooserRequest> request = adoptGRef(webkitFileChooserRequestCreate(parameters, listener));
</span><span class="cx"> webkitWebViewRunFileChooserRequest(m_webView, request.get());
</span></span></pre>
</div>
</div>
</body>
</html>