<!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>[182016] 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/182016">182016</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 10:45:12 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Apply ContentExtension actions after redirects.
<rdar://problem/20062613> and https://bugs.webkit.org/show_bug.cgi?id=143055
Reviewed by Alex Christensen.
Source/WebCore:
Tests: http/tests/contentextensions/loading/main-resource-redirect-blocked.php
http/tests/contentextensions/subresource-redirect-blocked.html
This patch moves the "run a URL against the content extension" code from CachedResourceLoader to
the ContentExtensionsBackend.
That allows it to be shared between the CachedResourceLoader where loads are initiated and
ResourceLoader where redirects are handled.
* contentextensions/ContentExtension.cpp:
(WebCore::ContentExtensions::ContentExtension::globalDisplayNoneStyleSheet):
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
(WebCore::ContentExtensions::ContentExtensionsBackend::displayNoneCSSRule):
* contentextensions/ContentExtensionsBackend.h:
* loader/NetscapePlugInStreamLoader.cpp:
(WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader):
* loader/ResourceLoadInfo.h:
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::ResourceLoader):
(WebCore::ResourceLoader::willSendRequest):
* loader/ResourceLoader.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::SubresourceLoader):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
* page/UserContentController.cpp:
(WebCore::UserContentController::processContentExtensionRulesForLoad):
(WebCore::UserContentController::actionsForResourceLoad): Deleted.
(WebCore::UserContentController::globalDisplayNoneStyleSheet): Deleted.
(WebCore::UserContentController::displayNoneCSSRule): Deleted.
* page/UserContentController.h:
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame): Dump the fact that the load error is kWKErrorCodeCannotShowURL
which is specifically interesting to a new test.
LayoutTests:
* http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt: Added.
* http/tests/contentextensions/loading/main-resource-redirect-blocked.php: Added.
* http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json: Added.
* http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html: Added.
* http/tests/contentextensions/resources/subresource-redirect.php: Added.
* http/tests/contentextensions/subresource-redirect-blocked-expected.txt: Added.
* http/tests/contentextensions/subresource-redirect-blocked.html: Added.
* http/tests/contentextensions/subresource-redirect-blocked.html.json: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensioncpp">trunk/Source/WebCore/contentextensions/ContentExtension.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendh">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadInfoh">trunk/Source/WebCore/loader/ResourceLoadInfo.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllercpp">trunk/Source/WebCore/page/UserContentController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllerh">trunk/Source/WebCore/page/UserContentController.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/contentextensions/loading/</li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsloadingmainresourceredirectblockedexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsloadingmainresourceredirectblockedphp">trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsloadingmainresourceredirectblockedphpjson">trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json</a></li>
<li>trunk/LayoutTests/http/tests/contentextensions/loading/resources/</li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsloadingresourcesmainresourceredirectblockedtargethtml">trunk/LayoutTests/http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsresourcessubresourceredirectphp">trunk/LayoutTests/http/tests/contentextensions/resources/subresource-redirect.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionssubresourceredirectblockedexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionssubresourceredirectblockedhtml">trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionssubresourceredirectblockedhtmljson">trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/LayoutTests/ChangeLog 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-26 Brady Eidson <beidson@apple.com>
+
+ Apply ContentExtension actions after redirects.
+ <rdar://problem/20062613> and https://bugs.webkit.org/show_bug.cgi?id=143055
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt: Added.
+ * http/tests/contentextensions/loading/main-resource-redirect-blocked.php: Added.
+ * http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json: Added.
+ * http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html: Added.
+ * http/tests/contentextensions/resources/subresource-redirect.php: Added.
+ * http/tests/contentextensions/subresource-redirect-blocked-expected.txt: Added.
+ * http/tests/contentextensions/subresource-redirect-blocked.html: Added.
+ * http/tests/contentextensions/subresource-redirect-blocked.html.json: Added.
+
</ins><span class="cx"> 2015-03-26 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> js/promises-tests/promises-tests-2-3-3.html sometimes crashes under DFG::SpeculativeJIT::compile
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsloadingmainresourceredirectblockedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didFailProvisionalLoadWithError
+main frame - (kWKErrorCodeCannotShowURL)
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsloadingmainresourceredirectblockedphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+ header('Location: resources/main-resource-redirect-blocked-target.html');
+ header('HTTP/1.0 302 Found');
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsloadingmainresourceredirectblockedphpjson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": ".*main-resource-redirect-blocked-target.html"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsloadingresourcesmainresourceredirectblockedtargethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This page should never actually load.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsresourcessubresourceredirectphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/resources/subresource-redirect.php (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/resources/subresource-redirect.php (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/resources/subresource-redirect.php 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+ header('Location: http://127.0.0.1:8000/resources/square128.png');
+ header('HTTP/1.0 302 Found');
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionssubresourceredirectblockedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 155x18
+ text run at (0,0) width 155: "This page has an image."
+ RenderBR {BR} at (154,14) size 1x0
+ RenderText {#text} at (0,18) size 415x18
+ text run at (0,18) width 415: "The image load should be blocked by the content extension filter"
+ RenderBR {BR} at (414,32) size 1x0
+ RenderImage {IMG} at (0,36) size 20x20
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionssubresourceredirectblockedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This page has an image.<br>
+The image load should be blocked by the content extension filter<br>
+<img src="resources/subresource-redirect.php">
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionssubresourceredirectblockedhtmljson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html.json (0 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked.html.json 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": ".*square"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/ChangeLog 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2015-03-26 Brady Eidson <beidson@apple.com>
+
+ Apply ContentExtension actions after redirects.
+ <rdar://problem/20062613> and https://bugs.webkit.org/show_bug.cgi?id=143055
+
+ Reviewed by Alex Christensen.
+
+ Tests: http/tests/contentextensions/loading/main-resource-redirect-blocked.php
+ http/tests/contentextensions/subresource-redirect-blocked.html
+
+ This patch moves the "run a URL against the content extension" code from CachedResourceLoader to
+ the ContentExtensionsBackend.
+
+ That allows it to be shared between the CachedResourceLoader where loads are initiated and
+ ResourceLoader where redirects are handled.
+
+ * contentextensions/ContentExtension.cpp:
+ (WebCore::ContentExtensions::ContentExtension::globalDisplayNoneStyleSheet):
+
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
+ (WebCore::ContentExtensions::ContentExtensionsBackend::displayNoneCSSRule):
+ * contentextensions/ContentExtensionsBackend.h:
+
+ * loader/NetscapePlugInStreamLoader.cpp:
+ (WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader):
+
+ * loader/ResourceLoadInfo.h:
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::ResourceLoader):
+ (WebCore::ResourceLoader::willSendRequest):
+ * loader/ResourceLoader.h:
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::SubresourceLoader):
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+
+ * page/UserContentController.cpp:
+ (WebCore::UserContentController::processContentExtensionRulesForLoad):
+ (WebCore::UserContentController::actionsForResourceLoad): Deleted.
+ (WebCore::UserContentController::globalDisplayNoneStyleSheet): Deleted.
+ (WebCore::UserContentController::displayNoneCSSRule): Deleted.
+ * page/UserContentController.h:
+
</ins><span class="cx"> 2015-03-26 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when laying out (char)0
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtension.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtension.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/contentextensions/ContentExtension.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "ContentExtension.h"
</span><span class="cx">
</span><span class="cx"> #include "CompiledContentExtension.h"
</span><ins>+#include "ContentExtensionsBackend.h"
</ins><span class="cx"> #include "StyleSheetContents.h"
</span><del>-#include "UserContentController.h"
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> StringBuilder css;
</span><span class="cx"> for (auto& selector : selectors) {
</span><span class="cx"> css.append(selector);
</span><del>- css.append(UserContentController::displayNoneCSSRule());
</del><ins>+ css.append(ContentExtensionsBackend::displayNoneCSSRule());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_globalDisplayNoneStyleSheet = StyleSheetContents::create();
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -31,8 +31,14 @@
</span><span class="cx"> #include "CompiledContentExtension.h"
</span><span class="cx"> #include "ContentExtension.h"
</span><span class="cx"> #include "DFABytecodeInterpreter.h"
</span><ins>+#include "Document.h"
+#include "DocumentLoader.h"
+#include "Frame.h"
+#include "MainFrame.h"
</ins><span class="cx"> #include "ResourceLoadInfo.h"
</span><span class="cx"> #include "URL.h"
</span><ins>+#include "UserContentController.h"
+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -110,6 +116,73 @@
</span><span class="cx"> return contentExtension ? contentExtension->globalDisplayNoneStyleSheet() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ContentExtensionsBackend::processContentExtensionRulesForLoad(ResourceRequest& request, ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
+{
+ Document* currentDocument = nullptr;
+ URL mainDocumentURL;
+
+ if (initiatingDocumentLoader.frame()) {
+ currentDocument = initiatingDocumentLoader.frame()->document();
+
+ if (Document* mainDocument = initiatingDocumentLoader.frame()->mainFrame().document())
+ mainDocumentURL = mainDocument->url();
+ }
+
+ ResourceLoadInfo resourceLoadInfo = { request.url(), mainDocumentURL, resourceType };
+ Vector<ContentExtensions::Action> actions = actionsForResourceLoad(resourceLoadInfo);
+
+ StringBuilder css;
+ bool willBlockLoad = false;
+ for (const auto& action : actions) {
+ switch (action.type()) {
+ case ContentExtensions::ActionType::BlockLoad:
+ willBlockLoad = true;
+ break;
+ case ContentExtensions::ActionType::BlockCookies:
+ request.setAllowCookies(false);
+ break;
+ case ContentExtensions::ActionType::CSSDisplayNoneSelector:
+ css.append(action.stringArgument());
+ css.append(displayNoneCSSRule());
+ break;
+ case ContentExtensions::ActionType::CSSDisplayNoneStyleSheet: {
+ StyleSheetContents* styleSheetContents = globalDisplayNoneStyleSheet(action.stringArgument());
+ if (styleSheetContents) {
+ if (resourceType == ResourceType::Document)
+ initiatingDocumentLoader.addPendingContentExtensionSheet(action.stringArgument(), *styleSheetContents);
+ else if (currentDocument)
+ currentDocument->styleSheetCollection().maybeAddContentExtensionSheet(action.stringArgument(), *styleSheetContents);
+ }
+ break;
+ }
+ case ContentExtensions::ActionType::IgnorePreviousRules:
+ case ContentExtensions::ActionType::InvalidAction:
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+ }
+
+ if (css.length()) {
+ Ref<StyleSheetContents> styleSheet = StyleSheetContents::create();
+ styleSheet->setIsUserStyleSheet(true);
+
+ if (styleSheet->parseString(css.toString())) {
+ if (resourceType == ResourceType::Document)
+ initiatingDocumentLoader.addPendingContentExtensionSheet(styleSheet);
+ else if (currentDocument)
+ currentDocument->styleSheetCollection().addUserSheet(WTF::move(styleSheet));
+ }
+ }
+
+ if (willBlockLoad)
+ request = ResourceRequest();
+}
+
+const String& ContentExtensionsBackend::displayNoneCSSRule()
+{
+ static NeverDestroyed<const String> rule(ASCIILiteral("{display:none !important;}\n"));
+ return rule;
+}
+
</ins><span class="cx"> } // namespace ContentExtensions
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.h (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.h 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.h 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class DocumentLoader;
+class ResourceRequest;
</ins><span class="cx"> class URL;
</span><span class="cx">
</span><span class="cx"> struct ResourceLoadInfo;
</span><span class="lines">@@ -63,6 +65,10 @@
</span><span class="cx"> WEBCORE_EXPORT Vector<Action> actionsForResourceLoad(const ResourceLoadInfo&) const;
</span><span class="cx"> StyleSheetContents* globalDisplayNoneStyleSheet(const String& identifier) const;
</span><span class="cx">
</span><ins>+ void processContentExtensionRulesForLoad(ResourceRequest&, ResourceType, DocumentLoader& initiatingDocumentLoader);
+
+ static const String& displayNoneCSSRule();
+
</ins><span class="cx"> private:
</span><span class="cx"> HashMap<String, RefPtr<ContentExtension>> m_contentExtensions;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -34,12 +34,19 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+#include "ResourceLoadInfo.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, NetscapePlugInStreamLoaderClient* client)
</span><span class="cx"> : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, DoNotBufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo))
</span><span class="cx"> , m_client(client)
</span><span class="cx"> {
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ m_resourceType = ResourceType::PlugInStream;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetscapePlugInStreamLoader::~NetscapePlugInStreamLoader()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadInfo.h (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadInfo.h 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/loader/ResourceLoadInfo.h 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -41,12 +41,13 @@
</span><span class="cx"> Raw = 0x0020,
</span><span class="cx"> SVGDocument = 0x0040,
</span><span class="cx"> Media = 0x0080,
</span><ins>+ PlugInStream = 0x0100,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum class LoadType : uint16_t {
</span><span class="cx"> Invalid = 0x0000,
</span><del>- FirstParty = 0x0100,
- ThirdParty = 0x0200,
</del><ins>+ FirstParty = 0x0200,
+ ThirdParty = 0x0400,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef uint16_t ResourceFlags;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -52,6 +52,11 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+#include "ResourceLoadInfo.h"
+#include "UserContentController.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ResourceLoader::ResourceLoader(Frame* frame, ResourceLoaderOptions options)
</span><span class="lines">@@ -64,6 +69,9 @@
</span><span class="cx"> , m_defersLoading(frame->page()->defersLoading())
</span><span class="cx"> , m_options(options)
</span><span class="cx"> , m_isQuickLookResource(false)
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ , m_resourceType(ResourceType::Invalid)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -267,7 +275,19 @@
</span><span class="cx"> Ref<ResourceLoader> protect(*this);
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_reachedTerminalState);
</span><del>-
</del><ins>+
+#if ENABLE(CONTENT_EXTENSIONS)
+ ASSERT(m_resourceType != ResourceType::Invalid);
+
+ if (frameLoader() && frameLoader()->frame().page() && frameLoader()->frame().page()->userContentController() && m_documentLoader)
+ frameLoader()->frame().page()->userContentController()->processContentExtensionRulesForLoad(request, m_resourceType, *m_documentLoader);
+
+ if (request.isNull()) {
+ didFail(cannotShowURLError());
+ return;
+ }
+#endif
+
</ins><span class="cx"> // We need a resource identifier for all requests, even if FrameLoader is never going to see it (such as with CORS preflight requests).
</span><span class="cx"> bool createdResourceIdentifier = false;
</span><span class="cx"> if (!m_identifier) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> class QuickLookHandle;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+enum class ResourceType : uint16_t;
+#endif
+
</ins><span class="cx"> class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ResourceLoader() = 0;
</span><span class="lines">@@ -224,6 +228,11 @@
</span><span class="cx"> ResourceRequest m_deferredRequest;
</span><span class="cx"> ResourceLoaderOptions m_options;
</span><span class="cx"> bool m_isQuickLookResource;
</span><ins>+
+#if ENABLE(CONTENT_EXTENSIONS)
+protected:
+ ResourceType m_resourceType;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline const ResourceResponse& ResourceLoader::response() const
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> #include <RuntimeApplicationChecksIOS.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+#include "ResourceLoadInfo.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, subresourceLoaderCounter, ("SubresourceLoader"));
</span><span class="lines">@@ -76,6 +80,9 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> subresourceLoaderCounter.increment();
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ m_resourceType = toResourceType(resource->type());
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SubresourceLoader::~SubresourceLoader()
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -508,63 +508,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- URL mainDocumentURL;
- if (frame() && frame()->mainFrame().document())
- mainDocumentURL = frame()->mainFrame().document()->url();
</del><ins>+ if (frame() && frame()->mainFrame().page() && frame()->mainFrame().page()->userContentController() && m_documentLoader)
+ frame()->mainFrame().page()->userContentController()->processContentExtensionRulesForLoad(request.mutableResourceRequest(), toResourceType(type), *m_documentLoader);
</ins><span class="cx">
</span><del>- ResourceLoadInfo resourceLoadInfo = { url, mainDocumentURL, toResourceType(type) };
-
- Vector<ContentExtensions::Action> actions;
- UserContentController* userContentController = nullptr;
- if (frame() && frame()->mainFrame().page())
- userContentController = frame()->mainFrame().page()->userContentController();
-
- if (userContentController)
- actions = userContentController->actionsForResourceLoad(resourceLoadInfo);
-
- StringBuilder css;
- bool willBlockLoad = false;
- for (const auto& action : actions) {
- switch (action.type()) {
- case ContentExtensions::ActionType::BlockLoad:
- willBlockLoad = true;
- break;
- case ContentExtensions::ActionType::BlockCookies:
- request.mutableResourceRequest().setAllowCookies(false);
- break;
- case ContentExtensions::ActionType::CSSDisplayNoneSelector:
- css.append(action.stringArgument());
- css.append(UserContentController::displayNoneCSSRule());
- break;
- case ContentExtensions::ActionType::CSSDisplayNoneStyleSheet: {
- StyleSheetContents* styleSheetContents = userContentController->globalDisplayNoneStyleSheet(action.stringArgument());
- if (styleSheetContents) {
- if (type == CachedResource::MainResource && request.initiatingDocumentLoader())
- request.initiatingDocumentLoader()->addPendingContentExtensionSheet(action.stringArgument(), *styleSheetContents);
- else if (m_document)
- m_document->styleSheetCollection().maybeAddContentExtensionSheet(action.stringArgument(), *styleSheetContents);
- }
- break;
- }
- case ContentExtensions::ActionType::IgnorePreviousRules:
- case ContentExtensions::ActionType::InvalidAction:
- RELEASE_ASSERT_NOT_REACHED();
- }
- }
-
- if (css.length()) {
- Ref<StyleSheetContents> styleSheet = StyleSheetContents::create();
- styleSheet->setIsUserStyleSheet(true);
-
- if (styleSheet->parseString(css.toString())) {
- if (type == CachedResource::MainResource && request.initiatingDocumentLoader())
- request.initiatingDocumentLoader()->addPendingContentExtensionSheet(styleSheet);
- else if (m_document)
- m_document->styleSheetCollection().addUserSheet(WTF::move(styleSheet));
- }
- }
-
- if (willBlockLoad)
</del><ins>+ if (request.mutableResourceRequest().isNull())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/page/UserContentController.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "ResourceLoadInfo.h"
</span><span class="cx"> #include "UserScript.h"
</span><span class="cx"> #include "UserStyleSheet.h"
</span><del>-#include <wtf/NeverDestroyed.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(USER_MESSAGE_HANDLERS)
</span><span class="cx"> #include "UserMessageHandlerDescriptor.h"
</span><span class="lines">@@ -205,28 +204,14 @@
</span><span class="cx"> m_contentExtensionBackend->removeAllContentExtensions();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<ContentExtensions::Action> UserContentController::actionsForResourceLoad(const ResourceLoadInfo& resourceLoadInfo)
</del><ins>+void UserContentController::processContentExtensionRulesForLoad(ResourceRequest& request, ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_contentExtensionBackend)
</span><del>- return Vector<ContentExtensions::Action>();
</del><ins>+ return;
</ins><span class="cx">
</span><del>- return m_contentExtensionBackend->actionsForResourceLoad(resourceLoadInfo);
</del><ins>+ m_contentExtensionBackend->processContentExtensionRulesForLoad(request, resourceType, initiatingDocumentLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-StyleSheetContents* UserContentController::globalDisplayNoneStyleSheet(const String& identifier) const
-{
- if (!m_contentExtensionBackend)
- return nullptr;
-
- return m_contentExtensionBackend->globalDisplayNoneStyleSheet(identifier);
-}
-
-const String& UserContentController::displayNoneCSSRule()
-{
- static NeverDestroyed<const String> rule(ASCIILiteral("{display:none !important;}\n"));
- return rule;
-}
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void UserContentController::removeAllUserContent()
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.h (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.h 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Source/WebCore/page/UserContentController.h 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -39,12 +39,17 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DOMWrapperWorld;
</span><ins>+class DocumentLoader;
</ins><span class="cx"> class Page;
</span><ins>+class ResourceRequest;
</ins><span class="cx"> class StyleSheetContents;
</span><span class="cx"> class URL;
</span><span class="cx"> class UserScript;
</span><span class="cx"> class UserStyleSheet;
</span><span class="cx"> class UserMessageHandlerDescriptor;
</span><ins>+
+enum class ResourceType : uint16_t;
+
</ins><span class="cx"> struct ResourceLoadInfo;
</span><span class="cx">
</span><span class="cx"> namespace ContentExtensions {
</span><span class="lines">@@ -86,10 +91,8 @@
</span><span class="cx"> WEBCORE_EXPORT void addUserContentExtension(const String& name, RefPtr<ContentExtensions::CompiledContentExtension>);
</span><span class="cx"> WEBCORE_EXPORT void removeUserContentExtension(const String& name);
</span><span class="cx"> WEBCORE_EXPORT void removeAllUserContentExtensions();
</span><del>-
- Vector<ContentExtensions::Action> actionsForResourceLoad(const ResourceLoadInfo&);
- StyleSheetContents* globalDisplayNoneStyleSheet(const String& identifier) const;
- static const String& displayNoneCSSRule();
</del><ins>+
+ void processContentExtensionRulesForLoad(ResourceRequest&, ResourceType, DocumentLoader& initiatingDocumentLoader);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Tools/ChangeLog 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-26 Brady Eidson <beidson@apple.com>
+
+ Apply ContentExtension actions after redirects.
+ <rdar://problem/20062613> and https://bugs.webkit.org/show_bug.cgi?id=143055
+
+ Reviewed by Alex Christensen.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame): Dump the fact that the load error is kWKErrorCodeCannotShowURL
+ which is specifically interesting to a new test.
+
</ins><span class="cx"> 2015-03-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Disable building libseccomp on AArch64
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (182015 => 182016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-03-26 17:29:53 UTC (rev 182015)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-03-26 17:45:12 UTC (rev 182016)
</span><span class="lines">@@ -685,14 +685,17 @@
</span><span class="cx"> dumpLoadEvent(frame, "didReceiveServerRedirectForProvisionalLoadForFrame");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame(WKBundleFrameRef frame, WKErrorRef)
</del><ins>+void InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame(WKBundleFrameRef frame, WKErrorRef error)
</ins><span class="cx"> {
</span><span class="cx"> auto& injectedBundle = InjectedBundle::singleton();
</span><span class="cx"> if (!injectedBundle.isTestRunning())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks()) {
</ins><span class="cx"> dumpLoadEvent(frame, "didFailProvisionalLoadWithError");
</span><ins>+ if (WKErrorGetErrorCode(error) == kWKErrorCodeCannotShowURL)
+ dumpLoadEvent(frame, "(kWKErrorCodeCannotShowURL)");
+ }
</ins><span class="cx">
</span><span class="cx"> frameDidChangeLocation(frame);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>