<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[19955] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/19955">19955</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-03-04 15:30:51 -0800 (Sun, 04 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTests:
Reviewed by Darin.
<rdar://problem/5028165>
http://bugs.webkit.org/show_bug.cgi?id=12915
REGRESSION: XMLHttpRequest.abort() does not stop loading (12915)
* http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt: Added.
* http/tests/xmlhttprequest/abort-should-cancel-load.html: Added.
WebCore:
Reviewed by Darin.
<rdar://problem/5028165>
http://bugs.webkit.org/show_bug.cgi?id=12915
REGRESSION: XMLHttpRequest.abort() does not stop loading (12915)
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::stopLoading):
Save the value of m_loading since calling FrameLoader::stopLoading could set it to false.
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didCancel):
* loader/SubresourceLoader.h:
Get rid of didCancel now, it's not needed anymore.
* xml/xmlhttprequest.cpp:
(WebCore::XMLHttpRequest::abort):
Call cancel() instead of stopLoading(). Also, set m_aborted to true so the XMLHttpRequest object
won't be dereferenced in didFail when aborting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderDocumentLoadercpp">trunk/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkWebCoreloaderSubresourceLoadercpp">trunk/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkWebCoreloaderSubresourceLoaderh">trunk/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkWebCorexmlxmlhttprequestcpp">trunk/WebCore/xml/xmlhttprequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestabortshouldcancelloadexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestabortshouldcancelloadhtml">trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (19954 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2007-03-04 21:24:32 UTC (rev 19954)
+++ trunk/LayoutTests/ChangeLog 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-03-02 Anders Carlsson <acarlsson@apple.com>
+
+ Reviewed by Darin.
+
+ <rdar://problem/5028165>
+ http://bugs.webkit.org/show_bug.cgi?id=12915
+ REGRESSION: XMLHttpRequest.abort() does not stop loading (12915)
+
+ * http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt: Added.
+ * http/tests/xmlhttprequest/abort-should-cancel-load.html: Added.
+
</ins><span class="cx"> 2007-03-04 David Kilzer <ddkilzer@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Nikolas Zimmermann.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestabortshouldcancelloadexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt (0 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php - willSendRequest <NSURLRequest http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php> redirectResponse (null)
+http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php">
+This tests that calling abort() on an XHR object stops the load, causing the relevant resource load delegates to be sent.
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestabortshouldcancelloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load.html (0 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load.html 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<html>
+<head>
+<script>
+function f() {
+ req = new XMLHttpRequest();
+ req.open("GET", "resources/endlessxml.php");
+ req.send(null);
+ req.abort();
+}
+
+function runTest() {
+ console_messages = document.createElement("ul");
+ document.body.appendChild(console_messages);
+
+ if (window.layoutTestController) {
+ layoutTestController.dumpResourceLoadCallbacks();
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpAsText();
+ }
+
+ f();
+ layoutTestController.notifyDone();
+}
+
+function log(message)
+{
+ var item = document.createElement("li");
+ item.appendChild(document.createTextNode(message));
+ console_messages.appendChild(item);
+}
+</script>
+<body onload="runTest()">
+ This tests that calling abort() on an XHR object stops the load, causing the relevant resource load delegates to be sent.
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (19954 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-03-04 21:24:32 UTC (rev 19954)
+++ trunk/WebCore/ChangeLog 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2007-03-02 Anders Carlsson <acarlsson@apple.com>
+
+ Reviewed by Darin.
+
+ <rdar://problem/5028165>
+ http://bugs.webkit.org/show_bug.cgi?id=12915
+ REGRESSION: XMLHttpRequest.abort() does not stop loading (12915)
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::stopLoading):
+ Save the value of m_loading since calling FrameLoader::stopLoading could set it to false.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didCancel):
+ * loader/SubresourceLoader.h:
+ Get rid of didCancel now, it's not needed anymore.
+
+ * xml/xmlhttprequest.cpp:
+ (WebCore::XMLHttpRequest::abort):
+ Call cancel() instead of stopLoading(). Also, set m_aborted to true so the XMLHttpRequest object
+ won't be dereferenced in didFail when aborting.
+
</ins><span class="cx"> 2007-03-04 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Nikolas Zimmermann.
</span></span></pre></div>
<a id="trunkWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/DocumentLoader.cpp (19954 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/DocumentLoader.cpp 2007-03-04 21:24:32 UTC (rev 19954)
+++ trunk/WebCore/loader/DocumentLoader.cpp 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -249,16 +249,21 @@
</span><span class="cx"> // but not loads initiated by child frames' data sources -- that's the WebFrame's job.
</span><span class="cx"> void DocumentLoader::stopLoading()
</span><span class="cx"> {
</span><ins>+ // In some rare cases, calling FrameLoader::stopLoading could set m_loading to false.
+ // (This can happen when there's a single XMLHttpRequest currently loading and stopLoading causes it
+ // to stop loading. Because of this, we need to save it so we don't return early.
+ bool loading = m_loading;
+
</ins><span class="cx"> if (m_committed) {
</span><span class="cx"> // Attempt to stop the frame if the document loader is loading, or if it is done loading but
</span><span class="cx"> // still parsing. Failure to do so can cause a world leak.
</span><span class="cx"> Document* doc = m_frame->document();
</span><span class="cx">
</span><del>- if (m_loading || (doc && doc->parsing()))
</del><ins>+ if (loading || (doc && doc->parsing()))
</ins><span class="cx"> m_frame->loader()->stopLoading(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_loading)
</del><ins>+ if (!loading)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<Frame> protectFrame(m_frame);
</span></span></pre></div>
<a id="trunkWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/SubresourceLoader.cpp (19954 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/SubresourceLoader.cpp 2007-03-04 21:24:32 UTC (rev 19954)
+++ trunk/WebCore/loader/SubresourceLoader.cpp 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -231,11 +231,5 @@
</span><span class="cx"> frameLoader()->removeSubresourceLoader(this);
</span><span class="cx"> ResourceLoader::didCancel(error);
</span><span class="cx"> }
</span><del>-
-void SubresourceLoader::stopLoading()
-{
- // FIXME: This should stop loading for real and not just clear the client.
- m_client = 0;
-}
</del><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/SubresourceLoader.h (19954 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/SubresourceLoader.h 2007-03-04 21:24:32 UTC (rev 19954)
+++ trunk/WebCore/loader/SubresourceLoader.h 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx">
</span><span class="cx"> virtual ~SubresourceLoader();
</span><span class="cx">
</span><del>- void stopLoading();
-
</del><span class="cx"> virtual bool load(const ResourceRequest&);
</span><span class="cx">
</span><span class="cx"> virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
</span></span></pre></div>
<a id="trunkWebCorexmlxmlhttprequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/xml/xmlhttprequest.cpp (19954 => 19955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/xml/xmlhttprequest.cpp 2007-03-04 21:24:32 UTC (rev 19954)
+++ trunk/WebCore/xml/xmlhttprequest.cpp 2007-03-04 23:30:51 UTC (rev 19955)
</span><span class="lines">@@ -461,13 +461,14 @@
</span><span class="cx"> {
</span><span class="cx"> bool hadLoader = m_loader;
</span><span class="cx">
</span><ins>+ m_aborted = true;
+
</ins><span class="cx"> if (hadLoader) {
</span><del>- m_loader->stopLoading();
</del><ins>+ m_loader->cancel();
</ins><span class="cx"> m_loader = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_decoder = 0;
</span><del>- m_aborted = true;
</del><span class="cx">
</span><span class="cx"> if (hadLoader) {
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>