<!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>[162835] 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/162835">162835</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-27 05:14:49 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Implement custom URI schemes with CustomProtocols
https://bugs.webkit.org/show_bug.cgi?id=127091
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
The old classes are no longer built for GTK+ and should be removed once
other ports using soup backend switch to custom protocols implementation.
* GNUmakefile.am: Remove include path.
* GNUmakefile.list.am: Remove files from compilation.
* PlatformGTK.cmake: Ditto.
* UIProcess/API/gtk/WebKitPrivate.h:
* UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
(startLoading):
(stopLoading):
(attachRequestManagerClientToContext):
* UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
(webkitURISchemeRequestCreate):
(webkit_uri_scheme_request_get_web_view):
(webkitURISchemeRequestReadCallback):
(webkit_uri_scheme_request_finish):
(webkit_uri_scheme_request_finish_error):
* UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
* UIProcess/API/gtk/WebKitWebContext.cpp:
(createDefaultWebContext):
(webkit_web_context_register_uri_scheme):
(webkitWebContextGetRequestManager):
(webkitWebContextStartLoadingCustomProtocol):
(webkitWebContextStopLoadingCustomProtocol):
(webkitWebContextDidFinishLoadingCustomProtocol):
* UIProcess/API/gtk/WebKitWebContextPrivate.h:
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformInitializeWebProcess):
* WebKit2Prefix.h: Enable CustomProtocols unconditionally for the
GTK+ port.
Tools:
Temporarily disable the WebKitWebView check until we figure out
how to implement it with CustomProtocols.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefileam">trunk/Source/WebKit2/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefilelistam">trunk/Source/WebKit2/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitRequestManagerClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.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="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2Prefixh">trunk/Source/WebKit2/WebKit2Prefix.h</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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Implement custom URI schemes with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127091
+
+ Reviewed by Gustavo Noronha Silva.
+
+ The old classes are no longer built for GTK+ and should be removed once
+ other ports using soup backend switch to custom protocols implementation.
+
+ * GNUmakefile.am: Remove include path.
+ * GNUmakefile.list.am: Remove files from compilation.
+ * PlatformGTK.cmake: Ditto.
+ * UIProcess/API/gtk/WebKitPrivate.h:
+ * UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
+ (startLoading):
+ (stopLoading):
+ (attachRequestManagerClientToContext):
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ (webkitURISchemeRequestCreate):
+ (webkit_uri_scheme_request_get_web_view):
+ (webkitURISchemeRequestReadCallback):
+ (webkit_uri_scheme_request_finish):
+ (webkit_uri_scheme_request_finish_error):
+ * UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (createDefaultWebContext):
+ (webkit_web_context_register_uri_scheme):
+ (webkitWebContextGetRequestManager):
+ (webkitWebContextStartLoadingCustomProtocol):
+ (webkitWebContextStopLoadingCustomProtocol):
+ (webkitWebContextDidFinishLoadingCustomProtocol):
+ * UIProcess/API/gtk/WebKitWebContextPrivate.h:
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * WebKit2Prefix.h: Enable CustomProtocols unconditionally for the
+ GTK+ port.
+
+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [SOUP] WebProcess sometimes crashes when a download is cancelled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127650
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.am (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.am 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -428,7 +428,6 @@
</span><span class="cx"> $(WebKit2)/UIProcess/Plugins \
</span><span class="cx"> $(WebKit2)/UIProcess/ResourceCache \
</span><span class="cx"> $(WebKit2)/UIProcess/Storage \
</span><del>- $(WebKit2)/UIProcess/soup \
</del><span class="cx"> $(WebKit2)/WebProcess \
</span><span class="cx"> $(WebKit2)/WebProcess/ApplicationCache \
</span><span class="cx"> $(WebKit2)/WebProcess/Battery \
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.list.am (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -160,10 +160,6 @@
</span><span class="cx"> DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
</span><span class="cx"> DerivedSources/WebKit2/WebResourceLoaderMessageReceiver.cpp \
</span><span class="cx"> DerivedSources/WebKit2/WebResourceLoaderMessages.h \
</span><del>- DerivedSources/WebKit2/WebSoupRequestManagerMessageReceiver.cpp \
- DerivedSources/WebKit2/WebSoupRequestManagerMessages.h \
- DerivedSources/WebKit2/WebSoupRequestManagerProxyMessageReceiver.cpp \
- DerivedSources/WebKit2/WebSoupRequestManagerProxyMessages.h \
</del><span class="cx"> DerivedSources/WebKit2/WebVibrationProxyMessageReceiver.cpp \
</span><span class="cx"> DerivedSources/WebKit2/WebVibrationProxyMessages.h
</span><span class="cx">
</span><span class="lines">@@ -521,10 +517,6 @@
</span><span class="cx"> Source/WebKit2/UIProcess/API/C/gtk/WKView.h \
</span><span class="cx"> Source/WebKit2/UIProcess/API/C/gtk/WKViewPrivate.h \
</span><span class="cx"> Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h \
</span><del>- Source/WebKit2/UIProcess/API/C/soup/WKContextSoup.cpp \
- Source/WebKit2/UIProcess/API/C/soup/WKContextSoup.h \
- Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.cpp \
- Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.h \
</del><span class="cx"> Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h \
</span><span class="cx"> Source/WebKit2/UIProcess/API/C/WebKit2_C.h \
</span><span class="lines">@@ -886,10 +878,6 @@
</span><span class="cx"> Source/WebKit2/UIProcess/Storage/StorageManager.h \
</span><span class="cx"> Source/WebKit2/UIProcess/soup/WebContextSoup.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/soup/WebCookieManagerProxySoup.cpp \
</span><del>- Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.cpp \
- Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h \
- Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp \
- Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h \
</del><span class="cx"> Source/WebKit2/UIProcess/TextChecker.h \
</span><span class="cx"> Source/WebKit2/UIProcess/TextCheckerCompletion.h \
</span><span class="cx"> Source/WebKit2/UIProcess/TextCheckerCompletion.cpp \
</span><span class="lines">@@ -1184,8 +1172,6 @@
</span><span class="cx"> Source/WebKit2/WebProcess/Storage/StorageAreaMap.h \
</span><span class="cx"> Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp \
</span><span class="cx"> Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h \
</span><del>- Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp \
- Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h \
</del><span class="cx"> Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp \
</span><span class="cx"> Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp \
</span><span class="cx"> Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h \
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -82,9 +82,7 @@
</span><span class="cx"> UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
</span><span class="cx"> UIProcess/API/C/gtk/WKView.cpp
</span><span class="cx">
</span><del>- UIProcess/API/C/soup/WKContextSoup.cpp
</del><span class="cx"> UIProcess/API/C/soup/WKCookieManagerSoup.cpp
</span><del>- UIProcess/API/C/soup/WKSoupRequestManager.cpp
</del><span class="cx"> UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/API/gtk/PageClientImpl.cpp
</span><span class="lines">@@ -269,8 +267,6 @@
</span><span class="cx"> UIProcess/Network/soup/NetworkProcessProxySoup.cpp
</span><span class="cx"> UIProcess/soup/WebContextSoup.cpp
</span><span class="cx"> UIProcess/soup/WebCookieManagerProxySoup.cpp
</span><del>- UIProcess/soup/WebSoupRequestManagerClient.cpp
- UIProcess/soup/WebSoupRequestManagerProxy.cpp
</del><span class="cx">
</span><span class="cx"> WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
</span><span class="cx"> WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
</span><span class="lines">@@ -311,7 +307,6 @@
</span><span class="cx"> WebProcess/soup/WebKitSoupRequestGeneric.cpp
</span><span class="cx"> WebProcess/soup/WebKitSoupRequestInputStream.cpp
</span><span class="cx"> WebProcess/soup/WebProcessSoup.cpp
</span><del>- WebProcess/soup/WebSoupRequestManager.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2GTK_INSTALLED_HEADERS
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebKitPrivate_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKAPICast.h>
</span><del>-#include <WebKit2/WKContextSoup.h>
</del><span class="cx"> #include <WebKit2/WKDownload.h>
</span><span class="cx"> #include <WebKit2/WKFindOptions.h>
</span><span class="cx"> #include <WebKit2/WKFullScreenClientGtk.h>
</span><span class="lines">@@ -39,7 +38,7 @@
</span><span class="cx"> #include <WebKit2/WKInspectorClientGtk.h>
</span><span class="cx"> #include <WebKit2/WKRetainPtr.h>
</span><span class="cx"> #include <WebKit2/WKSerializedScriptValue.h>
</span><del>-#include <WebKit2/WKSoupRequestManager.h>
</del><ins>+#include <WebKit2/WKSoupCustomProtocolRequestManager.h>
</ins><span class="cx"> #include <WebKit2/WKString.h>
</span><span class="cx"> #include <WebKit2/WKTextChecker.h>
</span><span class="cx"> #include <WebKit2/WebKit2_C.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitRequestManagerClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -20,34 +20,30 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitRequestManagerClient.h"
</span><span class="cx">
</span><del>-#include "WebKitURISchemeRequestPrivate.h"
</del><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-static void didReceiveURIRequest(WKSoupRequestManagerRef soupRequestManagerRef, WKURLRef urlRef, WKPageRef initiatingPageRef, uint64_t requestID, const void* clientInfo)
</del><ins>+static void startLoading(WKSoupCustomProtocolRequestManagerRef soupRequestManagerRef, uint64_t customProtocolID, WKURLRequestRef requestRef, const void* clientInfo)
</ins><span class="cx"> {
</span><del>- WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(clientInfo);
- GRefPtr<WebKitURISchemeRequest> request = adoptGRef(webkitURISchemeRequestCreate(webContext, toImpl(soupRequestManagerRef), toImpl(urlRef), toImpl(initiatingPageRef), requestID));
- webkitWebContextReceivedURIRequest(webContext, request.get());
</del><ins>+ webkitWebContextStartLoadingCustomProtocol(WEBKIT_WEB_CONTEXT(clientInfo), customProtocolID, toImpl(requestRef));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void didFailToLoadURIRequest(WKSoupRequestManagerRef, uint64_t requestID, const void* clientInfo)
</del><ins>+static void stopLoading(WKSoupCustomProtocolRequestManagerRef, uint64_t customProtocolID, const void* clientInfo)
</ins><span class="cx"> {
</span><del>- webkitWebContextDidFailToLoadURIRequest(WEBKIT_WEB_CONTEXT(clientInfo), requestID);
</del><ins>+ webkitWebContextStopLoadingCustomProtocol(WEBKIT_WEB_CONTEXT(clientInfo), customProtocolID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void attachRequestManagerClientToContext(WebKitWebContext* webContext)
</span><span class="cx"> {
</span><del>- WKSoupRequestManagerClientV0 wkRequestManagerClient = {
</del><ins>+ WKSoupCustomProtocolRequestManagerClientV0 wkRequestManagerClient = {
</ins><span class="cx"> {
</span><span class="cx"> 0, // version
</span><span class="cx"> webContext // clientInfo
</span><span class="cx"> },
</span><del>- didReceiveURIRequest,
- didFailToLoadURIRequest
</del><ins>+ startLoading,
+ stopLoading
</ins><span class="cx"> };
</span><del>- WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), &wkRequestManagerClient.base);
</del><ins>+ WKSoupCustomProtocolRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), &wkRequestManagerClient.base);
</ins><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 (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><span class="cx"> #include "WebKitWebView.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><del>-#include "WebSoupRequestManagerProxy.h"
</del><span class="cx"> #include <WebCore/GUniquePtrSoup.h>
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> struct _WebKitURISchemeRequestPrivate {
</span><span class="cx"> WebKitWebContext* webContext;
</span><del>- RefPtr<WebSoupRequestManagerProxy> webRequestManager;
</del><ins>+ RefPtr<WebSoupCustomProtocolRequestManager> webRequestManager;
</ins><span class="cx"> RefPtr<WebPageProxy> initiatingPage;
</span><span class="cx"> uint64_t requestID;
</span><span class="cx"> CString uri;
</span><span class="lines">@@ -75,22 +74,17 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext* webContext, WebSoupRequestManagerProxy* webRequestManager, API::URL* webURL, WebPageProxy* initiatingPage, uint64_t requestID)
</del><ins>+WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitWebContext* webContext, API::URLRequest* urlRequest, WebPageProxy* initiatingPage)
</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><del>- request->priv->webRequestManager = webRequestManager;
- request->priv->uri = webURL->string().utf8();
</del><ins>+ request->priv->webRequestManager = webkitWebContextGetRequestManager(webContext);
+ request->priv->uri = urlRequest->resourceRequest().url().string().utf8();
</ins><span class="cx"> request->priv->initiatingPage = initiatingPage;
</span><span class="cx"> request->priv->requestID = requestID;
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t webkitURISchemeRequestGetID(WebKitURISchemeRequest* request)
-{
- return request->priv->requestID;
-}
-
</del><span class="cx"> void webkitURISchemeRequestCancel(WebKitURISchemeRequest* request)
</span><span class="cx"> {
</span><span class="cx"> if (request->priv->cancellable.get())
</span><span class="lines">@@ -158,7 +152,8 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_URI_SCHEME_REQUEST(request), 0);
</span><span class="cx">
</span><del>- return WEBKIT_WEB_VIEW(request->priv->initiatingPage->viewWidget());
</del><ins>+ // FIXME: initiatingPage is now always null, we need to re-implement this somehow.
+ return request->priv->initiatingPage ? WEBKIT_WEB_VIEW(request->priv->initiatingPage->viewWidget()) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitURISchemeRequestReadCallback(GInputStream* inputStream, GAsyncResult* result, WebKitURISchemeRequest* schemeRequest)
</span><span class="lines">@@ -174,21 +169,25 @@
</span><span class="cx"> WebKitURISchemeRequestPrivate* priv = request->priv;
</span><span class="cx"> RefPtr<API::Data> webData = API::Data::create(reinterpret_cast<const unsigned char*>(priv->readBuffer), bytesRead);
</span><span class="cx"> if (!priv->bytesRead) {
</span><del>- // First chunk read. In case of empty reply an empty API::Data is sent to the WebProcess.
- priv->webRequestManager->didHandleURIRequest(webData.get(), priv->streamLength, String::fromUTF8(priv->mimeType.data()), priv->requestID);
</del><ins>+ // First chunk read. In case of empty reply an empty API::Data is sent to the networking process.
+ WebCore::ResourceResponse response(WebCore::URL(WebCore::URL(), String::fromUTF8(priv->uri)), String::fromUTF8(priv->mimeType.data()),
+ priv->streamLength, emptyString(), emptyString());
+ priv->webRequestManager->didReceiveResponse(priv->requestID, response);
+ priv->webRequestManager->didLoadData(priv->requestID, webData.get());
</ins><span class="cx"> } else if (bytesRead || (!bytesRead && !priv->streamLength)) {
</span><del>- // Subsequent chunk read. We only send an empty API::Data to the WebProcess when stream length is unknown.
- priv->webRequestManager->didReceiveURIRequestData(webData.get(), priv->requestID);
</del><ins>+ // Subsequent chunk read. We only send an empty API::Data to the networking process when stream length is unknown.
+ priv->webRequestManager->didLoadData(priv->requestID, webData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!bytesRead) {
</span><del>- webkitWebContextDidFinishURIRequest(request->priv->webContext, request->priv->requestID);
</del><ins>+ priv->webRequestManager->didFinishLoading(request->priv->requestID);
+ webkitWebContextDidFinishLoadingCustomProtocol(request->priv->webContext, request->priv->requestID);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> priv->bytesRead += bytesRead;
</span><span class="cx"> g_input_stream_read_async(inputStream, priv->readBuffer, gReadBufferSize, G_PRIORITY_DEFAULT, priv->cancellable.get(),
</span><del>- reinterpret_cast<GAsyncReadyCallback>(webkitURISchemeRequestReadCallback), g_object_ref(request.get()));
</del><ins>+ reinterpret_cast<GAsyncReadyCallback>(webkitURISchemeRequestReadCallback), g_object_ref(request.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -213,7 +212,7 @@
</span><span class="cx"> request->priv->bytesRead = 0;
</span><span class="cx"> request->priv->mimeType = mimeType;
</span><span class="cx"> g_input_stream_read_async(inputStream, request->priv->readBuffer, gReadBufferSize, G_PRIORITY_DEFAULT, request->priv->cancellable.get(),
</span><del>- reinterpret_cast<GAsyncReadyCallback>(webkitURISchemeRequestReadCallback), g_object_ref(request));
</del><ins>+ reinterpret_cast<GAsyncReadyCallback>(webkitURISchemeRequestReadCallback), g_object_ref(request));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -233,7 +232,6 @@
</span><span class="cx"> WebKitURISchemeRequestPrivate* priv = request->priv;
</span><span class="cx">
</span><span class="cx"> WebCore::ResourceError resourceError(g_quark_to_string(error->domain), error->code, priv->uri.data(), String::fromUTF8(error->message));
</span><del>- priv->webRequestManager->didFailURIRequest(resourceError, priv->requestID);
-
- webkitWebContextDidFinishURIRequest(priv->webContext, priv->requestID);
</del><ins>+ priv->webRequestManager->didFailWithError(priv->requestID, resourceError);
+ webkitWebContextDidFinishLoadingCustomProtocol(priv->webContext, priv->requestID);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> #include "WebKitURISchemeRequest.h"
</span><span class="cx"> #include "WebKitWebContext.h"
</span><span class="cx">
</span><del>-WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext*, WebKit::WebSoupRequestManagerProxy*, API::URL*, WebKit::WebPageProxy*, uint64_t requestID);
-uint64_t webkitURISchemeRequestGetID(WebKitURISchemeRequest*);
</del><ins>+WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitWebContext*, API::URLRequest*, WebKit::WebPageProxy*);
</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 (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> GRefPtr<WebKitCookieManager> cookieManager;
</span><span class="cx"> GRefPtr<WebKitFaviconDatabase> faviconDatabase;
</span><span class="cx"> GRefPtr<WebKitSecurityManager> securityManager;
</span><del>- RefPtr<WebSoupRequestManagerProxy> requestManager;
</del><ins>+ RefPtr<WebSoupCustomProtocolRequestManager> requestManager;
</ins><span class="cx"> URISchemeHandlerMap uriSchemeHandlers;
</span><span class="cx"> URISchemeRequestMap uriSchemeRequests;
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> WebKitWebContextPrivate* priv = webContext->priv;
</span><span class="cx">
</span><span class="cx"> priv->context = WebContext::create(WebCore::filenameToString(injectedBundleFilename().data()));
</span><del>- priv->requestManager = webContext->priv->context->supplement<WebSoupRequestManagerProxy>();
</del><ins>+ priv->requestManager = webContext->priv->context->supplement<WebSoupCustomProtocolRequestManager>();
</ins><span class="cx"> priv->context->setCacheModel(CacheModelPrimaryWebBrowser);
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> // FIXME: Temporary use an env var until we have API to set the process model. See https://bugs.webkit.org/show_bug.cgi?id=125463.
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebKitURISchemeHandler> handler = adoptRef(new WebKitURISchemeHandler(callback, userData, destroyNotify));
</span><span class="cx"> context->priv->uriSchemeHandlers.set(String::fromUTF8(scheme), handler.get());
</span><del>- context->priv->requestManager->registerURIScheme(String::fromUTF8(scheme));
</del><ins>+ context->priv->requestManager->registerSchemeForCustomProtocol(String::fromUTF8(scheme));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -933,34 +933,36 @@
</span><span class="cx"> return context->priv->context.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebSoupRequestManagerProxy* webkitWebContextGetRequestManager(WebKitWebContext* context)
</del><ins>+WebSoupCustomProtocolRequestManager* webkitWebContextGetRequestManager(WebKitWebContext* context)
</ins><span class="cx"> {
</span><span class="cx"> return context->priv->requestManager.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkitWebContextReceivedURIRequest(WebKitWebContext* context, WebKitURISchemeRequest* request)
</del><ins>+void webkitWebContextStartLoadingCustomProtocol(WebKitWebContext* context, uint64_t customProtocolID, API::URLRequest* urlRequest)
</ins><span class="cx"> {
</span><del>- String scheme(String::fromUTF8(webkit_uri_scheme_request_get_scheme(request)));
</del><ins>+ // FIXME: We need to figure out how to get the initiating page.
+ GRefPtr<WebKitURISchemeRequest> request = adoptGRef(webkitURISchemeRequestCreate(customProtocolID, context, urlRequest, nullptr));
+ String scheme(String::fromUTF8(webkit_uri_scheme_request_get_scheme(request.get())));
</ins><span class="cx"> RefPtr<WebKitURISchemeHandler> handler = context->priv->uriSchemeHandlers.get(scheme);
</span><span class="cx"> ASSERT(handler.get());
</span><span class="cx"> if (!handler->hasCallback())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- context->priv->uriSchemeRequests.set(webkitURISchemeRequestGetID(request), request);
- handler->performCallback(request);
</del><ins>+ context->priv->uriSchemeRequests.set(customProtocolID, request.get());
+ handler->performCallback(request.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void webkitWebContextDidFailToLoadURIRequest(WebKitWebContext* context, uint64_t requestID)
</del><ins>+void webkitWebContextStopLoadingCustomProtocol(WebKitWebContext* context, uint64_t customProtocolID)
</ins><span class="cx"> {
</span><del>- GRefPtr<WebKitURISchemeRequest> request = context->priv->uriSchemeRequests.get(requestID);
</del><ins>+ GRefPtr<WebKitURISchemeRequest> request = context->priv->uriSchemeRequests.get(customProtocolID);
</ins><span class="cx"> if (!request.get())
</span><span class="cx"> return;
</span><span class="cx"> webkitURISchemeRequestCancel(request.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkitWebContextDidFinishURIRequest(WebKitWebContext* context, uint64_t requestID)
</del><ins>+void webkitWebContextDidFinishLoadingCustomProtocol(WebKitWebContext* context, uint64_t customProtocolID)
</ins><span class="cx"> {
</span><del>- context->priv->uriSchemeRequests.remove(requestID);
</del><ins>+ context->priv->uriSchemeRequests.remove(customProtocolID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkitWebContextCreatePageForWebView(WebKitWebContext* context, WebKitWebView* webView, WebKitWebViewGroup* webViewGroup)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -29,20 +29,19 @@
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><del>-#include "WebKitURISchemeRequest.h"
</del><span class="cx"> #include "WebKitWebContext.h"
</span><span class="cx"> #include "WebKitWebViewGroup.h"
</span><del>-#include "WebSoupRequestManagerProxy.h"
</del><ins>+#include "WebSoupCustomProtocolRequestManager.h"
</ins><span class="cx">
</span><span class="cx"> WebKit::WebContext* webkitWebContextGetContext(WebKitWebContext*);
</span><span class="cx"> WebKitDownload* webkitWebContextGetOrCreateDownload(WebKit::DownloadProxy*);
</span><span class="cx"> WebKitDownload* webkitWebContextStartDownload(WebKitWebContext*, const char* uri, WebKit::WebPageProxy*);
</span><span class="cx"> void webkitWebContextRemoveDownload(WebKit::DownloadProxy*);
</span><span class="cx"> void webkitWebContextDownloadStarted(WebKitWebContext*, WebKitDownload*);
</span><del>-WebKit::WebSoupRequestManagerProxy* webkitWebContextGetRequestManager(WebKitWebContext*);
-void webkitWebContextReceivedURIRequest(WebKitWebContext*, WebKitURISchemeRequest*);
-void webkitWebContextDidFailToLoadURIRequest(WebKitWebContext*, uint64_t requestID);
-void webkitWebContextDidFinishURIRequest(WebKitWebContext*, uint64_t requestID);
</del><ins>+WebKit::WebSoupCustomProtocolRequestManager* webkitWebContextGetRequestManager(WebKitWebContext*);
+void webkitWebContextStartLoadingCustomProtocol(WebKitWebContext*, uint64_t customProtocolID, API::URLRequest*);
+void webkitWebContextStopLoadingCustomProtocol(WebKitWebContext*, uint64_t customProtocolID);
+void webkitWebContextDidFinishLoadingCustomProtocol(WebKitWebContext*, uint64_t customProtocolID);
</ins><span class="cx"> void webkitWebContextCreatePageForWebView(WebKitWebContext*, WebKitWebView*, WebKitWebViewGroup*);
</span><span class="cx"> void webkitWebContextWebViewDestroyed(WebKitWebContext*, WebKitWebView*);
</span><span class="cx"> WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext*, WebKit::WebPageProxy*);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "WebInspectorServer.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="cx"> #include "WebProcessMessages.h"
</span><ins>+#include "WebSoupCustomProtocolRequestManager.h"
</ins><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/SchemeRegistry.h>
</span><span class="lines">@@ -43,12 +44,6 @@
</span><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "WebSoupCustomProtocolRequestManager.h"
-#else
-#include "WebSoupRequestManagerProxy.h"
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static void initInspectorServer()
</span><span class="lines">@@ -104,11 +99,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!usesNetworkProcess()) {
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
</span><del>-#else
- parameters.urlSchemesRegistered = supplement<WebSoupRequestManagerProxy>()->registeredURISchemes();
-#endif
</del><span class="cx">
</span><span class="cx"> supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
</span><span class="cx"> parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2Prefix.h 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define ENABLE_NETWORK_PROCESS 1
</span><ins>+#define ENABLE_CUSTOM_PROTOCOLS 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Tools/ChangeLog 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Implement custom URI schemes with CustomProtocols
+ https://bugs.webkit.org/show_bug.cgi?id=127091
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Temporarily disable the WebKitWebView check until we figure out
+ how to implement it with CustomProtocols.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+
</ins><span class="cx"> 2014-01-26 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r127412): http/tests/misc/link-rel-icon-beforeload.html is broken.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (162834 => 162835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-01-27 12:40:18 UTC (rev 162834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-01-27 13:14:49 UTC (rev 162835)
</span><span class="lines">@@ -146,7 +146,8 @@
</span><span class="cx"> test->m_uriSchemeRequest = request;
</span><span class="cx"> test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(request));
</span><span class="cx">
</span><del>- g_assert(webkit_uri_scheme_request_get_web_view(request) == test->m_webView);
</del><ins>+ // 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);
</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>