diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 44122f07fe4..57248c03e97 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -19,12 +19,13 @@ use dom::bindings::conversions::ToJSValConvertible; use dom::bindings::error::{Error, ErrorResult}; use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; -use dom::bindings::js::{Root, LayoutJS}; +use dom::bindings::js::{JS, MutNullableHeap, Root, LayoutJS}; use dom::bindings::reflector::Reflectable; use dom::bindings::str::DOMString; use dom::browsingcontext::BrowsingContext; use dom::customevent::CustomEvent; use dom::document::Document; +use dom::domtokenlist::DOMTokenList; use dom::element::{AttributeMutation, Element, RawLayoutElementHelpers}; use dom::event::Event; use dom::eventtarget::EventTarget; @@ -64,13 +65,14 @@ pub struct HTMLIFrameElement { htmlelement: HTMLElement, pipeline_id: Cell>, subpage_id: Cell>, - sandbox: Cell>, + sandbox: MutNullableHeap>, + sandbox_allowance: Cell>, load_blocker: DOMRefCell>, } impl HTMLIFrameElement { pub fn is_sandboxed(&self) -> bool { - self.sandbox.get().is_some() + self.sandbox_allowance.get().is_some() } /// , @@ -194,7 +196,8 @@ impl HTMLIFrameElement { htmlelement: HTMLElement::new_inherited(localName, prefix, document), pipeline_id: Cell::new(None), subpage_id: Cell::new(None), - sandbox: Cell::new(None), + sandbox: Default::default(), + sandbox_allowance: Cell::new(None), load_blocker: DOMRefCell::new(None), } } @@ -422,13 +425,8 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement { } // https://html.spec.whatwg.org/multipage/#dom-iframe-sandbox - fn Sandbox(&self) -> DOMString { - self.upcast::().get_string_attribute(&atom!("sandbox")) - } - - // https://html.spec.whatwg.org/multipage/#dom-iframe-sandbox - fn SetSandbox(&self, sandbox: DOMString) { - self.upcast::().set_tokenlist_attribute(&atom!("sandbox"), sandbox); + fn Sandbox(&self) -> Root { + self.sandbox.or_init(|| DOMTokenList::new(self.upcast::(), &atom!("sandbox"))) } // https://html.spec.whatwg.org/multipage/#dom-iframe-contentwindow @@ -523,7 +521,7 @@ impl VirtualMethods for HTMLIFrameElement { self.super_type().unwrap().attribute_mutated(attr, mutation); match attr.local_name() { &atom!("sandbox") => { - self.sandbox.set(mutation.new_value(attr).map(|value| { + self.sandbox_allowance.set(mutation.new_value(attr).map(|value| { let mut modes = SandboxAllowance::AllowNothing as u8; for token in value.as_tokens() { modes |= match &*token.to_ascii_lowercase() { diff --git a/components/script/dom/webidls/HTMLIFrameElement.webidl b/components/script/dom/webidls/HTMLIFrameElement.webidl index bf547c8930a..5fe4ef7a661 100644 --- a/components/script/dom/webidls/HTMLIFrameElement.webidl +++ b/components/script/dom/webidls/HTMLIFrameElement.webidl @@ -7,7 +7,8 @@ interface HTMLIFrameElement : HTMLElement { attribute DOMString src; // attribute DOMString srcdoc; // attribute DOMString name; - attribute DOMString sandbox; + [SameObject, PutForwards=value] + readonly attribute DOMTokenList sandbox; // attribute boolean seamless; // attribute boolean allowFullscreen; attribute DOMString width; diff --git a/tests/wpt/metadata/dom/lists/DOMTokenList-coverage-for-attributes.html.ini b/tests/wpt/metadata/dom/lists/DOMTokenList-coverage-for-attributes.html.ini index b50efb72c7f..ed70e7acb55 100644 --- a/tests/wpt/metadata/dom/lists/DOMTokenList-coverage-for-attributes.html.ini +++ b/tests/wpt/metadata/dom/lists/DOMTokenList-coverage-for-attributes.html.ini @@ -36,9 +36,6 @@ [area.ping in http://www.w3.org/1999/xhtml namespace should be DOMTokenList.] expected: FAIL - [iframe.sandbox in http://www.w3.org/1999/xhtml namespace should be DOMTokenList.] - expected: FAIL - [link.sizes in http://www.w3.org/1999/xhtml namespace should be DOMTokenList.] expected: FAIL