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

Bug 1496308 - Require URLExtraData::mPrincipal to be non-null r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D7682
This commit is contained in:
Cameron McCormack
2018-10-10 03:10:07 +00:00
parent 73546ac6fc
commit 198a280c43
8 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -2426,7 +2426,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle
RefPtr<nsXBLBinding> binding;
rv = xblService->LoadBindings(aDocElement, display->mBinding->GetURI(),
display->mBinding->mExtraData->GetPrincipal(),
display->mBinding->mExtraData->Principal(),
getter_AddRefs(binding), &resolveStyle);
if (NS_FAILED(rv) && rv != NS_ERROR_XBL_BLOCKED) {
// Binding will load asynchronously.
@@ -5579,7 +5579,7 @@ nsCSSFrameConstructor::LoadXBLBindingIfNeeded(nsIContent& aContent,
bool resolveStyle;
nsresult rv = xblService->LoadBindings(aContent.AsElement(),
binding->GetURI(),
binding->mExtraData->GetPrincipal(),
binding->mExtraData->Principal(),
getter_AddRefs(newPendingBinding->mBinding),
&resolveStyle);
if (NS_FAILED(rv)) {