<!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>[202995] 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/202995">202995</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-08 11:22:46 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202944">r202944</a>.
https://bugs.webkit.org/show_bug.cgi?id=159570
caused some tests to crash under GuardMalloc (Requested by
estes on #webkit).
Reverted changeset:
"[Content Filtering] Load blocked pages more like other error
pages are loaded"
https://bugs.webkit.org/show_bug.cgi?id=159485
http://trac.webkit.org/changeset/202944</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscontentfilteringresourcescontentfilteringjs">trunk/LayoutTests/contentfiltering/resources/contentfiltering.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreloaderContentFiltercpp">trunk/Source/WebCore/loader/ContentFilter.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderContentFilterh">trunk/Source/WebCore/loader/ContentFilter.h</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="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulerh">trunk/Source/WebCore/loader/NavigationScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloaderPolicyCheckercpp">trunk/Source/WebCore/loader/PolicyChecker.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitErrorsh">trunk/Source/WebKit/mac/Misc/WebKitErrors.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitErrorsm">trunk/Source/WebKit/mac/Misc/WebKitErrors.m</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKErrorRefh">trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebErrorsh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsTestWebKitAPIxcconfig">trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringPlugInmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscontentfilteringallowafteradddataexpectedhtml">trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowafterfinishedaddingdataexpectedhtml">trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowafterresponseexpectedhtml">trunk/LayoutTests/contentfiltering/allow-after-response-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowafterwillsendrequestexpectedhtml">trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowneverexpectedhtml">trunk/LayoutTests/contentfiltering/allow-never-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddataexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddatathenallowunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddatathendenyunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterfinishedaddingdataexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathenallowunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathendenyunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponseexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-response-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponsethenallowunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponsethendenyunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterwillsendrequestexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterwillsendrequestthenallowunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterwillsendrequestthendenyunblockexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockneverexpectedhtml">trunk/LayoutTests/contentfiltering/block-never-expected.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscontentfilteringallowafteradddataexpectedtxt">trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowafterfinishedaddingdataexpectedtxt">trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowafterresponseexpectedtxt">trunk/LayoutTests/contentfiltering/allow-after-response-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowafterwillsendrequestexpectedtxt">trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringallowneverexpectedtxt">trunk/LayoutTests/contentfiltering/allow-never-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddataexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-add-data-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddatathenallowunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddatathendenyunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterfinishedaddingdataexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathenallowunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathendenyunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponseexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-response-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponsethenallowunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponsethendenyunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterwillsendrequestexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterwillsendrequestthenallowunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterwillsendrequestthendenyunblockexpectedtxt">trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockneverexpectedtxt">trunk/LayoutTests/contentfiltering/block-never-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreResourcesContentFilterBlockedPagehtml">trunk/Source/WebCore/Resources/ContentFilterBlockedPage.html</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacContentFilteringmm">trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/ChangeLog 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202944.
+ https://bugs.webkit.org/show_bug.cgi?id=159570
+
+ caused some tests to crash under GuardMalloc (Requested by
+ estes on #webkit).
+
+ Reverted changeset:
+
+ "[Content Filtering] Load blocked pages more like other error
+ pages are loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=159485
+ http://trac.webkit.org/changeset/202944
+
</ins><span class="cx"> 2016-07-08 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Eliminate test noise from roles-computedRoleString.html
</span></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafteradddataexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafteradddataexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/allow-after-add-data-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/allow-after-add-data.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafterfinishedaddingdataexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafterfinishedaddingdataexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/allow-after-finished-adding-data.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafterresponseexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/allow-after-response-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-response-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/allow-after-response-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafterresponseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/allow-after-response-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-response-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/allow-after-response-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/allow-after-response.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafterwillsendrequestexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowafterwillsendrequestexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/allow-after-will-send-request.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowneverexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/allow-never-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-never-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/allow-never-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringallowneverexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/allow-never-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/allow-never-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/allow-never-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/allow-never.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddataexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddataexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-add-data-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-add-data.html **nav target**
- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddatathenallowunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddatathenallowunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-add-data-then-allow-unblock.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddatathendenyunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddatathendenyunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-add-data-then-deny-unblock.html **nav target**
- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterfinishedaddingdataexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterfinishedaddingdataexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-finished-adding-data.html **nav target**
- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathenallowunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathenallowunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-finished-adding-data-then-allow-unblock.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathendenyunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterfinishedaddingdatathendenyunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-finished-adding-data-then-deny-unblock.html **nav target**
- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponseexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-response-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-response-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-response-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-response-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-response.html **nav target**
- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponsethenallowunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponsethenallowunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-response-then-allow-unblock.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponsethendenyunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponsethendenyunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-response-then-deny-unblock.html **nav target**
- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterwillsendrequestexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterwillsendrequestexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-will-send-request.html **nav target**
- about:blank (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterwillsendrequestthenallowunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterwillsendrequestthenallowunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-will-send-request-then-allow-unblock.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterwillsendrequestthendenyunblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterwillsendrequestthendenyunblockexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-after-will-send-request-then-deny-unblock.html **nav target**
- about:blank (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockneverexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/contentfiltering/block-never-expected.html (0 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-never-expected.html (rev 0)
+++ trunk/LayoutTests/contentfiltering/block-never-expected.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/pass.html"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockneverexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/contentfiltering/block-never-expected.txt (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-never-expected.txt 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/block-never-expected.txt 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
-
-============== Back Forward List ==============
-curr-> (file test):contentfiltering/block-never.html **nav target**
- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->")
-===============================================
</del></span></pre></div>
<a id="trunkLayoutTestscontentfilteringresourcescontentfilteringjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/contentfiltering/resources/contentfiltering.js (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/resources/contentfiltering.js 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/LayoutTests/contentfiltering/resources/contentfiltering.js 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -33,11 +33,7 @@
</span><span class="cx"> }, false);
</span><span class="cx"> iframe.contentDocument.location = settings.unblockRequestURL;
</span><span class="cx"> }, false);
</span><del>-
- if (blockedStringText === "FAIL")
- iframe.src = "resources/pass.html";
- else
- iframe.src = "resources/fail.html";
</del><ins>+ iframe.src = "data:text/html,<!DOCTYPE html><body>" + (blockedStringText === "FAIL" ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function testContentFiltering(decisionPoint, decision, decideAfterUnblockRequest)
</span><span class="lines">@@ -53,10 +49,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.testRunner.waitUntilDone();
</span><del>- window.testRunner.dumpAsText();
- window.testRunner.dumpChildFramesAsText();
- window.testRunner.dumpBackForwardList();
- window.testRunner.dumpFrameLoadCallbacks();
</del><span class="cx"> window.addEventListener("load", function(event) {
</span><span class="cx"> _doTest(decisionPoint, decision, decideAfterUnblockRequest);
</span><span class="cx"> }, false);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202944.
+ https://bugs.webkit.org/show_bug.cgi?id=159570
+
+ caused some tests to crash under GuardMalloc (Requested by
+ estes on #webkit).
+
+ Reverted changeset:
+
+ "[Content Filtering] Load blocked pages more like other error
+ pages are loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=159485
+ http://trac.webkit.org/changeset/202944
+
</ins><span class="cx"> 2016-07-08 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r201805): Crash with <use> resource that has Vary header
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1117,5 +1117,3 @@
</span><span class="cx"> /* An ARIA accessibility group that acts as an dialog. */
</span><span class="cx"> "web dialog" = "web dialog";
</span><span class="cx">
</span><del>-/* WebKitErrorFrameLoadBlockedByContentFilter description */
-"The URL was blocked by a content filter" = "The URL was blocked by a content filter";
</del></span></pre></div>
<a id="trunkSourceWebCoreResourcesContentFilterBlockedPagehtml"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Resources/ContentFilterBlockedPage.html (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Resources/ContentFilterBlockedPage.html 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/Resources/ContentFilterBlockedPage.html 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-<!-- This file intentionally left blank -->
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -4186,7 +4186,6 @@
</span><span class="cx"> A19D93471A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A19D93451A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h */; };
</span><span class="cx"> A19D934A1AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A19D93481AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm */; };
</span><span class="cx"> A19D934B1AA11B1E00B46C24 /* NetworkExtensionContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A19D93491AA11B1E00B46C24 /* NetworkExtensionContentFilter.h */; };
</span><del>- A1AA9AB91D23911500FEADB3 /* ContentFilterBlockedPage.html in Resources */ = {isa = PBXBuildFile; fileRef = A1AA9AB81D23911500FEADB3 /* ContentFilterBlockedPage.html */; };
</del><span class="cx"> A1B5B29E1AAA846E008B6042 /* MockContentFilterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1B5B29C1AAA846E008B6042 /* MockContentFilterSettings.cpp */; };
</span><span class="cx"> A1B5B29F1AAA846F008B6042 /* MockContentFilterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A1B5B29D1AAA846E008B6042 /* MockContentFilterSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A1BF6B821AA96C7D00AF4A8A /* MockContentFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1BF6B801AA96C7D00AF4A8A /* MockContentFilter.cpp */; };
</span><span class="lines">@@ -11986,7 +11985,6 @@
</span><span class="cx"> A19D93451A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFilterEvaluatorSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> A19D93481AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkExtensionContentFilter.mm; sourceTree = "<group>"; };
</span><span class="cx"> A19D93491AA11B1E00B46C24 /* NetworkExtensionContentFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkExtensionContentFilter.h; sourceTree = "<group>"; };
</span><del>- A1AA9AB81D23911500FEADB3 /* ContentFilterBlockedPage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ContentFilterBlockedPage.html; sourceTree = "<group>"; };
</del><span class="cx"> A1B5B29C1AAA846E008B6042 /* MockContentFilterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockContentFilterSettings.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A1B5B29D1AAA846E008B6042 /* MockContentFilterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockContentFilterSettings.h; sourceTree = "<group>"; };
</span><span class="cx"> A1BF6B801AA96C7D00AF4A8A /* MockContentFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockContentFilter.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16058,7 +16056,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> CD0DBB3E142274E600280263 /* audio */,
</span><span class="cx"> 65998A650E5F5FD3004E097A /* images */,
</span><del>- A1AA9AB81D23911500FEADB3 /* ContentFilterBlockedPage.html */,
</del><span class="cx"> A11E8C001B1E28BE0003A7C7 /* copyCursor.png */,
</span><span class="cx"> 7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */,
</span><span class="cx"> 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */,
</span><span class="lines">@@ -29168,7 +29165,6 @@
</span><span class="cx"> 93153BDA14181F7A00FCF5BE /* missingImage@2x.png in Resources */,
</span><span class="cx"> 318891611AB7EEA100EA627B /* missingImage@3x.png in Resources */,
</span><span class="cx"> A11E8C061B1E28FA0003A7C7 /* moveCursor.png in Resources */,
</span><del>- A1AA9AB91D23911500FEADB3 /* ContentFilterBlockedPage.html in Resources */,
</del><span class="cx"> A11E8C071B1E28FE0003A7C7 /* northEastSouthWestResizeCursor.png in Resources */,
</span><span class="cx"> A11E8C081B1E29020003A7C7 /* northSouthResizeCursor.png in Resources */,
</span><span class="cx"> A11E8C091B1E29070003A7C7 /* northWestSouthEastResizeCursor.png in Resources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderContentFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ContentFilter.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ContentFilter.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/ContentFilter.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,17 +31,11 @@
</span><span class="cx"> #include "CachedRawResource.h"
</span><span class="cx"> #include "ContentFilterUnblockHandler.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><del>-#include "Frame.h"
-#include "FrameLoadRequest.h"
-#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkExtensionContentFilter.h"
</span><span class="cx"> #include "ParentalControlsContentFilter.h"
</span><del>-#include "ScriptController.h"
</del><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/TemporaryChange.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="lines">@@ -125,11 +119,34 @@
</span><span class="cx">
</span><span class="cx"> void ContentFilter::stopFilteringMainResource()
</span><span class="cx"> {
</span><del>- if (m_state != State::Blocked)
- m_state = State::Stopped;
</del><ins>+ m_state = State::Stopped;
</ins><span class="cx"> m_mainResource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ContentFilterUnblockHandler ContentFilter::unblockHandler() const
+{
+ ASSERT(m_state == State::Blocked);
+ ASSERT(m_blockingContentFilter);
+ ASSERT(m_blockingContentFilter->didBlockData());
+ return m_blockingContentFilter->unblockHandler();
+}
+
+Ref<SharedBuffer> ContentFilter::replacementData() const
+{
+ ASSERT(m_state == State::Blocked);
+ ASSERT(m_blockingContentFilter);
+ ASSERT(m_blockingContentFilter->didBlockData());
+ return m_blockingContentFilter->replacementData();
+}
+
+String ContentFilter::unblockRequestDeniedScript() const
+{
+ ASSERT(m_state == State::Blocked);
+ ASSERT(m_blockingContentFilter);
+ ASSERT(m_blockingContentFilter->didBlockData());
+ return m_blockingContentFilter->unblockRequestDeniedScript();
+}
+
</ins><span class="cx"> bool ContentFilter::continueAfterResponseReceived(CachedResource* resource, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(resource, resource == m_mainResource);
</span><span class="lines">@@ -219,24 +236,8 @@
</span><span class="cx"> ASSERT(state == State::Allowed || state == State::Blocked);
</span><span class="cx"> LOG(ContentFiltering, "ContentFilter decided load should be %s for main resource at <%s>.\n", state == State::Allowed ? "allowed" : "blocked", m_mainResource ? m_mainResource->url().string().ascii().data() : "");
</span><span class="cx"> m_state = state;
</span><del>- if (m_state != State::Blocked)
- return;
-
- ContentFilterUnblockHandler unblockHandler { m_blockingContentFilter->unblockHandler() };
- unblockHandler.setUnreachableURL(m_documentLoader.documentURL());
- RefPtr<Frame> frame { m_documentLoader.frame() };
- String unblockRequestDeniedScript { m_blockingContentFilter->unblockRequestDeniedScript() };
- if (!unblockRequestDeniedScript.isEmpty() && frame) {
- static_assert(std::is_base_of<ThreadSafeRefCounted<Frame>, Frame>::value, "Frame must be ThreadSafeRefCounted.");
- unblockHandler.wrapWithDecisionHandler([frame = WTFMove(frame), script = unblockRequestDeniedScript.isolatedCopy()](bool unblocked) {
- if (!unblocked)
- frame->script().executeScript(script);
- });
- }
- m_documentLoader.frameLoader()->client().contentFilterDidBlockLoad(WTFMove(unblockHandler));
-
- m_blockedError = m_documentLoader.frameLoader()->blockedByContentFilterError(m_documentLoader.request());
- m_documentLoader.cancelMainResourceLoad(m_blockedError);
</del><ins>+ if (m_state == State::Blocked)
+ m_documentLoader.contentFilterDidBlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContentFilter::deliverResourceData(CachedResource& resource)
</span><span class="lines">@@ -247,51 +248,6 @@
</span><span class="cx"> m_documentLoader.dataReceived(&resource, resourceBuffer->data(), resourceBuffer->size());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const URL& blockedPageURL()
-{
- static LazyNeverDestroyed<URL> blockedPageURL;
- static std::once_flag onceFlag;
- std::call_once(onceFlag, [] {
- auto webCoreBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebCore"));
- auto blockedPageCFURL = adoptCF(CFBundleCopyResourceURL(webCoreBundle, CFSTR("ContentFilterBlockedPage"), CFSTR("html"), nullptr));
- blockedPageURL.construct(blockedPageCFURL.get());
- });
-
- return blockedPageURL;
-}
-
-bool ContentFilter::continueAfterSubstituteDataRequest(const DocumentLoader& activeLoader, const SubstituteData& substituteData)
-{
- if (auto contentFilter = activeLoader.contentFilter()) {
- if (contentFilter->m_state == State::Blocked && !contentFilter->m_isLoadingBlockedPage)
- return contentFilter->m_blockedError.failingURL() != substituteData.failingURL();
- }
-
- if (activeLoader.request().url() == blockedPageURL()) {
- ASSERT(activeLoader.substituteData().isValid());
- return activeLoader.substituteData().failingURL() != substituteData.failingURL();
- }
-
- return true;
-}
-
-void ContentFilter::handleProvisionalLoadFailure(const ResourceError& error)
-{
- if (m_state != State::Blocked)
- return;
-
- if (m_blockedError.errorCode() != error.errorCode() || m_blockedError.domain() != error.domain())
- return;
-
- ASSERT(m_blockedError.failingURL() == error.failingURL());
-
- RefPtr<SharedBuffer> replacementData { m_blockingContentFilter->replacementData() };
- ResourceResponse response { URL(), ASCIILiteral("text/html"), replacementData->size(), ASCIILiteral("UTF-8") };
- SubstituteData substituteData { WTFMove(replacementData), error.failingURL(), response, SubstituteData::SessionHistoryVisibility::Hidden };
- TemporaryChange<bool> loadingBlockedPage { m_isLoadingBlockedPage, true };
- m_documentLoader.frameLoader()->load(FrameLoadRequest(m_documentLoader.frame(), blockedPageURL(), ShouldOpenExternalURLsPolicy::ShouldNotAllow, substituteData));
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTENT_FILTERING)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ContentFilter.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ContentFilter.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/ContentFilter.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef ContentFilter_h
+#define ContentFilter_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "PlatformContentFilter.h"
</span><del>-#include "ResourceError.h"
</del><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -36,10 +36,11 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CachedRawResource;
</span><ins>+class ContentFilterUnblockHandler;
</ins><span class="cx"> class DocumentLoader;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><del>-class SubstituteData;
</del><ins>+class SharedBuffer;
</ins><span class="cx">
</span><span class="cx"> class ContentFilter {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -61,8 +62,9 @@
</span><span class="cx"> bool continueAfterDataReceived(CachedResource*, const char* data, int length);
</span><span class="cx"> bool continueAfterNotifyFinished(CachedResource*);
</span><span class="cx">
</span><del>- static bool continueAfterSubstituteDataRequest(const DocumentLoader& activeLoader, const SubstituteData&);
- void handleProvisionalLoadFailure(const ResourceError&);
</del><ins>+ ContentFilterUnblockHandler unblockHandler() const;
+ Ref<SharedBuffer> replacementData() const;
+ String unblockRequestDeniedScript() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> using State = PlatformContentFilter::State;
</span><span class="lines">@@ -86,8 +88,6 @@
</span><span class="cx"> CachedResourceHandle<CachedRawResource> m_mainResource;
</span><span class="cx"> PlatformContentFilter* m_blockingContentFilter { nullptr };
</span><span class="cx"> State m_state { State::Stopped };
</span><del>- ResourceError m_blockedError;
- bool m_isLoadingBlockedPage { false };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="lines">@@ -100,3 +100,5 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTENT_FILTERING)
</span><ins>+
+#endif // ContentFilter_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2008, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceLoadObserver.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><ins>+#include "ScriptController.h"
</ins><span class="cx"> #include "SecurityPolicy.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="lines">@@ -1707,10 +1708,37 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>-ContentFilter* DocumentLoader::contentFilter() const
</del><ins>+void DocumentLoader::installContentFilterUnblockHandler(ContentFilter& contentFilter)
</ins><span class="cx"> {
</span><del>- return m_contentFilter.get();
</del><ins>+ ContentFilterUnblockHandler unblockHandler { contentFilter.unblockHandler() };
+ unblockHandler.setUnreachableURL(documentURL());
+ RefPtr<Frame> frame { this->frame() };
+ String unblockRequestDeniedScript { contentFilter.unblockRequestDeniedScript() };
+ if (!unblockRequestDeniedScript.isEmpty() && frame) {
+ static_assert(std::is_base_of<ThreadSafeRefCounted<Frame>, Frame>::value, "Frame must be ThreadSafeRefCounted.");
+ unblockHandler.wrapWithDecisionHandler([frame = WTFMove(frame), script = unblockRequestDeniedScript.isolatedCopy()](bool unblocked) {
+ if (!unblocked)
+ frame->script().executeScript(script);
+ });
+ }
+ frameLoader()->client().contentFilterDidBlockLoad(WTFMove(unblockHandler));
</ins><span class="cx"> }
</span><ins>+
+void DocumentLoader::contentFilterDidBlock()
+{
+ ASSERT(m_contentFilter);
+
+ installContentFilterUnblockHandler(*m_contentFilter);
+
+ URL blockedURL;
+ blockedURL.setProtocol(ContentFilter::urlScheme());
+ blockedURL.setHost(ASCIILiteral("blocked-page"));
+ auto replacementData = m_contentFilter->replacementData();
+ ResourceResponse response(URL(), ASCIILiteral("text/html"), replacementData->size(), ASCIILiteral("UTF-8"));
+ SubstituteData substituteData { adoptRef(&replacementData.leakRef()), documentURL(), response, SubstituteData::SessionHistoryVisibility::Hidden };
+ frame()->navigationScheduler().scheduleSubstituteDataLoad(blockedURL, substituteData);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef DocumentLoader_h
+#define DocumentLoader_h
</ins><span class="cx">
</span><span class="cx"> #include "CachedRawResourceClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="lines">@@ -67,7 +68,6 @@
</span><span class="cx"> class ArchiveResourceCollection;
</span><span class="cx"> class CachedRawResource;
</span><span class="cx"> class CachedResourceLoader;
</span><del>- class ContentFilter;
</del><span class="cx"> class FormState;
</span><span class="cx"> class Frame;
</span><span class="cx"> class FrameLoader;
</span><span class="lines">@@ -77,12 +77,15 @@
</span><span class="cx"> class SubresourceLoader;
</span><span class="cx"> class SubstituteResource;
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ class ContentFilter;
+#endif
+
</ins><span class="cx"> typedef HashMap<unsigned long, RefPtr<ResourceLoader>> ResourceLoaderMap;
</span><span class="cx"> typedef Vector<ResourceResponse> ResponseVector;
</span><span class="cx">
</span><span class="cx"> class DocumentLoader : public RefCounted<DocumentLoader>, private CachedRawResourceClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><del>- friend class ContentFilter;
</del><span class="cx"> public:
</span><span class="cx"> static Ref<DocumentLoader> create(const ResourceRequest& request, const SubstituteData& data)
</span><span class="cx"> {
</span><span class="lines">@@ -282,10 +285,6 @@
</span><span class="cx"> void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) { m_shouldOpenExternalURLsPolicy = shouldOpenExternalURLsPolicy; }
</span><span class="cx"> ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicyToPropagate() const;
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
- ContentFilter* contentFilter() const;
-#endif
-
</del><span class="cx"> protected:
</span><span class="cx"> WEBCORE_EXPORT DocumentLoader(const ResourceRequest&, const SubstituteData&);
</span><span class="cx">
</span><span class="lines">@@ -349,6 +348,12 @@
</span><span class="cx"> void cancelPolicyCheckIfNeeded();
</span><span class="cx"> void becomeMainResourceClient();
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ friend class ContentFilter;
+ void installContentFilterUnblockHandler(ContentFilter&);
+ void contentFilterDidBlock();
+#endif
+
</ins><span class="cx"> Frame* m_frame;
</span><span class="cx"> Ref<CachedResourceLoader> m_cachedResourceLoader;
</span><span class="cx">
</span><span class="lines">@@ -474,3 +479,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif // DocumentLoader_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2006 Eric Seidel (eric@webkit.org)
</span><del>- * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2012, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> * Copyright (C) 2012 Samsung Electronics. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -336,9 +336,6 @@
</span><span class="cx"> ResourceError blockedByContentBlockerError(const ResourceRequest&) override { return { }; }
</span><span class="cx"> ResourceError cannotShowURLError(const ResourceRequest&) override { return { }; }
</span><span class="cx"> ResourceError interruptedForPolicyChangeError(const ResourceRequest&) override { return { }; }
</span><del>-#if ENABLE(CONTENT_FILTERING)
- ResourceError blockedByContentFilterError(const ResourceRequest&) override { return { }; }
-#endif
</del><span class="cx">
</span><span class="cx"> ResourceError cannotShowMIMETypeError(const ResourceResponse&) override { return { }; }
</span><span class="cx"> ResourceError fileDoesNotExistError(const ResourceResponse&) override { return { }; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><del>-#include "ContentFilter.h"
</del><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "DOMImplementation.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="lines">@@ -1340,8 +1339,6 @@
</span><span class="cx"> type = FrameLoadType::Same;
</span><span class="cx"> } else if (shouldTreatURLAsSameAsCurrent(newDocumentLoader->unreachableURL()) && m_loadType == FrameLoadType::Reload)
</span><span class="cx"> type = FrameLoadType::Reload;
</span><del>- else if (m_loadType == FrameLoadType::RedirectWithLockedBackForwardList && !newDocumentLoader->unreachableURL().isEmpty() && newDocumentLoader->substituteData().isValid())
- type = FrameLoadType::RedirectWithLockedBackForwardList;
</del><span class="cx"> else
</span><span class="cx"> type = FrameLoadType::Standard;
</span><span class="cx">
</span><span class="lines">@@ -2244,10 +2241,6 @@
</span><span class="cx"> if (!pdl->isLoadingInAPISense() || pdl->isStopping()) {
</span><span class="cx"> m_provisionalLoadErrorBeingHandledURL = m_provisionalDocumentLoader->url();
</span><span class="cx"> m_client.dispatchDidFailProvisionalLoad(error);
</span><del>-#if ENABLE(CONTENT_FILTERING)
- if (auto contentFilter = pdl->contentFilter())
- contentFilter->handleProvisionalLoadFailure(error);
-#endif
</del><span class="cx"> m_provisionalLoadErrorBeingHandledURL = { };
</span><span class="cx">
</span><span class="cx"> ASSERT(!pdl->isLoading());
</span><span class="lines">@@ -3448,15 +3441,6 @@
</span><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
-ResourceError FrameLoader::blockedByContentFilterError(const ResourceRequest& request) const
-{
- ResourceError error = m_client.blockedByContentFilterError(request);
- error.setType(ResourceError::Type::General);
- return error;
-}
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<CFDictionaryRef> FrameLoader::connectionProperties(ResourceLoader* loader)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -171,9 +171,6 @@
</span><span class="cx"> WEBCORE_EXPORT ResourceError cancelledError(const ResourceRequest&) const;
</span><span class="cx"> WEBCORE_EXPORT ResourceError blockedByContentBlockerError(const ResourceRequest&) const;
</span><span class="cx"> ResourceError blockedError(const ResourceRequest&) const;
</span><del>-#if ENABLE(CONTENT_FILTERING)
- ResourceError blockedByContentFilterError(const ResourceRequest&) const;
-#endif
</del><span class="cx">
</span><span class="cx"> bool isHostedByObjectElement() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef FrameLoaderClient_h
+#define FrameLoaderClient_h
</ins><span class="cx">
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "LayoutMilestones.h"
</span><span class="lines">@@ -231,9 +232,6 @@
</span><span class="cx"> virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) = 0;
</span><span class="cx"> virtual ResourceError cannotShowURLError(const ResourceRequest&) = 0;
</span><span class="cx"> virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) = 0;
</span><del>-#if ENABLE(CONTENT_FILTERING)
- virtual ResourceError blockedByContentFilterError(const ResourceRequest&) = 0;
-#endif
</del><span class="cx">
</span><span class="cx"> virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) = 0;
</span><span class="cx"> virtual ResourceError fileDoesNotExistError(const ResourceResponse&) = 0;
</span><span class="lines">@@ -357,3 +355,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // FrameLoaderClient_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2010, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2009 Adam Barth. All rights reserved.
</span><span class="lines">@@ -323,6 +323,26 @@
</span><span class="cx"> Document& m_originDocument;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class ScheduledSubstituteDataLoad : public ScheduledNavigation {
+public:
+ ScheduledSubstituteDataLoad(const URL& baseURL, const SubstituteData& substituteData)
+ : ScheduledNavigation { 0, LockHistory::No, LockBackForwardList::No, false, false }
+ , m_baseURL { baseURL }
+ , m_substituteData { substituteData }
+ {
+ }
+
+ void fire(Frame& frame) override
+ {
+ UserGestureIndicator gestureIndicator { wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture };
+ frame.loader().load(FrameLoadRequest { &frame, m_baseURL, m_shouldOpenExternalURLsPolicy, m_substituteData });
+ }
+
+private:
+ URL m_baseURL;
+ SubstituteData m_substituteData;
+};
+
</ins><span class="cx"> NavigationScheduler::NavigationScheduler(Frame& frame)
</span><span class="cx"> : m_frame(frame)
</span><span class="cx"> , m_timer(*this, &NavigationScheduler::timerFired)
</span><span class="lines">@@ -479,6 +499,12 @@
</span><span class="cx"> schedule(std::make_unique<ScheduledHistoryNavigation>(steps));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationScheduler::scheduleSubstituteDataLoad(const URL& baseURL, const SubstituteData& substituteData)
+{
+ if (shouldScheduleNavigation())
+ schedule(std::make_unique<ScheduledSubstituteDataLoad>(baseURL, substituteData));
+}
+
</ins><span class="cx"> void NavigationScheduler::schedulePageBlock(Document& originDocument)
</span><span class="cx"> {
</span><span class="cx"> if (shouldScheduleNavigation())
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/NavigationScheduler.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2009 Adam Barth. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef NavigationScheduler_h
+#define NavigationScheduler_h
</ins><span class="cx">
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="lines">@@ -41,6 +42,7 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class ScheduledNavigation;
</span><span class="cx"> class SecurityOrigin;
</span><ins>+class SubstituteData;
</ins><span class="cx"> class URL;
</span><span class="cx">
</span><span class="cx"> class NavigationDisablerForBeforeUnload {
</span><span class="lines">@@ -73,6 +75,7 @@
</span><span class="cx"> void scheduleFormSubmission(PassRefPtr<FormSubmission>);
</span><span class="cx"> void scheduleRefresh(Document* initiatingDocument);
</span><span class="cx"> void scheduleHistoryNavigation(int steps);
</span><ins>+ void scheduleSubstituteDataLoad(const URL& baseURL, const SubstituteData&);
</ins><span class="cx"> void schedulePageBlock(Document& originDocument);
</span><span class="cx">
</span><span class="cx"> void startTimer();
</span><span class="lines">@@ -95,3 +98,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // NavigationScheduler_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreloaderPolicyCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PolicyChecker.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebCore/loader/PolicyChecker.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PolicyChecker.h"
</span><span class="cx">
</span><del>-#include "ContentFilter.h"
</del><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="lines">@@ -92,15 +91,10 @@
</span><span class="cx">
</span><span class="cx"> // We are always willing to show alternate content for unreachable URLs;
</span><span class="cx"> // treat it like a reload so it maintains the right state for b/f list.
</span><del>- auto& substituteData = loader->substituteData();
- if (substituteData.isValid() && !substituteData.failingURL().isEmpty()) {
- bool shouldContinue = true;
-#if ENABLE(CONTENT_FILTERING)
- shouldContinue = ContentFilter::continueAfterSubstituteDataRequest(*m_frame.loader().activeDocumentLoader(), substituteData);
-#endif
</del><ins>+ if (loader->substituteData().isValid() && !loader->substituteData().failingURL().isEmpty()) {
</ins><span class="cx"> if (isBackForwardLoadType(m_loadType))
</span><span class="cx"> m_loadType = FrameLoadType::Reload;
</span><del>- function(request, 0, shouldContinue);
</del><ins>+ function(request, 0, true);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202944.
+ https://bugs.webkit.org/show_bug.cgi?id=159570
+
+ caused some tests to crash under GuardMalloc (Requested by
+ estes on #webkit).
+
+ Reverted changeset:
+
+ "[Content Filtering] Load blocked pages more like other error
+ pages are loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=159485
+ http://trac.webkit.org/changeset/202944
+
</ins><span class="cx"> 2016-07-08 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Define DYLD_MACOSX_VERSION_10_12
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitErrorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitErrors.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitErrors.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit/mac/Misc/WebKitErrors.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -38,13 +38,11 @@
</span><span class="cx"> @constant WebKitErrorCannotShowMIMEType
</span><span class="cx"> @constant WebKitErrorCannotShowURL
</span><span class="cx"> @constant WebKitErrorFrameLoadInterruptedByPolicyChange
</span><del>- @constant WebKitErrorFrameLoadBlockedByContentFilter
</del><span class="cx"> */
</span><span class="cx"> enum {
</span><span class="cx"> WebKitErrorCannotShowMIMEType = 100,
</span><span class="cx"> WebKitErrorCannotShowURL = 101,
</span><span class="cx"> WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
</span><del>- WebKitErrorFrameLoadBlockedByContentFilter = 105,
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitErrorsm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitErrors.m (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitErrors.m 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit/mac/Misc/WebKitErrors.m 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #define WebKitErrorDescriptionCannotShowURL UI_STRING_INTERNAL("The URL can’t be shown", "WebKitErrorCannotShowURL description")
</span><span class="cx"> #define WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange UI_STRING_INTERNAL("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description")
</span><span class="cx"> #define WebKitErrorDescriptionCannotUseRestrictedPort UI_STRING_INTERNAL("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description")
</span><del>-#define WebKitErrorDescriptionFrameLoadBlockedByContentFilter UI_STRING_INTERNAL("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description")
</del><span class="cx">
</span><span class="cx"> // Plug-in and java errors
</span><span class="cx"> #define WebKitErrorDescriptionCannotFindPlugin UI_STRING_INTERNAL("The plug-in can’t be found", "WebKitErrorCannotFindPlugin description")
</span><span class="lines">@@ -155,8 +154,7 @@
</span><span class="cx"> WebKitErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebKitErrorCannotShowURL],
</span><span class="cx"> WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange, [NSNumber numberWithInt: WebKitErrorFrameLoadInterruptedByPolicyChange],
</span><span class="cx"> WebKitErrorDescriptionCannotUseRestrictedPort, [NSNumber numberWithInt: WebKitErrorCannotUseRestrictedPort],
</span><del>- WebKitErrorDescriptionFrameLoadBlockedByContentFilter, [NSNumber numberWithInt: WebKitErrorFrameLoadBlockedByContentFilter],
-
</del><ins>+
</ins><span class="cx"> // Plug-in and java errors
</span><span class="cx"> WebKitErrorDescriptionCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugIn],
</span><span class="cx"> WebKitErrorDescriptionCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugIn],
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -162,7 +162,6 @@
</span><span class="cx"> WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) override;
</span><span class="cx"> WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) override;
</span><span class="cx"> WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) override;
</span><del>- WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) override;
</del><span class="cx">
</span><span class="cx"> WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) override;
</span><span class="cx"> WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -1145,11 +1145,6 @@
</span><span class="cx"> return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceError WebFrameLoaderClient::blockedByContentFilterError(const ResourceRequest& request)
-{
- return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadBlockedByContentFilter URL:request.url()];
-}
-
</del><span class="cx"> ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:WebKitErrorCannotShowMIMEType URL:response.url()];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202944.
+ https://bugs.webkit.org/show_bug.cgi?id=159570
+
+ caused some tests to crash under GuardMalloc (Requested by
+ estes on #webkit).
+
+ Reverted changeset:
+
+ "[Content Filtering] Load blocked pages more like other error
+ pages are loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=159485
+ http://trac.webkit.org/changeset/202944
+
</ins><span class="cx"> 2016-07-08 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add always-on logging for downloads
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKErrorRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> kWKErrorCodeFrameLoadInterruptedByPolicyChange = 102,
</span><span class="cx"> kWKErrorCodeCannotUseRestrictedPort = 103,
</span><span class="cx"> kWKErrorCodeFrameLoadBlockedByContentBlocker = 104,
</span><del>- kWKErrorCodeFrameLoadBlockedByContentFilter = 105,
</del><span class="cx"> kWKErrorCodeCannotFindPlugIn = 200,
</span><span class="cx"> kWKErrorCodeCannotLoadPlugIn = 201,
</span><span class="cx"> kWKErrorCodeJavaUnavailable = 202,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,20 +30,9 @@
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextHandleInternal.h"
</span><span class="cx"> #import "WKTypeRefWrapper.h"
</span><del>-#import <wtf/NeverDestroyed.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-const HashSet<String>& WebProcessProxy::platformPathsWithAssumedReadAccess()
-{
- static NeverDestroyed<HashSet<String>> platformPathsWithAssumedReadAccess(std::initializer_list<String> {
- [NSBundle bundleWithIdentifier:@"com.apple.WebCore"].resourcePath.stringByStandardizingPath,
- [NSBundle bundleWithIdentifier:@"com.apple.WebKit"].resourcePath.stringByStandardizingPath
- });
-
- return platformPathsWithAssumedReadAccess;
-}
-
</del><span class="cx"> RefPtr<ObjCObjectGraph> WebProcessProxy::transformHandlesToObjects(ObjCObjectGraph& objectGraph)
</span><span class="cx"> {
</span><span class="cx"> struct Transformer final : ObjCObjectGraph::Transformer {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -322,20 +322,12 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String path = url.fileSystemPath();
</span><del>- auto startsWithURLPath = [&path](const String& assumedAccessPath) {
</del><ins>+ for (const String& assumedAccessPath : m_localPathsWithAssumedReadAccess) {
</ins><span class="cx"> // There are no ".." components, because URL removes those.
</span><del>- return path.startsWith(assumedAccessPath);
- };
</del><ins>+ if (path.startsWith(assumedAccessPath))
+ return true;
+ }
</ins><span class="cx">
</span><del>- auto& platformPaths = platformPathsWithAssumedReadAccess();
- auto platformPathsEnd = platformPaths.end();
- if (std::find_if(platformPaths.begin(), platformPathsEnd, startsWithURLPath) != platformPathsEnd)
- return true;
-
- auto localPathsEnd = m_localPathsWithAssumedReadAccess.end();
- if (std::find_if(m_localPathsWithAssumedReadAccess.begin(), localPathsEnd, startsWithURLPath) != localPathsEnd)
- return true;
-
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1043,12 +1035,4 @@
</span><span class="cx"> callback(isWebProcessResponsive);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
-const HashSet<String>& WebProcessProxy::platformPathsWithAssumedReadAccess()
-{
- static NeverDestroyed<HashSet<String>> platformPathsWithAssumedReadAccess;
- return platformPathsWithAssumedReadAccess;
-}
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef WebProcessProxy_h
+#define WebProcessProxy_h
</ins><span class="cx">
</span><span class="cx"> #include "APISession.h"
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="lines">@@ -190,8 +191,6 @@
</span><span class="cx"> void releaseIconForPageURL(const String& pageURL);
</span><span class="cx"> void releaseRemainingIconsForPageURLs();
</span><span class="cx">
</span><del>- static const HashSet<String>& platformPathsWithAssumedReadAccess();
-
</del><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> friend class WebConnectionToWebProcess;
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="lines">@@ -259,3 +258,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // WebProcessProxy_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebErrorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef WebErrors_h
+#define WebErrors_h
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class URL;
</span><span class="lines">@@ -39,9 +40,6 @@
</span><span class="cx"> WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&);
</span><span class="cx"> WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
</span><span class="cx"> WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
</span><del>-#if ENABLE(CONTENT_FILTERING)
-WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&);
-#endif
</del><span class="cx"> WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
</span><span class="cx"> WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
</span><span class="cx"> WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
</span><span class="lines">@@ -48,3 +46,5 @@
</span><span class="cx"> WebCore::ResourceError internalError(const WebCore::URL&);
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // WebErrors_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1112,13 +1112,6 @@
</span><span class="cx"> return WebKit::interruptedForPolicyChangeError(request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
-ResourceError WebFrameLoaderClient::blockedByContentFilterError(const ResourceRequest& request)
-{
- return WebKit::blockedByContentFilterError(request);
-}
-#endif
-
</del><span class="cx"> ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> return WebKit::cannotShowMIMETypeError(response);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef WebFrameLoaderClient_h
+#define WebFrameLoaderClient_h
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span><span class="cx">
</span><span class="lines">@@ -148,9 +149,6 @@
</span><span class="cx"> WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) override;
</span><span class="cx"> WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) override;
</span><span class="cx"> WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) override;
</span><del>-#if ENABLE(CONTENT_FILTERING)
- WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) override;
-#endif
</del><span class="cx">
</span><span class="cx"> WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) override;
</span><span class="cx"> WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) override;
</span><span class="lines">@@ -270,3 +268,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // WebFrameLoaderClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -82,11 +82,6 @@
</span><span class="cx"> return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceError blockedByContentFilterError(const ResourceRequest& request)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorBlockedByContentFilter"));
-}
-
</del><span class="cx"> ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Tools/ChangeLog 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202944.
+ https://bugs.webkit.org/show_bug.cgi?id=159570
+
+ caused some tests to crash under GuardMalloc (Requested by
+ estes on #webkit).
+
+ Reverted changeset:
+
+ "[Content Filtering] Load blocked pages more like other error
+ pages are loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=159485
+ http://trac.webkit.org/changeset/202944
+
</ins><span class="cx"> 2016-07-08 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove mrobinson from the MathML watchlist
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsTestWebKitAPIxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,10 +28,8 @@
</span><span class="cx">
</span><span class="cx"> UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework JavaScriptCore -framework WebKit -lWebCoreTestSupport $(OTHER_LDFLAGS_PLATFORM);
</del><ins>+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_PLATFORM);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Cocoa -framework Carbon;
</span><span class="cx">
</span><span class="cx"> // FIXME: This should not be built on iOS. Instead we should create and use a TestWebKitAPI application.
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework WebCore -framework CoreGraphics;
</span><del>-
-LD_RUNPATH_SEARCH_PATHS = "@loader_path";
</del></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -353,7 +353,6 @@
</span><span class="cx"> 9B0786A51C5885C300D159E3 /* InjectedBundleMakeAllShadowRootOpen_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B0786A41C5885C300D159E3 /* InjectedBundleMakeAllShadowRootOpen_Bundle.cpp */; };
</span><span class="cx"> 9B26FCCA159D16DE00CC3765 /* HTMLFormCollectionNamedItem.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9B26FCB4159D15E700CC3765 /* HTMLFormCollectionNamedItem.html */; };
</span><span class="cx"> 9B4F8FA7159D52DD002D9F94 /* HTMLCollectionNamedItem.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */; };
</span><del>- A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */; };
</del><span class="cx"> A13EBBAA1B87428D00097110 /* WebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBA91B87428D00097110 /* WebProcessPlugIn.mm */; };
</span><span class="cx"> A13EBBAB1B87434600097110 /* PlatformUtilitiesCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */; };
</span><span class="cx"> A13EBBB01B87436F00097110 /* BundleParametersPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBAE1B87436F00097110 /* BundleParametersPlugIn.mm */; };
</span><span class="lines">@@ -861,7 +860,6 @@
</span><span class="cx"> 9B4F8FA3159D52B1002D9F94 /* HTMLCollectionNamedItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HTMLCollectionNamedItem.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = HTMLCollectionNamedItem.html; sourceTree = "<group>"; };
</span><span class="cx"> 9B79164F1BD89D0D00D50B8F /* FirstResponderScrollingPosition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FirstResponderScrollingPosition.mm; sourceTree = "<group>"; };
</span><del>- A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFiltering.mm; sourceTree = "<group>"; };
</del><span class="cx"> A13EBB491B87339E00097110 /* TestWebKitAPI.wkbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestWebKitAPI.wkbundle; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> A13EBB521B87346600097110 /* WebProcessPlugIn.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcessPlugIn.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> A13EBB541B8734E000097110 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="lines">@@ -1634,7 +1632,6 @@
</span><span class="cx"> 00CD9F6215BE312C002DA2CE /* BackForwardList.mm */,
</span><span class="cx"> 26DF5A5D15A29BAA003689C2 /* CancelLoadFromResourceLoadDelegate.mm */,
</span><span class="cx"> 290A9BB51735DE8A00D71BBC /* CloseNewWindowInNavigationPolicyDelegate.mm */,
</span><del>- A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */,
</del><span class="cx"> 5142B2701517C88B00C32B19 /* ContextMenuCanCopyURL.mm */,
</span><span class="cx"> 3776BC62150946BC0043A66D /* DeviceScaleFactorInDashboardRegions.mm */,
</span><span class="cx"> 939BA91614103412001A01BD /* DeviceScaleFactorOnBack.mm */,
</span><span class="lines">@@ -2098,7 +2095,6 @@
</span><span class="cx"> 7C83E0B61D0A64B300FEBCF3 /* ModalAlertsSPI.cpp in Sources */,
</span><span class="cx"> 7C83E04E1D0A641800FEBCF3 /* DFAMinimizer.cpp in Sources */,
</span><span class="cx"> 7C83E0B81D0A64BD00FEBCF3 /* InjectedBundleMakeAllShadowRootsOpen.cpp in Sources */,
</span><del>- A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */,
</del><span class="cx"> 7CCE7EF91A411AE600447C4C /* GetInjectedBundleInitializationUserDataCallback.cpp in Sources */,
</span><span class="cx"> 536770341CC8022800D425B1 /* WebScriptObjectDescription.mm in Sources */,
</span><span class="cx"> 7CCE7EE21A411A9A00447C4C /* GetPIDAfterAbortedProcessLaunch.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import <WebKit/WKNavigationDelegatePrivate.h>
</span><span class="cx"> #import <WebKit/WKProcessPoolPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><del>-#import <WebKit/WKWebViewPrivate.h>
</del><span class="cx"> #import <WebKit/_WKDownloadDelegate.h>
</span><span class="cx"> #import <WebKit/_WKRemoteObjectInterface.h>
</span><span class="cx"> #import <WebKit/_WKRemoteObjectRegistry.h>
</span><span class="lines">@@ -257,73 +256,6 @@
</span><span class="cx"> downloadTest(Decision::Block, DecisionPoint::Never);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@interface LoadAlternateNavigationDelegate : NSObject <WKNavigationDelegate>
-@end
-
-@implementation LoadAlternateNavigationDelegate
-
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
-{
- EXPECT_WK_STREQ(WebKitErrorDomain, error.domain);
- EXPECT_EQ(WebKitErrorFrameLoadBlockedByContentFilter, error.code);
- [webView _loadAlternateHTMLString:@"FAIL" baseURL:nil forUnreachableURL:[error.userInfo objectForKey:NSURLErrorFailingURLErrorKey]];
-}
-
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
-{
- [webView evaluateJavaScript:@"document.body.innerText" completionHandler:^ (id result, NSError *error) {
- EXPECT_TRUE([result isKindOfClass:[NSString class]]);
- EXPECT_WK_STREQ(@"blocked", result);
- isDone = true;
- }];
-}
-
-@end
-
-static void loadAlternateTest(Decision decision, DecisionPoint decisionPoint)
-{
- @autoreleasepool {
- [TestProtocol registerWithScheme:@"http"];
-
- auto configuration = configurationWithContentFilterSettings(decision, decisionPoint);
- auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration.get()]);
- auto navigationDelegate = adoptNS([[LoadAlternateNavigationDelegate alloc] init]);
- [webView setNavigationDelegate:navigationDelegate.get()];
- [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://redirect/?result"]]];
-
- isDone = false;
- TestWebKitAPI::Util::run(&isDone);
-
- [TestProtocol unregister];
- }
-}
-
-TEST(ContentFiltering, LoadAlternateAfterWillSendRequestWK2)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterWillSendRequest);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterRedirectWK2)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterRedirect);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterResponseWK2)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterResponse);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterAddDataWK2)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterAddData);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterFinishedAddingDataWK2)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterFinishedAddingData);
-}
-
-
</del><span class="cx"> @interface LazilyLoadPlatformFrameworksController : NSObject <WKNavigationDelegate>
</span><span class="cx"> @property (nonatomic, readonly) WKWebView *webView;
</span><span class="cx"> - (void)expectParentalControlsLoaded:(BOOL)parentalControlsShouldBeLoaded networkExtensionLoaded:(BOOL)networkExtensionShouldBeLoaded;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringPlugInmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> settings.setEnabled(true);
</span><span class="cx"> settings.setDecision(static_cast<Decision>([decoder decodeIntForKey:@"Decision"]));
</span><span class="cx"> settings.setDecisionPoint(static_cast<DecisionPoint>([decoder decodeIntForKey:@"DecisionPoint"]));
</span><del>- settings.setBlockedString(ASCIILiteral("blocked"));
</del><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacContentFilteringmm"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm (202994 => 202995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm 2016-07-08 18:01:55 UTC (rev 202994)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm 2016-07-08 18:22:46 UTC (rev 202995)
</span><span class="lines">@@ -1,108 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-
-#import "MockContentFilterSettings.h"
-#import "PlatformUtilities.h"
-#import "TestProtocol.h"
-#import <WebKit/WebKit.h>
-
-using Decision = WebCore::MockContentFilterSettings::Decision;
-using DecisionPoint = WebCore::MockContentFilterSettings::DecisionPoint;
-
-static bool isDone;
-
-@interface LoadAlternateFrameLoadDelegate : NSObject <WebFrameLoadDelegate>
-@end
-
-@implementation LoadAlternateFrameLoadDelegate
-
-- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
-{
- EXPECT_WK_STREQ(WebKitErrorDomain, error.domain);
- EXPECT_EQ(WebKitErrorFrameLoadBlockedByContentFilter, error.code);
- [frame loadAlternateHTMLString:@"FAIL" baseURL:nil forUnreachableURL:[error.userInfo objectForKey:NSURLErrorFailingURLErrorKey]];
-}
-
-- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
-{
- EXPECT_WK_STREQ(@"blocked", frame.DOMDocument.body.innerText);
- isDone = true;
-}
-
-@end
-
-namespace TestWebKitAPI {
-
-static void loadAlternateTest(Decision decision, DecisionPoint decisionPoint)
-{
- @autoreleasepool {
- auto& settings = WebCore::MockContentFilterSettings::singleton();
- settings.setEnabled(true);
- settings.setDecision(decision);
- settings.setDecisionPoint(decisionPoint);
- settings.setBlockedString(ASCIILiteral("blocked"));
- [TestProtocol registerWithScheme:@"http"];
-
- auto webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect]);
- auto frameLoadDelegate = adoptNS([[LoadAlternateFrameLoadDelegate alloc] init]);
- [webView setFrameLoadDelegate:frameLoadDelegate.get()];
- [[webView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://redirect/?result"]]];
-
- isDone = false;
- TestWebKitAPI::Util::run(&isDone);
-
- settings.setEnabled(false);
- [TestProtocol unregister];
- }
-}
-
-TEST(ContentFiltering, LoadAlternateAfterWillSendRequestWK1)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterWillSendRequest);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterRedirectWK1)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterRedirect);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterResponseWK1)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterResponse);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterAddDataWK1)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterAddData);
-}
-
-TEST(ContentFiltering, LoadAlternateAfterFinishedAddingDataWK1)
-{
- loadAlternateTest(Decision::Block, DecisionPoint::AfterFinishedAddingData);
-}
-
-} // namespace TestWebKitAPI
</del></span></pre>
</div>
</div>
</body>
</html>