corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1496722 - Make nsIDocShellTreeItem.itemType readonly. r=peterv

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D7900
This commit is contained in:
Andreas Farre
2018-11-08 21:58:58 +00:00
parent 870e96379b
commit 6a06e4bb72
7 changed files with 22 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
docshell/base/nsDocShell.cpp
View File

@@ -311,9 +311,10 @@ DecreasePrivateDocShellCount()
}
}
nsDocShell::nsDocShell()
nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext)
: nsDocLoader()
, mContentWindowID(NextWindowID())
, mBrowsingContext(aBrowsingContext)
, mForcedCharset(nullptr)
, mParentCharset(nullptr)
, mTreeOwner(nullptr)
@@ -324,7 +325,7 @@ nsDocShell::nsDocShell()
, mParentCharsetSource(0)
, mMarginWidth(-1)
, mMarginHeight(-1)
, mItemType(typeContent)
, mItemType(aBrowsingContext->IsContent() ? typeContent : typeChrome)
, mPreviousEntryIndex(-1)
, mLoadedEntryIndex(-1)
, mChildOffset(0)
@@ -361,7 +362,7 @@ nsDocShell::nsDocShell()
, mUseStrictSecurityChecks(false)
, mObserveErrorPages(true)
, mCSSErrorReportingEnabled(false)
, mAllowAuth(true)
, mAllowAuth(mItemType == typeContent)
, mAllowKeywordFixup(false)
, mIsOffScreenBrowser(false)
, mIsActive(true)
@@ -460,8 +461,7 @@ nsDocShell::Create(BrowsingContext* aBrowsingContext)
MOZ_ASSERT(aBrowsingContext, "DocShell without a BrowsingContext!");
nsresult rv;
RefPtr<nsDocShell> ds = new nsDocShell();
ds->mBrowsingContext = aBrowsingContext;
RefPtr<nsDocShell> ds = new nsDocShell(aBrowsingContext);
// Initialize the underlying nsDocLoader.
rv = ds->nsDocLoader::Init();
@@ -506,9 +506,6 @@ nsDocShell::Create(BrowsingContext* aBrowsingContext)
return nullptr;
}
// Set our DocShellTreeItem type based on our BrowsingContext
ds->SetItemType(aBrowsingContext->IsContent() ? typeContent : typeChrome);
// If our parent is present in this process, set up our parent now.
RefPtr<BrowsingContext> parent = aBrowsingContext->GetParent();
if (parent && parent->GetDocShell()) {
@@ -2597,34 +2594,8 @@ nsDocShell::GetItemType(int32_t* aItemType)
{
NS_ENSURE_ARG_POINTER(aItemType);
*aItemType = ItemType();
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::SetItemType(int32_t aItemType)
{
NS_ENSURE_ARG((aItemType == typeChrome) || (typeContent == aItemType));
// Only allow setting the type on root docshells. Those would be the ones
// that have the docloader service as mParent or have no mParent at all.
nsCOMPtr<nsIDocumentLoader> docLoaderService =
do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID);
NS_ENSURE_TRUE(docLoaderService, NS_ERROR_UNEXPECTED);
NS_ENSURE_STATE(!mParent || mParent == docLoaderService);
mItemType = aItemType;
// disable auth prompting for anything but content
mAllowAuth = mItemType == typeContent;
RefPtr<nsPresContext> presContext = nullptr;
GetPresContext(getter_AddRefs(presContext));
if (presContext) {
presContext->UpdateIsChrome();
}
MOZ_DIAGNOSTIC_ASSERT((mBrowsingContext->IsContent() ? typeContent : typeChrome) == mItemType);
*aItemType = mItemType;
return NS_OK;
}