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

Bug 1608358 - Fix allowfullscreen check to check for feature policy. r=baku

Browse Source 
We can clean up this code once the feature policy pref goes away, but
meanwhile this should do the right thing.

Differential Revision: https://phabricator.services.mozilla.com/D82976
This commit is contained in:
Emilio Cobos Álvarez
2020-07-13 21:15:54 +00:00
parent 71e9a6a42b
commit 58e661c4c1
9 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dom/html/HTMLIFrameElement.cpp
View File

@@ -154,6 +154,20 @@ nsMapRuleToAttributesFunc HTMLIFrameElement::GetAttributeMappingFunction()
return &MapAttributesIntoRule;
}
bool HTMLIFrameElement::HasAllowFullscreenAttribute() const {
return GetBoolAttr(nsGkAtoms::allowfullscreen) ||
GetBoolAttr(nsGkAtoms::mozallowfullscreen);
}
bool HTMLIFrameElement::AllowFullscreen() const {
if (StaticPrefs::dom_security_featurePolicy_enabled()) {
// The feature policy check in Document::GetFullscreenError already accounts
// for the allow* attributes, so we're done.
return true;
}
return HasAllowFullscreenAttribute();
}
nsresult HTMLIFrameElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
const nsAttrValue* aValue,
const nsAttrValue* aOldValue,
@@ -173,8 +187,7 @@ nsresult HTMLIFrameElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
aName == nsGkAtoms::mozallowfullscreen) {
if (mFrameLoader) {
if (auto* bc = mFrameLoader->GetExtantBrowsingContext()) {
// This could be simpler if we didn't support the prefixed
// attribute, then it could just use !!aValue.
// This can go away once we remove the featurePolicy pref.
bc->SetFullscreenAllowedByOwner(AllowFullscreen());
}
}
@@ -316,7 +329,7 @@ void HTMLIFrameElement::RefreshFeaturePolicy(bool aParseAllowAttribute) {
mFeaturePolicy->MaybeSetAllowedPolicy(u"payment"_ns);
}
if (AllowFullscreen()) {
if (HasAllowFullscreenAttribute()) {
mFeaturePolicy->MaybeSetAllowedPolicy(u"fullscreen"_ns);
}