<!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>[37874] 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/37874">37874</a></dd>
<dt>Author</dt> <dd>ap@webkit.org</dd>
<dt>Date</dt> <dd>2008-10-24 16:39:17 -0700 (Fri, 24 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=21836
        REGRESSION: Sign-in on Fancast.com causes crash in Webkit nightly

        Test: http/tests/xmlhttprequest/detaching-frame.html

        * xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::dropProtection): Null check the window -
        even though XHR needs a context (AKA frame) to be serviced, the frame may be disconnected
        when dispatching the same callback that results in this function being called.</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="#trunkWebCorexmlXMLHttpRequestcpp">trunk/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestdetachingframeexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestdetachingframehtml">trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesdetachedframehtml">trunk/LayoutTests/http/tests/xmlhttprequest/resources/detached-frame.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (37873 => 37874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-10-24 23:07:15 UTC (rev 37873)
+++ trunk/LayoutTests/ChangeLog        2008-10-24 23:39:17 UTC (rev 37874)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2008-10-24  Alexey Proskuryakov  &lt;ap@webkit.org&gt;
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21836
+        REGRESSION: Sign-in on Fancast.com causes crash in Webkit nightly
+
+        * http/tests/xmlhttprequest/detaching-frame-expected.txt: Added.
+        * http/tests/xmlhttprequest/detaching-frame.html: Added.
+        * http/tests/xmlhttprequest/resources/detached-frame.html: Added.
+
</ins><span class="cx"> 2008-10-24  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestdetachingframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame-expected.txt (0 => 37874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame-expected.txt                                (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame-expected.txt        2008-10-24 23:39:17 UTC (rev 37874)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Test that removing an IFRAME from an XMLHttpRequest finished callback does not cause a crash.
+
+PASS: No crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestdetachingframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame.html (0 => 37874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame.html        2008-10-24 23:39:17 UTC (rev 37874)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;body&gt;
+&lt;p&gt;Test that removing an IFRAME from an XMLHttpRequest finished callback does not cause a crash.&lt;/p&gt;
+&lt;iframe src=&quot;resources/detached-frame.html&quot;&gt;&lt;/iframe&gt;
+&lt;script&gt;
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+        layoutTestController.waitUntilDone();
+    }
+&lt;/script&gt;
+&lt;/body&gt;
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/xmlhttprequest/detaching-frame.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesdetachedframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/resources/detached-frame.html (0 => 37874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/detached-frame.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/detached-frame.html        2008-10-24 23:39:17 UTC (rev 37874)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+&lt;head&gt;
+&lt;script&gt;
+function test() {
+    var xhr = new XMLHttpRequest;
+    xhr.open(&quot;GET&quot;, &quot;detached-frame.html&quot;);
+    xhr.send();
+    window.parent.childDocument = document; // GC protect
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == xhr.DONE) {
+            var parentWindow = window.parent;
+            parentWindow.document.body.removeChild(parentWindow.document.getElementsByTagName(&quot;iframe&quot;)[0]);
+            parentWindow.document.body.innerHTML += &quot;&lt;p&gt;PASS: No crash.&lt;/p&gt;&quot;;
+            if (parentWindow.layoutTestController)
+                parentWindow.layoutTestController.notifyDone();
+        }
+    }
+}
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body onload=&quot;test()&quot;&gt;
+&lt;/body&gt;
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/xmlhttprequest/resources/detached-frame.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37873 => 37874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-24 23:07:15 UTC (rev 37873)
+++ trunk/WebCore/ChangeLog        2008-10-24 23:39:17 UTC (rev 37874)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2008-10-24  Alexey Proskuryakov  &lt;ap@webkit.org&gt;
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21836
+        REGRESSION: Sign-in on Fancast.com causes crash in Webkit nightly
+
+        Test: http/tests/xmlhttprequest/detaching-frame.html
+
+        * xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::dropProtection): Null check the window -
+        even though XHR needs a context (AKA frame) to be serviced, the frame may be disconnected
+        when dispatching the same callback that results in this function being called.
+
</ins><span class="cx"> 2008-10-24  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Gtk build fix.
</span></span></pre></div>
<a id="trunkWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/xml/XMLHttpRequest.cpp (37873 => 37874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/xml/XMLHttpRequest.cpp        2008-10-24 23:07:15 UTC (rev 37873)
+++ trunk/WebCore/xml/XMLHttpRequest.cpp        2008-10-24 23:39:17 UTC (rev 37874)
</span><span class="lines">@@ -828,10 +828,10 @@
</span><span class="cx">     // can't be recouped until the load is done, so only
</span><span class="cx">     // report the extra cost at that point.
</span><span class="cx"> 
</span><del>-    JSDOMWindow* window = toJSDOMWindow(document()-&gt;frame());
-    JSC::JSValue* wrapper = getCachedDOMObjectWrapper(*window-&gt;globalData(), this);
-    if (wrapper)
-        JSC::Heap::heap(wrapper)-&gt;reportExtraMemoryCost(m_responseText.size() * 2);
</del><ins>+    if (JSDOMWindow* window = toJSDOMWindow(document()-&gt;frame())) {
+        if (JSC::JSValue* wrapper = getCachedDOMObjectWrapper(*window-&gt;globalData(), this))
+            JSC::Heap::heap(wrapper)-&gt;reportExtraMemoryCost(m_responseText.size() * 2);
+    }
</ins><span class="cx"> 
</span><span class="cx">     unsetPendingActivity(this);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>