Fix bug 404548. r+sr=jst, a=schrep
authorbzbarsky@mit.edu
Wed, 21 Nov 2007 11:59:42 -0800
changeset 8259 dbb9e8da00d604b78077225b5fc0861c6fe7756e
parent 8258 52a7b077f2d1eb66a40c14acd8b2cd902a3a0c5f
child 8260 9863a9ad1588ea86a8159b1330a50f91931a1237
push idunknown
push userunknown
push dateunknown
reviewersschrep
bugs404548
milestone1.9b2pre
Fix bug 404548. r+sr=jst, a=schrep
docshell/base/nsDocShell.cpp
docshell/test/Makefile.in
docshell/test/bug404548-subframe.html
docshell/test/test_bug404548.html
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -982,21 +982,27 @@ nsDocShell::FirePageHideNotification(PRB
     if (mContentViewer && !mFiredUnloadEvent) {
         // Keep an explicit reference since calling PageHide could release
         // mContentViewer
         nsCOMPtr<nsIContentViewer> kungFuDeathGrip(mContentViewer);
         mFiredUnloadEvent = PR_TRUE;
 
         mContentViewer->PageHide(aIsUnload);
 
+        nsAutoTArray<nsCOMPtr<nsIDocShell>, 8> kids;
         PRInt32 i, n = mChildList.Count();
+        kids.SetCapacity(n);
         for (i = 0; i < n; i++) {
-            nsCOMPtr<nsIDocShell> shell(do_QueryInterface(ChildAt(i)));
-            if (shell) {
-                shell->FirePageHideNotification(aIsUnload);
+            kids.AppendElement(do_QueryInterface(ChildAt(i)));
+        }
+
+        n = kids.Length();
+        for (i = 0; i < n; ++i) {
+            if (kids[i]) {
+                kids[i]->FirePageHideNotification(aIsUnload);
             }
         }
     }
 
     return NS_OK;
 }
 
 //
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -47,12 +47,14 @@ DIRS += chrome \
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
 		test_bug344861.html \
 		test_bug384014.html \
 		test_bug387979.html \
+		test_bug404548.html \
+		bug404548-subframe.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/docshell/test/bug404548-subframe.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<body onload="setTimeout(function() { window.location = &quot;data:text/html,<body onload='window.opener.finishTest()'>&quot; }, 10)">
+<iframe src="data:text/html,<body onpagehide='var p = window.parent.opener; var e = window.frameElement; e.parentNode.removeChild(e); if (e.parentNode == null && e.contentWindow == null) { p.firstRemoved = true; }' ">
+</iframe>
+<iframe src="data:text/html,<body onpagehide='window.parent.opener.secondHidden = true;'">>
+</iframe>
new file mode 100644
--- /dev/null
+++ b/docshell/test/test_bug404548.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=404548
+-->
+<head>
+  <title>Test for Bug 404548</title>
+  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=404548">Mozilla Bug 404548</a>
+<p id="display">
+</p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 404548 **/
+var firstRemoved = false;
+var secondHidden = false;
+
+SimpleTest.waitForExplicitFinish();
+
+var w = window.open("bug404548-subframe.html", "", "width=10,height=10");
+
+function finishTest() {
+  is(firstRemoved, true, "Should have removed iframe from the DOM")
+  is(secondHidden, true, "Should have fired pagehide on second kid");
+  w.close();
+  SimpleTest.finish();
+}
+</script>
+</pre>
+</body>
+</html>
+