<!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>[191099] branches/safari-601.1.46-branch</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/191099">191099</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 00:32:10 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191077">r191077</a>. rdar://problem/22993325</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorexmlXMLHttpRequestcpp">branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorexmlXMLHttpRequesth">branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestshttptestscontentextensionsasyncxhronerrorexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestscontentextensionsasyncxhronerrorhtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestscontentextensionsasyncxhronerrorhtmljson">branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191098 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-15 07:28:34 UTC (rev 191098)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-15 07:32:10 UTC (rev 191099)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r191077. rdar://problem/22993325
+
+ 2015-10-14 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Make blocked async XHR call onerror
+ https://bugs.webkit.org/show_bug.cgi?id=146706
+
+ Reviewed by Brady Eidson.
+
+ * http/tests/contentextensions/async-xhr-onerror-expected.txt: Added.
+ * http/tests/contentextensions/async-xhr-onerror.html: Added.
+ * http/tests/contentextensions/async-xhr-onerror.html.json: Added.
+
</ins><span class="cx"> 2015-10-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r190570. rdar://problem/23075838
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscontentextensionsasyncxhronerrorexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt (0 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt 2015-10-15 07:32:10 UTC (rev 191099)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+Asynchronous onreadystatechange status: 0, readyState:1, responseText:
+Finished runTest. Waiting for callbacks
+Asynchronous onreadystatechange status: 0, readyState:1, responseText:
+Finished runTest. Waiting for callbacks
+Asynchronous onreadystatechange status: 0, readyState:4, responseText:
+onerror was called.
+Asynchronous onreadystatechange status: 0, readyState:4, responseText:
+onerror was called.
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscontentextensionsasyncxhronerrorhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html (0 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html 2015-10-15 07:32:10 UTC (rev 191099)
</span><span class="lines">@@ -0,0 +1,46 @@
</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(shouldAbort) {
+ var xhr = new XMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ log("Asynchronous onreadystatechange status: " + xhr.status + ", readyState:" + xhr.readyState + ", responseText: " + xhr.responseText);
+ }
+ xhr.ontimeout = function () {
+ log("timeout - this should not be called.");
+ };
+ xhr.onerror = function () {
+ log("onerror was called.");
+ if (shouldAbort) // The second time this is called.
+ testRunner.notifyDone();
+ };
+
+ xhr.open("GET", "resources/url-blocking-test.js", true);
+ xhr.timeout = 1; // 1 ms should be too late if it is blocked.
+ try {
+ xhr.send();
+ } catch (error) {
+ log("Asynchronous error: " + error);
+ }
+ if (shouldAbort)
+ xhr.abort(); // This should not crash, obviously.
+ log("Finished runTest. Waiting for callbacks");
+}
+
+function runTests() {
+ runTest(false);
+ runTest(true);
+}
+</script>
+</head>
+<body onload="runTests()">
+</body>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscontentextensionsasyncxhronerrorhtmljson"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json (0 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json 2015-10-15 07:32:10 UTC (rev 191099)
</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="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191098 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 07:28:34 UTC (rev 191098)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 07:32:10 UTC (rev 191099)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-10-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r191077. rdar://problem/22993325
+
+ 2015-10-14 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Make blocked async XHR call onerror
+ https://bugs.webkit.org/show_bug.cgi?id=146706
+
+ Reviewed by Brady Eidson.
+
+ Test: http/tests/contentextensions/async-xhr-onerror.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::XMLHttpRequest):
+ (WebCore::XMLHttpRequest::createRequest):
+ (WebCore::XMLHttpRequest::networkError):
+ (WebCore::XMLHttpRequest::networkErrorTimerFired):
+ (WebCore::XMLHttpRequest::abortError):
+ * xml/XMLHttpRequest.h:
+ Make a timer that calls networkError in 0 time if a content blocker blocks the asynchronous load.
+ It is necessary to call setPendingActivity and dropProtection (which calls unsetPendingActivity)
+ to keep a reference to the XMLHttpRequest alive.
+
</ins><span class="cx"> 2015-10-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191008. rdar://problem/23110743
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.cpp (191098 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.cpp 2015-10-15 07:28:34 UTC (rev 191098)
+++ branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.cpp 2015-10-15 07:32:10 UTC (rev 191099)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> , m_responseCacheIsValid(false)
</span><span class="cx"> , m_resumeTimer(*this, &XMLHttpRequest::resumeTimerFired)
</span><span class="cx"> , m_dispatchErrorOnResuming(false)
</span><ins>+ , m_networkErrorTimer(*this, &XMLHttpRequest::networkErrorTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> xmlHttpRequestCounter.increment();
</span><span class="lines">@@ -778,17 +779,17 @@
</span><span class="cx"> if (m_upload)
</span><span class="cx"> request.setReportUploadProgress(true);
</span><span class="cx">
</span><del>- // ThreadableLoader::create can return null here, for example if we're no longer attached to a page.
</del><ins>+ // ThreadableLoader::create can return null here, for example if we're no longer attached to a page or if a content blocker blocks the load.
</ins><span class="cx"> // This is true while running onunload handlers.
</span><span class="cx"> // FIXME: Maybe we need to be able to send XMLHttpRequests from onunload, <http://bugs.webkit.org/show_bug.cgi?id=10904>.
</span><del>- // FIXME: Maybe create() can return null for other reasons too?
</del><span class="cx"> m_loader = ThreadableLoader::create(scriptExecutionContext(), this, request, options);
</span><del>- if (m_loader) {
- // Neither this object nor the JavaScript wrapper should be deleted while
- // a request is in progress because we need to keep the listeners alive,
- // and they are referenced by the JavaScript wrapper.
- setPendingActivity(this);
- }
</del><ins>+
+ // Neither this object nor the JavaScript wrapper should be deleted while
+ // a request is in progress because we need to keep the listeners alive,
+ // and they are referenced by the JavaScript wrapper.
+ setPendingActivity(this);
+ if (!m_loader)
+ m_networkErrorTimer.startOneShot(0);
</ins><span class="cx"> } else {
</span><span class="cx"> InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContext());
</span><span class="cx"> ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), request, *this, options);
</span><span class="lines">@@ -895,6 +896,12 @@
</span><span class="cx"> internalAbort();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void XMLHttpRequest::networkErrorTimerFired()
+{
+ networkError();
+ dropProtection();
+}
+
</ins><span class="cx"> void XMLHttpRequest::abortError()
</span><span class="cx"> {
</span><span class="cx"> genericError();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.h (191098 => 191099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.h 2015-10-15 07:28:34 UTC (rev 191098)
+++ branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.h 2015-10-15 07:32:10 UTC (rev 191099)
</span><span class="lines">@@ -259,6 +259,9 @@
</span><span class="cx">
</span><span class="cx"> Timer m_resumeTimer;
</span><span class="cx"> bool m_dispatchErrorOnResuming;
</span><ins>+
+ Timer m_networkErrorTimer;
+ void networkErrorTimerFired();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>