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

Bug 1283526 part 2 - Remove fullscreen sandbox flag. r=smaug

Browse Source 
MozReview-Commit-ID: 5qH4gZxvNQz
This commit is contained in:
Xidorn Quan
2016-07-05 09:46:55 +10:00
parent 26868bd866
commit 8fb189fb09
3 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dom/html/HTMLIFrameElement.cpp
View File

@@ -204,11 +204,7 @@ HTMLIFrameElement::AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue,
bool aNotify)
{
if ((aName == nsGkAtoms::sandbox ||
// The allowfullscreen attribute affects the sandboxed fullscreen
// flag, thus we should also reapply it if that is changed.
aName == nsGkAtoms::allowfullscreen ||
aName == nsGkAtoms::mozallowfullscreen) &&
if (aName == nsGkAtoms::sandbox &&
aNameSpaceID == kNameSpaceID_None && mFrameLoader) {
// If we have an nsFrameLoader, apply the new sandbox flags.
// Since this is called after the setter, the sandbox flags have
@@ -244,15 +240,7 @@ HTMLIFrameElement::GetSandboxFlags()
if (!sandboxAttr) {
return SANDBOXED_NONE;
}
uint32_t out = nsContentUtils::ParseSandboxAttributeToFlags(sandboxAttr);
if (GetParsedAttr(nsGkAtoms::allowfullscreen) ||
GetParsedAttr(nsGkAtoms::mozallowfullscreen)) {
out &= ~SANDBOXED_FULLSCREEN;
}
return out;
return nsContentUtils::ParseSandboxAttributeToFlags(sandboxAttr);
}
JSObject*