Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1405176 - Change IsFrame() in nsDocShell to be an explicitly passed attribute. r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D15967

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jonathan Kingston 2019-01-10 16:42:07 +00:00
parent 21ad33d612
commit ac833b312a
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@ -385,7 +385,8 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext)
mInvisible(false),
mHasLoadedNonBlankURI(false),
mBlankTiming(false),
mTitleValidForCurrentURI(false) {
mTitleValidForCurrentURI(false),
mIsFrame(false) {
mHistoryID.m0 = 0;
mHistoryID.m1 = 0;
mHistoryID.m2 = 0;
@ -12100,11 +12101,7 @@ nsresult nsDocShell::EnsureFind() {
return NS_OK;
}
bool nsDocShell::IsFrame() {
nsCOMPtr<nsIDocShellTreeItem> parent;
GetSameTypeParent(getter_AddRefs(parent));
return !!parent;
}
bool nsDocShell::IsFrame() { return mIsFrame; }
NS_IMETHODIMP
nsDocShell::IsBeingDestroyed(bool* aDoomed) {

4
docshell/base/nsDocShell.h
View File

@ -284,6 +284,8 @@ class nsDocShell final : public nsDocLoader,
void SetInFrameSwap(bool aInSwap) { mInFrameSwap = aInSwap; }
bool InFrameSwap();
void SetIsFrame() { mIsFrame = true; };
const mozilla::Encoding* GetForcedCharset() { return mForcedCharset; }
mozilla::HTMLEditor* GetHTMLEditorInternal();
@ -1154,6 +1156,8 @@ class nsDocShell final : public nsDocLoader,
// This flag indicates when the title is valid for the current URI.
bool mTitleValidForCurrentURI : 1;
bool mIsFrame : 1;
};
#endif /* nsDocShell_h__ */

6
dom/base/nsFrameLoader.cpp
View File

@ -2028,6 +2028,12 @@ nsresult nsFrameLoader::MaybeCreateDocShell() {
attrs.mAppId = nsIScriptSecurityManager::NO_APP_ID;
attrs.mInIsolatedMozBrowser = OwnerIsIsolatedMozBrowserFrame();
mDocShell->SetFrameType(nsIDocShell::FRAME_TYPE_BROWSER);
} else {
nsCOMPtr<nsIDocShellTreeItem> parentCheck;
mDocShell->GetSameTypeParent(getter_AddRefs(parentCheck));
if (!!parentCheck) {
mDocShell->SetIsFrame();
}
}
// Apply sandbox flags even if our owner is not an iframe, as this copies

6
testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
View File

@ -1,6 +0,0 @@
[ignore-opens-during-unload.window.html]
expected:
if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): CRASH
if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): CRASH
if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): CRASH
if debug and (os == "mac" or os == "win"): CRASH