<!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>[185553] trunk</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/185553">185553</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-15 09:36:24 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Custom URI schemes don't work for requests containing a fragment identifier
https://bugs.webkit.org/show_bug.cgi?id=145969
Reviewed by Sergio Villar Senin.
Source/WebCore:
For URIs like foo:bar#baz, what the custom protocol manager
receives in the UI process is foo:bar, so the user can't handle fragments.
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupRequest): If the SoupRequest
is a WebKitSoupRequestGeneric, call
webkitSoupRequestGenericSetRequest with the ResourceRequest.
* platform/network/soup/WebKitSoupRequestGeneric.cpp:
(webkitSoupRequestGenericSetRequest):
(webkitSoupRequestGenericGetRequest):
* platform/network/soup/WebKitSoupRequestGeneric.h:
Source/WebKit2:
Use the WebKitSoupRequestGeneric request instead of creating a new one
from the SoupRequest URI, since that is the network one and doesn't
contain the fragment identifier part.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
(WebKit::CustomProtocolManagerImpl::start):
Tools:
Add a test case to the custom URI schemes unit test.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextURIScheme):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenericcpp">trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenerich">trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Source/WebCore/ChangeLog 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
+ https://bugs.webkit.org/show_bug.cgi?id=145969
+
+ Reviewed by Sergio Villar Senin.
+
+ For URIs like foo:bar#baz, what the custom protocol manager
+ receives in the UI process is foo:bar, so the user can't handle fragments.
+
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupRequest): If the SoupRequest
+ is a WebKitSoupRequestGeneric, call
+ webkitSoupRequestGenericSetRequest with the ResourceRequest.
+ * platform/network/soup/WebKitSoupRequestGeneric.cpp:
+ (webkitSoupRequestGenericSetRequest):
+ (webkitSoupRequestGenericGetRequest):
+ * platform/network/soup/WebKitSoupRequestGeneric.h:
+
+2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [SOUP] Move WebKitSoupRequestGeneric to platform layer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145968
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><ins>+#include "WebKitSoupRequestGeneric.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -128,6 +129,9 @@
</span><span class="cx"> uint64_t* initiatingPageIDPtr = static_cast<uint64_t*>(fastMalloc(sizeof(uint64_t)));
</span><span class="cx"> *initiatingPageIDPtr = m_initiatingPageID;
</span><span class="cx"> g_object_set_data_full(G_OBJECT(soupRequest), g_intern_static_string(gSoupRequestInitiatingPageIDKey), initiatingPageIDPtr, fastFree);
</span><ins>+
+ if (WEBKIT_IS_SOUP_REQUEST_GENERIC(soupRequest))
+ webkitSoupRequestGenericSetRequest(WEBKIT_SOUP_REQUEST_GENERIC(soupRequest), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::updateFromSoupRequest(SoupRequest* soupRequest)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitSoupRequestGeneric.h"
</span><span class="cx">
</span><ins>+#include "ResourceRequest.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -29,6 +30,7 @@
</span><span class="cx"> struct _WebKitSoupRequestGenericPrivate {
</span><span class="cx"> CString mimeType;
</span><span class="cx"> goffset contentLength;
</span><ins>+ ResourceRequest resourceRequest;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void webkitSoupRequestGenericFinalize(GObject* object)
</span><span class="lines">@@ -92,3 +94,13 @@
</span><span class="cx"> {
</span><span class="cx"> request->priv->mimeType = mimeType;
</span><span class="cx"> }
</span><ins>+
+void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric* request, const ResourceRequest& resourceRequest)
+{
+ request->priv->resourceRequest = resourceRequest;
+}
+
+const ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
+{
+ return request->priv->resourceRequest;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenerich"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx">
</span><span class="cx"> G_BEGIN_DECLS
</span><span class="cx">
</span><ins>+namespace WebCore {
+class ResourceRequest;
+}
+
</ins><span class="cx"> #define WEBKIT_TYPE_SOUP_REQUEST_GENERIC (webkit_soup_request_generic_get_type())
</span><span class="cx"> #define WEBKIT_SOUP_REQUEST_GENERIC(object) (G_TYPE_CHECK_INSTANCE_CAST((object), WEBKIT_TYPE_SOUP_REQUEST_GENERIC, WebKitSoupRequestGeneric))
</span><span class="cx"> #define WEBKIT_IS_SOUP_REQUEST_GENERIC(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), WEBKIT_TYPE_SOUP_REQUEST_GENERIC))
</span><span class="lines">@@ -53,6 +57,8 @@
</span><span class="cx">
</span><span class="cx"> void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric*, goffset contentLength);
</span><span class="cx"> void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric*, const char* mimeType);
</span><ins>+void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric*, const WebCore::ResourceRequest&);
+const WebCore::ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric*);
</ins><span class="cx">
</span><span class="cx"> G_END_DECLS
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
+ https://bugs.webkit.org/show_bug.cgi?id=145969
+
+ Reviewed by Sergio Villar Senin.
+
+ Use the WebKitSoupRequestGeneric request instead of creating a new one
+ from the SoupRequest URI, since that is the network one and doesn't
+ contain the fragment identifier part.
+
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ (WebKit::CustomProtocolManagerImpl::start):
+
</ins><span class="cx"> 2015-06-15 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Make send/receive messages to communicate the Web and UI Processes using Injected Bundle.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -190,8 +190,7 @@
</span><span class="cx"> WebKitSoupRequestGeneric* request = WEBKIT_SOUP_REQUEST_GENERIC(g_task_get_source_object(task));
</span><span class="cx"> m_customProtocolMap.set(customProtocolID, std::make_unique<WebSoupRequestAsyncData>(task, request));
</span><span class="cx">
</span><del>- WebCore::ResourceRequest resourceRequest(SOUP_REQUEST(request));
- m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, resourceRequest), 0);
</del><ins>+ m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, webkitSoupRequestGenericGetRequest(request)), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GInputStream* CustomProtocolManagerImpl::finish(GTask* task, GError** error)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Tools/ChangeLog 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
+ https://bugs.webkit.org/show_bug.cgi?id=145969
+
+ Reviewed by Sergio Villar Senin.
+
+ Add a test case to the custom URI schemes unit test.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ (testWebContextURIScheme):
+
</ins><span class="cx"> 2015-06-15 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix deprecated-register warning in the generated WebKitMarshal.cpp
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (185552 => 185553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-06-15 15:43:43 UTC (rev 185552)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-06-15 16:36:24 UTC (rev 185553)
</span><span class="lines">@@ -214,6 +214,16 @@
</span><span class="cx"> g_assert_cmpint(mainResourceDataSize, ==, strlen(echoHTML.get()));
</span><span class="cx"> g_assert(!strncmp(mainResourceData, echoHTML.get(), mainResourceDataSize));
</span><span class="cx">
</span><ins>+ test->loadURI("echo:with#fragment");
+ test->waitUntilLoadFinished();
+ g_assert_cmpstr(webkit_uri_scheme_request_get_path(test->m_uriSchemeRequest.get()), ==, "with");
+ g_assert_cmpstr(webkit_uri_scheme_request_get_uri(test->m_uriSchemeRequest.get()), ==, "echo:with#fragment");
+ echoHTML.reset(g_strdup_printf(kEchoHTMLFormat, webkit_uri_scheme_request_get_path(test->m_uriSchemeRequest.get())));
+ mainResourceDataSize = 0;
+ mainResourceData = test->mainResourceData(mainResourceDataSize);
+ g_assert_cmpint(mainResourceDataSize, ==, strlen(echoHTML.get()));
+ g_assert(!strncmp(mainResourceData, echoHTML.get(), mainResourceDataSize));
+
</ins><span class="cx"> test->registerURISchemeHandler("nomime", kBarHTML, -1, 0);
</span><span class="cx"> test->m_loadEvents.clear();
</span><span class="cx"> test->loadURI("nomime:foo-bar");
</span></span></pre>
</div>
</div>
</body>
</html>