Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix bug 404548. r+sr=jst, a=schrep
  • Loading branch information
bzbarsky committed Nov 21, 2007
1 parent 2d5f5cc commit 2ea8702
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 3 deletions.
12 changes: 9 additions & 3 deletions docshell/base/nsDocShell.cpp
Expand Up @@ -987,11 +987,17 @@ nsDocShell::FirePageHideNotification(PRBool aIsUnload)

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);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions docshell/test/Makefile.in
Expand Up @@ -52,6 +52,8 @@ _TEST_FILES = \
test_bug344861.html \
test_bug384014.html \
test_bug387979.html \
test_bug404548.html \
bug404548-subframe.html \
$(NULL)

libs:: $(_TEST_FILES)
Expand Down
7 changes: 7 additions & 0 deletions 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>
40 changes: 40 additions & 0 deletions 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>

0 comments on commit 2ea8702

Please sign in to comment.