<!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>[186228] 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/186228">186228</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-02 11:33:23 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Extensions] Block synchronous XMLHTTPRequest.
<rdar://problem/21573006> and https://bugs.webkit.org/show_bug.cgi?id=146271
Reviewed by Alex Christensen.
Source/WebCore:
Test: http/tests/contentextensions/sync-xhr-blocked.html
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadResourceSynchronously): If content blocked, set up an error, clear
the response, and clear the response data.
LayoutTests:
* http/tests/contentextensions/sync-xhr-blocked-expected.txt: Added.
* http/tests/contentextensions/sync-xhr-blocked.html: Added.
* http/tests/contentextensions/sync-xhr-blocked.html.json: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentextensionssyncxhrblockedexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionssyncxhrblockedhtml">trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionssyncxhrblockedhtmljson">trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186227 => 186228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-02 17:31:57 UTC (rev 186227)
+++ trunk/LayoutTests/ChangeLog 2015-07-02 18:33:23 UTC (rev 186228)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-02 Brady Eidson <beidson@apple.com>
+
+ [Content Extensions] Block synchronous XMLHTTPRequest.
+ <rdar://problem/21573006> and https://bugs.webkit.org/show_bug.cgi?id=146271
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/contentextensions/sync-xhr-blocked-expected.txt: Added.
+ * http/tests/contentextensions/sync-xhr-blocked.html: Added.
+ * http/tests/contentextensions/sync-xhr-blocked.html.json: Added.
+
</ins><span class="cx"> 2015-07-02 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Skip new web timing test on platforms without web timing.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionssyncxhrblockedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt (0 => 186228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt 2015-07-02 18:33:23 UTC (rev 186228)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+CONSOLE MESSAGE: line 21: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/sync-xhr-blocked.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js.
+Synchronous status: 0, readyState:1, responseText:
+Synchronous status: 0, readyState:4, responseText:
+Synchronous error: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionssyncxhrblockedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html (0 => 186228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html 2015-07-02 18:33:23 UTC (rev 186228)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+function log(text) {
+ document.body.appendChild(document.createTextNode(text));
+ document.body.appendChild(document.createElement("br"));
+}
+
+function runTest() {
+ var xhr = new XMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ log("Synchronous status: " + xhr.status + ", readyState:" + xhr.readyState + ", responseText: " + xhr.responseText);
+ }
+
+ xhr.open("GET", "resources/url-blocking-test.js", false);
+ try {
+ xhr.send();
+ } catch (error) {
+ log("Synchronous error: " + error);
+ }
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body onload="runTest()">
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionssyncxhrblockedhtmljson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html.json (0 => 186228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked.html.json 2015-07-02 18:33:23 UTC (rev 186228)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": "url-blocking-test"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186227 => 186228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-02 17:31:57 UTC (rev 186227)
+++ trunk/Source/WebCore/ChangeLog 2015-07-02 18:33:23 UTC (rev 186228)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-02 Brady Eidson <beidson@apple.com>
+
+ [Content Extensions] Block synchronous XMLHTTPRequest.
+ <rdar://problem/21573006> and https://bugs.webkit.org/show_bug.cgi?id=146271
+
+ Reviewed by Alex Christensen.
+
+ Test: http/tests/contentextensions/sync-xhr-blocked.html
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadResourceSynchronously): If content blocked, set up an error, clear
+ the response, and clear the response data.
+
</ins><span class="cx"> 2015-07-01 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Aggregate profile call information on the backend to drastically reduce profile sizes
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (186227 => 186228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-07-02 17:31:57 UTC (rev 186227)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-07-02 18:33:23 UTC (rev 186228)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> #include "PolicyChecker.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><ins>+#include "ResourceLoadInfo.h"
</ins><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "SVGDocument.h"
</span><span class="cx"> #include "SVGLocatable.h"
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SubframeLoader.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><ins>+#include "UserContentController.h"
</ins><span class="cx"> #include "WindowFeatures.h"
</span><span class="cx"> #include "XMLDocumentParser.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -2691,7 +2693,24 @@
</span><span class="cx"> ResourceRequest newRequest(initialRequest);
</span><span class="cx"> requestFromDelegate(newRequest, identifier, error);
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
</ins><span class="cx"> if (error.isNull()) {
</span><ins>+ if (m_documentLoader) {
+ if (auto* page = m_frame.page()) {
+ if (auto* controller = page->userContentController())
+ controller->processContentExtensionRulesForLoad(*page, newRequest, ResourceType::Raw, *m_documentLoader);
+ }
+ }
+
+ if (newRequest.isNull()) {
+ error = ResourceError(errorDomainWebKitInternal, 0, initialRequest.url().string(), emptyString());
+ response = ResourceResponse();
+ data = nullptr;
+ }
+ }
+#endif
+
+ if (error.isNull()) {
</ins><span class="cx"> ASSERT(!newRequest.isNull());
</span><span class="cx">
</span><span class="cx"> if (!documentLoader()->applicationCacheHost()->maybeLoadSynchronously(newRequest, error, response, data)) {
</span></span></pre>
</div>
</div>
</body>
</html>