<!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>[162920] 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/162920">162920</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-27 23:52:01 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
https://bugs.webkit.org/show_bug.cgi?id=127614
Reviewed by Gustavo Noronha Silva.
Source/WebCore:
Add API to set the page identifier that initiated the request to
ResourceRequest, and remove the initiatingPageID() method from the
NetworkingContext class.
* platform/network/NetworkingContext.h:
* platform/network/ResourceHandle.h:
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::createSoupRequestAndMessageForHandle):
* platform/network/soup/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
(WebCore::ResourceRequest::initiatingPageID):
(WebCore::ResourceRequest::setInitiatingPageID):
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupRequest):
(WebCore::ResourceRequest::updateFromSoupRequest):
Source/WebKit/efl:
Remove initiatingPageID() method form the FrameNetworkingContext.
* WebCoreSupport/FrameNetworkingContextEfl.cpp:
* WebCoreSupport/FrameNetworkingContextEfl.h:
Source/WebKit/gtk:
Remove initiatingPageID() method from FrameNetworkingContext.
* WebCoreSupport/FrameNetworkingContextGtk.cpp:
* WebCoreSupport/FrameNetworkingContextGtk.h:
Source/WebKit2:
* NetworkProcess/RemoteNetworkingContext.h: Remove
initiatingPageID() method.
* NetworkProcess/soup/RemoteNetworkingContextSoup.cpp: Ditto.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
(WebKit::CustomProtocolManagerImpl::send): Create the request with
the ResourceRequest constructor that receives a SoupRequest.
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData): Encode initiatingPageID.
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData): Decode initiatingPageID.
* UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
(webkitURISchemeRequestCreate): Remove initiatingPageID parameter
and get it from the given ResourceRequest.
* UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextStartLoadingCustomProtocol): Update to
webkitURISchemeRequestCreate API change.
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(willSendRequestForFrame): Set the initiatingPageID to the ResourceRequest.
* WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
(WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
Remove initiatingPageID() method.
* WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h:
* WebProcess/soup/WebSoupRequestManager.cpp:
(WebKit::WebSoupRequestManager::send): Get the initiatingPageID
from the SoupRequest using the ResourceRequest API.
Tools:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: Bring
back the custom URI scheme WebView check.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkingContexth">trunk/Source/WebCore/platform/network/NetworkingContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequesth">trunk/Source/WebCore/platform/network/soup/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportFrameNetworkingContextEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportFrameNetworkingContextEflh">trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameNetworkingContextGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameNetworkingContextGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth">trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupRemoteNetworkingContextSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp">trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContextcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContexth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebSoupRequestManagercpp">trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.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 (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebCore/ChangeLog 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127614
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add API to set the page identifier that initiated the request to
+ ResourceRequest, and remove the initiatingPageID() method from the
+ NetworkingContext class.
+
+ * platform/network/NetworkingContext.h:
+ * platform/network/ResourceHandle.h:
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::createSoupRequestAndMessageForHandle):
+ * platform/network/soup/ResourceRequest.h:
+ (WebCore::ResourceRequest::ResourceRequest):
+ (WebCore::ResourceRequest::initiatingPageID):
+ (WebCore::ResourceRequest::setInitiatingPageID):
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupRequest):
+ (WebCore::ResourceRequest::updateFromSoupRequest):
+
</ins><span class="cx"> 2014-01-27 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Lots of varied and random crashes on the scrolling thread (ScrollbarPainters are going away)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkingContext.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkingContext.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebCore/platform/network/NetworkingContext.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -67,10 +67,6 @@
</span><span class="cx"> virtual ResourceError blockedError(const ResourceRequest&) const = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(SOUP)
- virtual uint64_t initiatingPageID() const = 0;
-#endif
-
</del><span class="cx"> protected:
</span><span class="cx"> NetworkingContext() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -182,7 +182,6 @@
</span><span class="cx"> void ensureReadBuffer();
</span><span class="cx"> size_t currentStreamPosition() const;
</span><span class="cx"> void didStartRequest();
</span><del>- static uint64_t getSoupRequestInitiatingPageID(SoupRequest*);
</del><span class="cx"> static void setHostAllowsAnyHTTPSCertificate(const String&);
</span><span class="cx"> static void setClientCertificate(const String& host, GTlsCertificate*);
</span><span class="cx"> static void setIgnoreSSLErrors(bool);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -917,18 +917,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static const char* gSoupRequestInitiatingPageIDKey = "wk-soup-request-initiating-page-id";
-
-static void setSoupRequestInitiatingPageIDFromNetworkingContext(SoupRequest* request, NetworkingContext* context)
-{
- if (!context || !context->isValid())
- return;
-
- uint64_t* initiatingPageIDPtr = static_cast<uint64_t*>(fastMalloc(sizeof(uint64_t)));
- *initiatingPageIDPtr = context->initiatingPageID();
- g_object_set_data_full(G_OBJECT(request), g_intern_static_string(gSoupRequestInitiatingPageIDKey), initiatingPageIDPtr, fastFree);
-}
-
</del><span class="cx"> static bool createSoupMessageForHandleAndRequest(ResourceHandle* handle, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(handle);
</span><span class="lines">@@ -1009,7 +997,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setSoupRequestInitiatingPageIDFromNetworkingContext(d->m_soupRequest.get(), d->m_context.get());
</del><ins>+ request.updateSoupRequest(d->m_soupRequest.get());
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1392,10 +1380,4 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t ResourceHandle::getSoupRequestInitiatingPageID(SoupRequest* request)
-{
- uint64_t* initiatingPageIDPtr = static_cast<uint64_t*>(g_object_get_data(G_OBJECT(request), gSoupRequestInitiatingPageIDKey));
- return initiatingPageIDPtr ? *initiatingPageIDPtr : 0;
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequest.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #define ResourceRequest_h
</span><span class="cx">
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><ins>+#include "SoupURIUtils.h"
</ins><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,6 +39,7 @@
</span><span class="cx"> : ResourceRequestBase(URL(ParsedURLString, url), UseProtocolCachePolicy)
</span><span class="cx"> , m_acceptEncoding(true)
</span><span class="cx"> , m_soupFlags(static_cast<SoupMessageFlags>(0))
</span><ins>+ , m_initiatingPageID(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -45,6 +47,7 @@
</span><span class="cx"> : ResourceRequestBase(url, UseProtocolCachePolicy)
</span><span class="cx"> , m_acceptEncoding(true)
</span><span class="cx"> , m_soupFlags(static_cast<SoupMessageFlags>(0))
</span><ins>+ , m_initiatingPageID(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,6 +55,7 @@
</span><span class="cx"> : ResourceRequestBase(url, policy)
</span><span class="cx"> , m_acceptEncoding(true)
</span><span class="cx"> , m_soupFlags(static_cast<SoupMessageFlags>(0))
</span><ins>+ , m_initiatingPageID(0)
</ins><span class="cx"> {
</span><span class="cx"> setHTTPReferrer(referrer);
</span><span class="cx"> }
</span><span class="lines">@@ -60,6 +64,7 @@
</span><span class="cx"> : ResourceRequestBase(URL(), UseProtocolCachePolicy)
</span><span class="cx"> , m_acceptEncoding(true)
</span><span class="cx"> , m_soupFlags(static_cast<SoupMessageFlags>(0))
</span><ins>+ , m_initiatingPageID(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,10 +72,20 @@
</span><span class="cx"> : ResourceRequestBase(URL(), UseProtocolCachePolicy)
</span><span class="cx"> , m_acceptEncoding(true)
</span><span class="cx"> , m_soupFlags(static_cast<SoupMessageFlags>(0))
</span><ins>+ , m_initiatingPageID(0)
</ins><span class="cx"> {
</span><span class="cx"> updateFromSoupMessage(soupMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ResourceRequest(SoupRequest* soupRequest)
+ : ResourceRequestBase(soupURIToKURL(soup_request_get_uri(soupRequest)), UseProtocolCachePolicy)
+ , m_acceptEncoding(true)
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
+ , m_initiatingPageID(0)
+ {
+ updateFromSoupRequest(soupRequest);
+ }
+
</ins><span class="cx"> void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest& delegateProvidedRequest) { *this = delegateProvidedRequest; }
</span><span class="cx">
</span><span class="cx"> bool acceptEncoding() const { return m_acceptEncoding; }
</span><span class="lines">@@ -81,10 +96,15 @@
</span><span class="cx"> void updateSoupMessage(SoupMessage*) const;
</span><span class="cx"> SoupMessage* toSoupMessage() const;
</span><span class="cx"> void updateFromSoupMessage(SoupMessage*);
</span><ins>+ void updateSoupRequest(SoupRequest*) const;
+ void updateFromSoupRequest(SoupRequest*);
</ins><span class="cx">
</span><span class="cx"> SoupMessageFlags soupMessageFlags() const { return m_soupFlags; }
</span><span class="cx"> void setSoupMessageFlags(SoupMessageFlags soupFlags) { m_soupFlags = soupFlags; }
</span><span class="cx">
</span><ins>+ uint64_t initiatingPageID() const { return m_initiatingPageID; }
+ void setInitiatingPageID(uint64_t pageID) { m_initiatingPageID = pageID; }
+
</ins><span class="cx"> SoupURI* soupURI() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -92,6 +112,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_acceptEncoding : 1;
</span><span class="cx"> SoupMessageFlags m_soupFlags;
</span><ins>+ uint64_t m_initiatingPageID;
</ins><span class="cx">
</span><span class="cx"> void updateSoupMessageMembers(SoupMessage*) const;
</span><span class="cx"> void doUpdatePlatformRequest() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -117,6 +117,24 @@
</span><span class="cx"> // doUpdatePlatformRequest somehow.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const char* gSoupRequestInitiatingPageIDKey = "wk-soup-request-initiating-page-id";
+
+void ResourceRequest::updateSoupRequest(SoupRequest* soupRequest) const
+{
+ if (!m_initiatingPageID)
+ return;
+
+ uint64_t* initiatingPageIDPtr = static_cast<uint64_t*>(fastMalloc(sizeof(uint64_t)));
+ *initiatingPageIDPtr = m_initiatingPageID;
+ g_object_set_data_full(G_OBJECT(soupRequest), g_intern_static_string(gSoupRequestInitiatingPageIDKey), initiatingPageIDPtr, fastFree);
+}
+
+void ResourceRequest::updateFromSoupRequest(SoupRequest* soupRequest)
+{
+ uint64_t* initiatingPageIDPtr = static_cast<uint64_t*>(g_object_get_data(G_OBJECT(soupRequest), gSoupRequestInitiatingPageIDKey));
+ m_initiatingPageID = initiatingPageIDPtr ? *initiatingPageIDPtr : 0;
+}
+
</ins><span class="cx"> unsigned initializeMaximumHTTPConnectionCountPerHost()
</span><span class="cx"> {
</span><span class="cx"> // Soup has its own queue control; it wants to have all requests
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127614
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Remove initiatingPageID() method form the FrameNetworkingContext.
+
+ * WebCoreSupport/FrameNetworkingContextEfl.cpp:
+ * WebCoreSupport/FrameNetworkingContextEfl.h:
+
</ins><span class="cx"> 2014-01-27 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK1] Remove ewk_history_item_time_last_visited_get and ewk_history_item_visit_count
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportFrameNetworkingContextEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -58,10 +58,4 @@
</span><span class="cx"> return NetworkStorageSession::defaultStorageSession();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t FrameNetworkingContextEfl::initiatingPageID() const
-{
- notImplemented();
- return 0;
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportFrameNetworkingContextEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> static PassRefPtr<FrameNetworkingContextEfl> create(Frame*, Evas_Object*);
</span><span class="cx">
</span><span class="cx"> WebCore::Frame* coreFrame() const { return frame(); }
</span><del>- virtual uint64_t initiatingPageID() const;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const;
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127614
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Remove initiatingPageID() method from FrameNetworkingContext.
+
+ * WebCoreSupport/FrameNetworkingContextGtk.cpp:
+ * WebCoreSupport/FrameNetworkingContextGtk.h:
+
+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed. Fix GTK+ build after r162808.
</span><span class="cx">
</span><span class="cx"> * webkit/webkitwebhistoryitem.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameNetworkingContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -33,10 +33,4 @@
</span><span class="cx"> return NetworkStorageSession::defaultStorageSession();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t FrameNetworkingContextGtk::initiatingPageID() const
-{
- notImplemented();
- return 0;
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameNetworkingContextGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::Frame* coreFrame() const { return frame(); }
</span><del>- virtual uint64_t initiatingPageID() const;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127614
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * NetworkProcess/RemoteNetworkingContext.h: Remove
+ initiatingPageID() method.
+ * NetworkProcess/soup/RemoteNetworkingContextSoup.cpp: Ditto.
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ (WebKit::CustomProtocolManagerImpl::send): Create the request with
+ the ResourceRequest constructor that receives a SoupRequest.
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData): Encode initiatingPageID.
+ (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData): Decode initiatingPageID.
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ (webkitURISchemeRequestCreate): Remove initiatingPageID parameter
+ and get it from the given ResourceRequest.
+ * UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextStartLoadingCustomProtocol): Update to
+ webkitURISchemeRequestCreate API change.
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (willSendRequestForFrame): Set the initiatingPageID to the ResourceRequest.
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
+ (WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
+ Remove initiatingPageID() method.
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h:
+ * WebProcess/soup/WebSoupRequestManager.cpp:
+ (WebKit::WebSoupRequestManager::send): Get the initiatingPageID
+ from the SoupRequest using the ResourceRequest API.
+
</ins><span class="cx"> 2014-01-27 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGLLoadPolicy::WebGLAsk is an unnecessary value.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -66,10 +66,6 @@
</span><span class="cx"> virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(SOUP)
- virtual uint64_t initiatingPageID() const;
-#endif
-
</del><span class="cx"> uint64_t m_sessionID;
</span><span class="cx"> bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupRemoteNetworkingContextSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -46,12 +46,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t RemoteNetworkingContext::initiatingPageID() const
-{
- notImplemented();
- return 0;
-}
-
</del><span class="cx"> void RemoteNetworkingContext::ensurePrivateBrowsingSession(uint64_t sessionID)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><del>-#include <WebCore/SoupURIUtils.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -193,7 +192,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(WebCore::soupURIToKURL(soup_request_get_uri(SOUP_REQUEST(request))));
</del><ins>+ WebCore::ResourceRequest resourceRequest(SOUP_REQUEST(request));
</ins><span class="cx"> m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, resourceRequest), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint32_t>(resourceRequest.soupMessageFlags());
</span><ins>+ encoder << resourceRequest.initiatingPageID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
</span><span class="lines">@@ -50,6 +51,12 @@
</span><span class="cx"> if (!decoder.decode(soupMessageFlags))
</span><span class="cx"> return false;
</span><span class="cx"> resourceRequest.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
</span><ins>+
+ uint64_t initiatingPageID;
+ if (!decoder.decode(initiatingPageID))
+ return false;
+ resourceRequest.setInitiatingPageID(initiatingPageID);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -74,13 +74,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitWebContext* webContext, API::URLRequest* urlRequest, WebPageProxy* initiatingPage)
</del><ins>+WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitWebContext* webContext, API::URLRequest* urlRequest)
</ins><span class="cx"> {
</span><span class="cx"> WebKitURISchemeRequest* request = WEBKIT_URI_SCHEME_REQUEST(g_object_new(WEBKIT_TYPE_URI_SCHEME_REQUEST, NULL));
</span><span class="cx"> request->priv->webContext = webContext;
</span><span class="cx"> request->priv->webRequestManager = webkitWebContextGetRequestManager(webContext);
</span><span class="cx"> request->priv->uri = urlRequest->resourceRequest().url().string().utf8();
</span><del>- request->priv->initiatingPage = initiatingPage;
</del><ins>+ request->priv->initiatingPage = WebProcessProxy::webPage(urlRequest->resourceRequest().initiatingPageID());
</ins><span class="cx"> request->priv->requestID = requestID;
</span><span class="cx"> return request;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "WebKitURISchemeRequest.h"
</span><span class="cx"> #include "WebKitWebContext.h"
</span><span class="cx">
</span><del>-WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitWebContext*, API::URLRequest*, WebKit::WebPageProxy*);
</del><ins>+WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitWebContext*, API::URLRequest*);
</ins><span class="cx"> void webkitURISchemeRequestCancel(WebKitURISchemeRequest*);
</span><span class="cx">
</span><span class="cx"> #endif // WebKitURISchemeRequestPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -940,8 +940,7 @@
</span><span class="cx">
</span><span class="cx"> void webkitWebContextStartLoadingCustomProtocol(WebKitWebContext* context, uint64_t customProtocolID, API::URLRequest* urlRequest)
</span><span class="cx"> {
</span><del>- // FIXME: We need to figure out how to get the initiating page.
- GRefPtr<WebKitURISchemeRequest> request = adoptGRef(webkitURISchemeRequestCreate(customProtocolID, context, urlRequest, nullptr));
</del><ins>+ GRefPtr<WebKitURISchemeRequest> request = adoptGRef(webkitURISchemeRequestCreate(customProtocolID, context, urlRequest));
</ins><span class="cx"> String scheme(String::fromUTF8(webkit_uri_scheme_request_get_scheme(request.get())));
</span><span class="cx"> RefPtr<WebKitURISchemeHandler> handler = context->priv->uriSchemeHandlers.get(scheme);
</span><span class="cx"> ASSERT(handler.get());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -172,6 +172,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest resourceRequest;
</span><span class="cx"> webkitURIRequestGetResourceRequest(request.get(), resourceRequest);
</span><ins>+ resourceRequest.setInitiatingPageID(toImpl(page)->pageID());
</ins><span class="cx"> RefPtr<API::URLRequest> newRequest = API::URLRequest::create(resourceRequest);
</span><span class="cx">
</span><span class="cx"> ImmutableDictionary::MapType message;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -49,10 +49,7 @@
</span><span class="cx">
</span><span class="cx"> WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
</span><span class="cx"> : FrameNetworkingContext(frame->coreFrame())
</span><del>- , m_initiatingPageID(0)
</del><span class="cx"> {
</span><del>- if (WebPage* page = frame->page())
- m_initiatingPageID = page->pageID();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
</span><span class="lines">@@ -63,11 +60,6 @@
</span><span class="cx"> return NetworkStorageSession::defaultStorageSession();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t WebFrameNetworkingContext::initiatingPageID() const
-{
- return m_initiatingPageID;
-}
-
</del><span class="cx"> WebFrameLoaderClient* WebFrameNetworkingContext::webFrameLoaderClient() const
</span><span class="cx"> {
</span><span class="cx"> if (!frame())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -50,9 +50,6 @@
</span><span class="cx"> WebFrameNetworkingContext(WebFrame*);
</span><span class="cx">
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const;
</span><del>- virtual uint64_t initiatingPageID() const;
-
- uint64_t m_initiatingPageID;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebSoupRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> uint64_t requestID = generateSoupRequestID();
</span><span class="cx"> m_requestMap.set(requestID, adoptPtr(new WebSoupRequestAsyncData(task, request)));
</span><span class="cx">
</span><del>- uint64_t initiatingPageID = WebCore::ResourceHandle::getSoupRequestInitiatingPageID(soupRequest);
</del><ins>+ uint64_t initiatingPageID = WebCore::ResourceRequest(soupRequest).initiatingPageID();
</ins><span class="cx"> m_process->parentProcessConnection()->send(Messages::WebPageProxy::DidReceiveURIRequest(String::fromUTF8(uriString.get()), requestID), initiatingPageID);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Tools/ChangeLog 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127614
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: Bring
+ back the custom URI scheme WebView check.
+
</ins><span class="cx"> 2014-01-27 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert yet one more tiny part of r162629 that didn't get reverted in r162883
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (162919 => 162920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-01-28 07:43:02 UTC (rev 162919)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-01-28 07:52:01 UTC (rev 162920)
</span><span class="lines">@@ -146,8 +146,7 @@
</span><span class="cx"> test->m_uriSchemeRequest = request;
</span><span class="cx"> test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(request));
</span><span class="cx">
</span><del>- // FIXME: webkit_uri_scheme_request_get_web_view doesn't work with custom protocols.
- // g_assert(webkit_uri_scheme_request_get_web_view(request) == test->m_webView);
</del><ins>+ g_assert(webkit_uri_scheme_request_get_web_view(request) == test->m_webView);
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GInputStream> inputStream = adoptGRef(g_memory_input_stream_new());
</span><span class="cx"> test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(inputStream.get()));
</span></span></pre>
</div>
</div>
</body>
</html>