Bug 742944 - Part 1: Always set nsDocShell::isBrowserFrame to true, for in- and out-of-process iframes. r=bz

--HG--
extra : rebase_source : ab7e051cf7c2038ec362376277a1d97c69c5717c
This commit is contained in:
Justin Lebar 2012-06-12 18:01:24 -04:00
parent f7e8936e78
commit cc43cd9859
2 changed files with 2 additions and 1 deletions

View File

@ -11991,7 +11991,7 @@ nsDocShell::SetIsBrowserFrame(bool aValue)
// docshell-marked-as-browser-frame would have to distinguish between
// newly-created browser frames and frames which went from true to false back
// to true.)
NS_ENSURE_STATE(!mIsBrowserFrame);
NS_ENSURE_STATE(!mIsBrowserFrame || aValue);
bool wasBrowserFrame = mIsBrowserFrame;
mIsBrowserFrame = aValue;

View File

@ -62,6 +62,7 @@ BrowserElementChild.prototype = {
BrowserElementPromptService.mapWindowToBrowserElementChild(content, this);
docShell.isBrowserFrame = true;
docShell.QueryInterface(Ci.nsIWebProgress)
.addProgressListener(this._progressListener,
Ci.nsIWebProgress.NOTIFY_LOCATION |