Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Cell for mutability of HTMLIFrameElement.sandbox.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-06-07 00:25:46 +09:00
parent 2aa1554b0c
commit 1f9f0a28ed
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/htmliframeelement.rs
View file

@ -5,6 +5,7 @@
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived, HTMLElementCast}; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived, HTMLElementCast};
use dom::bindings::js::{JSRef, Temporary, OptionalRootable}; use dom::bindings::js::{JSRef, Temporary, OptionalRootable};
use dom::bindings::trace::Traceable;
use dom::document::Document; use dom::document::Document;
use dom::element::{HTMLIFrameElementTypeId, Element}; use dom::element::{HTMLIFrameElementTypeId, Element};
use dom::element::AttributeHandlers; use dom::element::AttributeHandlers;
@ -22,6 +23,7 @@ use servo_util::str::DOMString;
use servo_util::url::try_parse_url; use servo_util::url::try_parse_url;
use std::ascii::StrAsciiExt; use std::ascii::StrAsciiExt;
use std::cell::Cell;
use url::Url; use url::Url;
enum SandboxAllowance { enum SandboxAllowance {
@ -38,7 +40,7 @@ enum SandboxAllowance {
pub struct HTMLIFrameElement { pub struct HTMLIFrameElement {
pub htmlelement: HTMLElement, pub htmlelement: HTMLElement,
pub size: Option<IFrameSize>, pub size: Option<IFrameSize>,
pub sandbox: Option<u8> pub sandbox: Traceable<Cell<Option<u8>>>,
} }
impl HTMLIFrameElementDerived for EventTarget { impl HTMLIFrameElementDerived for EventTarget {
@ -60,7 +62,7 @@ pub trait HTMLIFrameElementHelpers {
impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> { impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
fn is_sandboxed(&self) -> bool { fn is_sandboxed(&self) -> bool {
self.sandbox.is_some() self.sandbox.deref().get().is_some()
} }
fn get_url(&self) -> Option<Url> { fn get_url(&self) -> Option<Url> {
@ -78,7 +80,7 @@ impl HTMLIFrameElement {
HTMLIFrameElement { HTMLIFrameElement {
htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document), htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document),
size: None, size: None,
sandbox: None, sandbox: Traceable::new(Cell::new(None)),
} }
} }
@ -146,8 +148,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
_ => AllowNothing _ => AllowNothing
} as u8; } as u8;
} }
let mut self_alias = self.clone(); self.deref().sandbox.deref().set(Some(modes));
self_alias.deref_mut().sandbox = Some(modes);
} }
} }
@ -158,8 +159,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
} }
if "sandbox" == name.as_slice() { if "sandbox" == name.as_slice() {
let mut self_alias = self.clone(); self.deref().sandbox.deref().set(None);
self_alias.deref_mut().sandbox = None;
} }
} }