<!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>[207388] 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/207388">207388</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-16 01:35:18 -0700 (Sun, 16 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Document request not updated after willSendRequest is called for a redirect
https://bugs.webkit.org/show_bug.cgi?id=163436
Reviewed by Michael Catanzaro.
Source/WebCore:
The first willSendRequest happens before DocumentLoader::startLoadingMainResource(), that calls setRequest, but
the second one happens after DocumentLoader::redirectReceived() and then the request is never updated again.
Covered by GTK+ unit tests.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::willContinueMainResourceLoadAfterRedirect): Set the new request.
* loader/DocumentLoader.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::willSendRequestInternal): Notify the document loader when loading the main resource
and called for a redirection.
Tools:
Update /webkit2/WebKitWebView/active-uri test to check the active URI also when modified by
WebKitPage::send-request signal in a web extension.
* TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp:
(testWebViewActiveURI):
(serverCallback):
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
(sendRequestCallback):
* TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp:
(loadChangedCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestLoaderClientcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkLoadTrackingTestcpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Source/WebCore/ChangeLog 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Document request not updated after willSendRequest is called for a redirect
+ https://bugs.webkit.org/show_bug.cgi?id=163436
+
+ Reviewed by Michael Catanzaro.
+
+ The first willSendRequest happens before DocumentLoader::startLoadingMainResource(), that calls setRequest, but
+ the second one happens after DocumentLoader::redirectReceived() and then the request is never updated again.
+
+ Covered by GTK+ unit tests.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::willContinueMainResourceLoadAfterRedirect): Set the new request.
+ * loader/DocumentLoader.h:
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequestInternal): Notify the document loader when loading the main resource
+ and called for a redirection.
+
</ins><span class="cx"> 2016-10-15 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Delete the animated image catchup code
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -1629,6 +1629,11 @@
</span><span class="cx"> mainReceivedError(error);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DocumentLoader::willContinueMainResourceLoadAfterRedirect(const ResourceRequest& newRequest)
+{
+ setRequest(newRequest);
+}
+
</ins><span class="cx"> void DocumentLoader::clearMainResource()
</span><span class="cx"> {
</span><span class="cx"> if (m_mainResource && m_mainResource->hasClient(*this))
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -213,7 +213,8 @@
</span><span class="cx">
</span><span class="cx"> void startLoadingMainResource();
</span><span class="cx"> WEBCORE_EXPORT void cancelMainResourceLoad(const ResourceError&);
</span><del>-
</del><ins>+ void willContinueMainResourceLoadAfterRedirect(const ResourceRequest&);
+
</ins><span class="cx"> // Support iconDatabase in synchronous mode.
</span><span class="cx"> void iconLoadDecisionAvailable();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -229,8 +229,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ResourceLoader::willSendRequestInternal(newRequest, redirectResponse);
</span><del>- if (newRequest.isNull())
</del><ins>+ if (newRequest.isNull()) {
</ins><span class="cx"> cancel();
</span><ins>+ return;
+ }
+
+ if (m_resource->type() == CachedResource::MainResource && !redirectResponse.isNull())
+ m_documentLoader->willContinueMainResourceLoadAfterRedirect(newRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SubresourceLoader::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Tools/ChangeLog 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Document request not updated after willSendRequest is called for a redirect
+ https://bugs.webkit.org/show_bug.cgi?id=163436
+
+ Reviewed by Michael Catanzaro.
+
+ Update /webkit2/WebKitWebView/active-uri test to check the active URI also when modified by
+ WebKitPage::send-request signal in a web extension.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp:
+ (testWebViewActiveURI):
+ (serverCallback):
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ (sendRequestCallback):
+ * TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp:
+ (loadChangedCallback):
+
</ins><span class="cx"> 2016-10-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r191699): Contextual menu in Mail compose view doesn’t include any of the standard submenus
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> static WebKitTestBus* bus;
</span><span class="lines">@@ -209,51 +210,100 @@
</span><span class="cx">
</span><span class="cx"> static void uriChanged(GObject*, GParamSpec*, ViewURITrackingTest* test)
</span><span class="cx"> {
</span><del>- g_assert_cmpstr(test->m_activeURI.data(), !=, webkit_web_view_get_uri(test->m_webView));
- test->m_activeURI = webkit_web_view_get_uri(test->m_webView);
</del><ins>+ g_assert_cmpstr(test->m_currentURI.data(), !=, webkit_web_view_get_uri(test->m_webView));
+ test->m_currentURI = webkit_web_view_get_uri(test->m_webView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ViewURITrackingTest()
</span><del>- : m_activeURI(webkit_web_view_get_uri(m_webView))
</del><ins>+ : m_currentURI(webkit_web_view_get_uri(m_webView))
</ins><span class="cx"> {
</span><del>- g_assert(m_activeURI.isNull());
</del><ins>+ g_assert(m_currentURI.isNull());
+ m_currentURIList.grow(m_currentURIList.capacity());
</ins><span class="cx"> g_signal_connect(m_webView, "notify::uri", G_CALLBACK(uriChanged), this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ enum State { Provisional, ProvisionalAfterRedirect, Commited, Finished };
+
+ void loadURI(const char* uri)
+ {
+ reset();
+ LoadTrackingTest::loadURI(uri);
+ }
+
</ins><span class="cx"> void provisionalLoadStarted()
</span><span class="cx"> {
</span><del>- checkActiveURI("/redirect");
</del><ins>+ m_currentURIList[Provisional] = m_currentURI;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void provisionalLoadReceivedServerRedirect()
</span><span class="cx"> {
</span><del>- checkActiveURI("/normal");
</del><ins>+ m_currentURIList[ProvisionalAfterRedirect] = m_currentURI;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void loadCommitted()
</span><span class="cx"> {
</span><del>- checkActiveURI("/normal");
</del><ins>+ m_currentURIList[Commited] = m_currentURI;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void loadFinished()
</span><span class="cx"> {
</span><del>- checkActiveURI("/normal");
</del><ins>+ m_currentURIList[Finished] = m_currentURI;
</ins><span class="cx"> LoadTrackingTest::loadFinished();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CString m_activeURI;
</del><ins>+ void checkURIAtState(State state, const char* path)
+ {
+ if (path)
+ ASSERT_CMP_CSTRING(m_currentURIList[state], ==, kServer->getURIForPath(path));
+ else
+ g_assert(m_currentURIList[state].isNull());
+ }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- void checkActiveURI(const char* uri)
</del><ins>+ void reset()
</ins><span class="cx"> {
</span><del>- ASSERT_CMP_CSTRING(m_activeURI, ==, kServer->getURIForPath(uri));
</del><ins>+ m_currentURI = CString();
+ m_currentURIList.clear();
+ m_currentURIList.grow(m_currentURIList.capacity());
</ins><span class="cx"> }
</span><ins>+
+ CString m_currentURI;
+ Vector<CString, 4> m_currentURIList;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void testWebViewActiveURI(ViewURITrackingTest* test, gconstpointer)
</span><span class="cx"> {
</span><ins>+ // Normal load, the URL doesn't change.
+ test->loadURI(kServer->getURIForPath("/normal1").data());
+ test->waitUntilLoadFinished();
+ test->checkURIAtState(ViewURITrackingTest::State::Provisional, "/normal1");
+ test->checkURIAtState(ViewURITrackingTest::State::ProvisionalAfterRedirect, nullptr);
+ test->checkURIAtState(ViewURITrackingTest::State::Commited, "/normal1");
+ test->checkURIAtState(ViewURITrackingTest::State::Finished, "/normal1");
+
+ // Redirect, the URL changes after the redirect.
</ins><span class="cx"> test->loadURI(kServer->getURIForPath("/redirect").data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><ins>+ test->checkURIAtState(ViewURITrackingTest::State::Provisional, "/redirect");
+ test->checkURIAtState(ViewURITrackingTest::State::ProvisionalAfterRedirect, "/normal");
+ test->checkURIAtState(ViewURITrackingTest::State::Commited, "/normal");
+ test->checkURIAtState(ViewURITrackingTest::State::Finished, "/normal");
+
+ // Normal load, URL changed by WebKitPage::send-request.
+ test->loadURI(kServer->getURIForPath("/normal-change-request").data());
+ test->waitUntilLoadFinished();
+ test->checkURIAtState(ViewURITrackingTest::State::Provisional, "/normal-change-request");
+ test->checkURIAtState(ViewURITrackingTest::State::ProvisionalAfterRedirect, nullptr);
+ test->checkURIAtState(ViewURITrackingTest::State::Commited, "/request-changed");
+ test->checkURIAtState(ViewURITrackingTest::State::Finished, "/request-changed");
+
+ // Redirect, URL changed by WebKitPage::send-request.
+ test->loadURI(kServer->getURIForPath("/redirect-to-change-request").data());
+ test->waitUntilLoadFinished();
+ test->checkURIAtState(ViewURITrackingTest::State::Provisional, "/redirect-to-change-request");
+ test->checkURIAtState(ViewURITrackingTest::State::ProvisionalAfterRedirect, "/normal-change-request");
+ test->checkURIAtState(ViewURITrackingTest::State::Commited, "/request-changed-on-redirect");
+ test->checkURIAtState(ViewURITrackingTest::State::Finished, "/request-changed-on-redirect");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class ViewIsLoadingTest: public LoadTrackingTest {
</span><span class="lines">@@ -484,6 +534,9 @@
</span><span class="cx"> else if (g_str_equal(path, "/redirect")) {
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Location", "/normal");
</span><ins>+ } else if (g_str_equal(path, "/redirect-to-change-request")) {
+ soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
+ soup_message_headers_append(message->response_headers, "Location", "/normal-change-request");
</ins><span class="cx"> } else if (g_str_equal(path, "/cancelled")) {
</span><span class="cx"> soup_message_headers_set_encoding(message->response_headers, SOUP_ENCODING_CHUNKED);
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, responseString, strlen(responseString));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -154,6 +154,10 @@
</span><span class="cx"> SoupMessageHeaders* headers = webkit_uri_request_get_http_headers(request);
</span><span class="cx"> g_assert(headers);
</span><span class="cx"> soup_message_headers_append(headers, "DNT", "1");
</span><ins>+ } else if (g_str_has_suffix(requestURI, "/normal-change-request")) {
+ GUniquePtr<char> prefix(g_strndup(requestURI, strlen(requestURI) - strlen("/normal-change-request")));
+ GUniquePtr<char> newURI(g_strdup_printf("%s/request-changed%s", prefix.get(), redirectResponse ? "-on-redirect" : ""));
+ webkit_uri_request_set_uri(request, newURI.get());
</ins><span class="cx"> } else if (g_str_has_suffix(requestURI, "/http-get-method")) {
</span><span class="cx"> g_assert_cmpstr(webkit_uri_request_get_http_method(request), ==, "GET");
</span><span class="cx"> g_assert(webkit_uri_request_get_http_method(request) == SOUP_METHOD_GET);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkLoadTrackingTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp (207387 => 207388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp 2016-10-16 01:44:18 UTC (rev 207387)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp 2016-10-16 08:35:18 UTC (rev 207388)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case WEBKIT_LOAD_COMMITTED: {
</span><span class="cx"> g_assert(webkit_web_view_is_loading(webView));
</span><del>- g_assert_cmpstr(test->m_activeURI.data(), ==, webkit_web_view_get_uri(webView));
</del><ins>+ test->m_activeURI = webkit_web_view_get_uri(webView);
</ins><span class="cx">
</span><span class="cx"> // Check that on committed we always have a main resource with a response.
</span><span class="cx"> WebKitWebResource* resource = webkit_web_view_get_main_resource(webView);
</span></span></pre>
</div>
</div>
</body>
</html>