wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 673467 - Part 1. Don't create an extra SHEntry for dynamically-added iframes. r=bz

Browse Source
This commit is contained in:
Justin Lebar 2011-07-31 13:17:55 -04:00
parent 816a3f1ee5
commit a705cbbdb9
3 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/base/nsDocShell.cpp
View File

@ -1335,9 +1335,8 @@ nsDocShell::LoadURI(nsIURI * aURI,
PRUint32 selfBusy = BUSY_FLAGS_NONE;
parentDS->GetBusyFlags(&parentBusy);
GetBusyFlags(&selfBusy);
if (((parentBusy & BUSY_FLAGS_BUSY) ||
(selfBusy & BUSY_FLAGS_BUSY)) &&
shEntry) {
if (parentBusy & BUSY_FLAGS_BUSY ||
selfBusy & BUSY_FLAGS_BUSY) {
loadType = LOAD_NORMAL_REPLACE;
shEntry = nsnull;
}

1
docshell/test/browser/Makefile.in
View File

@ -62,6 +62,7 @@ _BROWSER_TEST_FILES = \
browser_bug655270.js \
file_bug655270.html \
favicon_bug655270.ico \
browser_bug673467.js \
$(NULL)
libs:: $(_BROWSER_TEST_FILES)

49
docshell/test/browser/browser_bug673467.js Normal file
View File

@ -0,0 +1,49 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test for bug 673467. In a new tab, load a page which inserts a new iframe
// before the load and then sets its location during the load. This should
// create just one SHEntry.
var doc = "data:text/html,<html><body onload='load()'>" +
"<script>" +
" var iframe = document.createElement('iframe');" +
" iframe.id = 'iframe';" +
" document.documentElement.appendChild(iframe);" +
" function load() {" +
" iframe.src = 'data:text/html,Hello!';" +
" }" +
"</script>" +
"</body></html>"
function test() {
waitForExplicitFinish();
let tab = gBrowser.addTab(doc);
let tabBrowser = tab.linkedBrowser;
tabBrowser.addEventListener('load', function(aEvent) {
tabBrowser.removeEventListener('load', arguments.callee, true);
// The main page has loaded. Now wait for the iframe to load.
let iframe = tabBrowser.contentWindow.document.getElementById('iframe');
iframe.addEventListener('load', function(aEvent) {
// Wait for the iframe to load the new document, not about:blank.
if (!iframe.src)
return;
iframe.removeEventListener('load', arguments.callee, true);
let shistory = tabBrowser.contentWindow
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.sessionHistory;
is(shistory.count, 1, 'shistory count should be 1.');
gBrowser.removeTab(tab);
finish();
}, true);
}, true);
}