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

--HG--
extra : rebase_source : ab7e051cf7c2038ec362376277a1d97c69c5717c

docshell/base/nsDocShell.cpp

@@ -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;

dom/browser-element/BrowserElementChild.js

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