зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1460685 - Remove security.allow_chrome_frames_inside_content case from nsDocument;r=Gijs
This pref will be removed in the following changeset. MozReview-Commit-ID: E9TvPyxAgrf --HG-- extra : rebase_source : cdc2998c1d65c027169c13876c8324d710b70531
This commit is contained in:
Родитель
baeec3823b
Коммит
72e0b3cfe9
|
@ -283,10 +283,6 @@ static LazyLogModule gDocumentLeakPRLog("DocumentLeak");
|
|||
static LazyLogModule gCspPRLog("CSP");
|
||||
static LazyLogModule gUserInteractionPRLog("UserInteraction");
|
||||
|
||||
static const char kChromeInContentPref[] = "security.allow_chrome_frames_inside_content";
|
||||
static bool sChromeInContentAllowed = false;
|
||||
static bool sChromeInContentPrefCached = false;
|
||||
|
||||
static nsresult
|
||||
GetHttpChannelHelper(nsIChannel* aChannel, nsIHttpChannel** aHttpChannel)
|
||||
{
|
||||
|
@ -2396,13 +2392,7 @@ nsIDocument::MaybeDowngradePrincipal(nsIPrincipal* aPrincipal)
|
|||
return do_AddRef(expanded->WhiteList().LastElement());
|
||||
}
|
||||
|
||||
if (!sChromeInContentPrefCached) {
|
||||
sChromeInContentPrefCached = true;
|
||||
Preferences::AddBoolVarCache(&sChromeInContentAllowed,
|
||||
kChromeInContentPref, false);
|
||||
}
|
||||
if (!sChromeInContentAllowed &&
|
||||
nsContentUtils::IsSystemPrincipal(aPrincipal)) {
|
||||
if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
|
||||
// We basically want the parent document here, but because this is very
|
||||
// early in the load, GetParentDocument() returns null, so we use the
|
||||
// docshell hierarchy to get this information instead.
|
||||
|
|
Загрузка…
Ссылка в новой задаче