<!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>[55701] 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/55701">55701</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2010-03-08 17:14:55 -0800 (Mon, 08 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore: Added a test for crash when you quit inside an unload handler.
rdar://problem/6958347

Reviewed by Dan Bernstein.

* manual-tests/quit-inside-unload.html: Added.

WebKit/mac: Fix crash when you quit inside an unload handler.
rdar://problem/6958347

Reviewed by Dan Bernstein.

Test: manual-tests/quit-inside-unload.html

* WebView/WebView.mm:
(-[WebView _closeWithFastTeardown]): Removed code to set
_private-&gt;closed since _close now does this earlier, before
calling this method.
(-[WebView _close]): Moved code to set _private-&gt;closed to the
top of this method.
(-[WebView setHostWindow:]): Rewrote the code that forbade
setting the host window after closing so that it only forbids
non-nil host windows. That way, the code to clear away the host
window can run safely after setting _private-&gt;closed, yet client
code cannot set a new host window after closing.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacWebViewWebViewmm">trunk/WebKit/mac/WebView/WebView.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebCoremanualtestsquitinsideunloadhtml">trunk/WebCore/manual-tests/quit-inside-unload.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (55700 => 55701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-09 01:08:56 UTC (rev 55700)
+++ trunk/WebCore/ChangeLog        2010-03-09 01:14:55 UTC (rev 55701)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2010-03-08  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Dan Bernstein.
+
+        Added a test for crash when you quit inside an unload handler.
+        rdar://problem/6958347
+
+        * manual-tests/quit-inside-unload.html: Added.
+
+2010-03-08  Darin Adler  &lt;darin@apple.com&gt;
+
</ins><span class="cx">         Reviewed by Jon Honeycutt.
</span><span class="cx"> 
</span><span class="cx">         Don't auto-play &lt;audio&gt; and &lt;video&gt; elements loaded in background tabs
</span></span></pre></div>
<a id="trunkWebCoremanualtestsquitinsideunloadhtml"></a>
<div class="addfile"><h4>Added: trunk/WebCore/manual-tests/quit-inside-unload.html (0 => 55701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/manual-tests/quit-inside-unload.html                                (rev 0)
+++ trunk/WebCore/manual-tests/quit-inside-unload.html        2010-03-09 01:14:55 UTC (rev 55701)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+&lt;script&gt;
+    var showedAlert = false;
+    function handleUnload()
+    {
+        if (showedAlert)
+            return;
+
+        showedAlert = true;
+        alert(&quot;Now Quit Safari. Do not dismiss this alert first.&quot;);
+    }
+&lt;/script&gt;
+&lt;body onunload=&quot;handleUnload()&quot;&gt;
+    Close this window
+&lt;/body&gt;
</ins><span class="cx">Property changes on: trunk/WebCore/manual-tests/quit-inside-unload.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="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (55700 => 55701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2010-03-09 01:08:56 UTC (rev 55700)
+++ trunk/WebKit/mac/ChangeLog        2010-03-09 01:14:55 UTC (rev 55701)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2010-03-08  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Dan Bernstein.
+
+        Fix crash when you quit inside an unload handler.
+        rdar://problem/6958347
+
+        Test: manual-tests/quit-inside-unload.html
+
+        * WebView/WebView.mm:
+        (-[WebView _closeWithFastTeardown]): Removed code to set
+        _private-&gt;closed since _close now does this earlier, before
+        calling this method.
+        (-[WebView _close]): Moved code to set _private-&gt;closed to the
+        top of this method.
+        (-[WebView setHostWindow:]): Rewrote the code that forbade
+        setting the host window after closing so that it only forbids
+        non-nil host windows. That way, the code to clear away the host
+        window can run safely after setting _private-&gt;closed, yet client
+        code cannot set a new host window after closing.
+
+2010-03-08  Darin Adler  &lt;darin@apple.com&gt;
+
</ins><span class="cx">         Roll out a file I checked in by accident.
</span><span class="cx"> 
</span><span class="cx">         * WebView/WebView.mm: Back to previous version.
</span></span></pre></div>
<a id="trunkWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebView/WebView.mm (55700 => 55701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebView/WebView.mm        2010-03-09 01:08:56 UTC (rev 55700)
+++ trunk/WebKit/mac/WebView/WebView.mm        2010-03-09 01:14:55 UTC (rev 55701)
</span><span class="lines">@@ -975,8 +975,6 @@
</span><span class="cx">     WTF::RefCountedLeakCounter::suppressMessages(&quot;At least one WebView was closed with fast teardown.&quot;);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    _private-&gt;closed = YES;
-    
</del><span class="cx">     [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
</span><span class="cx">     [[NSNotificationCenter defaultCenter] removeObserver:self];
</span><span class="cx"> 
</span><span class="lines">@@ -1009,6 +1007,8 @@
</span><span class="cx">     if (!_private || _private-&gt;closed)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    _private-&gt;closed = YES;
+
</ins><span class="cx">     [self _closingEventHandling];
</span><span class="cx"> 
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -1042,9 +1042,6 @@
</span><span class="cx"> 
</span><span class="cx">     [_private-&gt;inspector webViewClosed];
</span><span class="cx"> 
</span><del>-    // setHostWindow:nil must be called before this value is set (see 5408186)
-    _private-&gt;closed = YES;
-
</del><span class="cx">     // To avoid leaks, call removeDragCaret in case it wasn't called after moveDragCaretToPoint.
</span><span class="cx">     [self removeDragCaret];
</span><span class="cx"> 
</span><span class="lines">@@ -3339,7 +3336,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)setHostWindow:(NSWindow *)hostWindow
</span><span class="cx"> {
</span><del>-    if (_private-&gt;closed)
</del><ins>+    if (_private-&gt;closed &amp;&amp; hostWindow)
</ins><span class="cx">         return;
</span><span class="cx">     if (hostWindow == _private-&gt;hostWindow)
</span><span class="cx">         return;
</span></span></pre>
</div>
</div>

</body>
</html>