mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Usage of JSRef<Attr> in before_remove_attr & after_set_attr
JSRef<Attr> does not require allocating a DOMString for value, which are unused in most cases. It also provides more access to Attr data.
This commit is contained in:
parent
f5e8df9dac
commit
bbab8831e0
18 changed files with 255 additions and 225 deletions
|
@ -2,6 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::attr::Attr;
|
||||
use dom::attr::AttrHelpers;
|
||||
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
|
||||
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
|
||||
|
@ -23,7 +24,6 @@ use servo_msg::constellation_msg::{PipelineId, SubpageId};
|
|||
use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed};
|
||||
use servo_msg::constellation_msg::{ConstellationChan, LoadIframeUrlMsg};
|
||||
use servo_util::str::DOMString;
|
||||
use string_cache::Atom;
|
||||
|
||||
use std::ascii::StrAsciiExt;
|
||||
use std::cell::Cell;
|
||||
|
@ -188,44 +188,47 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
|
|||
Some(htmlelement as &VirtualMethods)
|
||||
}
|
||||
|
||||
fn after_set_attr(&self, name: &Atom, value: DOMString) {
|
||||
fn after_set_attr(&self, attr: JSRef<Attr>) {
|
||||
match self.super_type() {
|
||||
Some(ref s) => s.after_set_attr(name, value.clone()),
|
||||
_ => (),
|
||||
Some(ref s) => s.after_set_attr(attr),
|
||||
_ => ()
|
||||
}
|
||||
|
||||
if "sandbox" == name.as_slice() {
|
||||
let mut modes = AllowNothing as u8;
|
||||
for word in value.as_slice().split(' ') {
|
||||
modes |= match word.to_ascii_lower().as_slice() {
|
||||
"allow-same-origin" => AllowSameOrigin,
|
||||
"allow-forms" => AllowForms,
|
||||
"allow-pointer-lock" => AllowPointerLock,
|
||||
"allow-popups" => AllowPopups,
|
||||
"allow-scripts" => AllowScripts,
|
||||
"allow-top-navigation" => AllowTopNavigation,
|
||||
_ => AllowNothing
|
||||
} as u8;
|
||||
}
|
||||
self.sandbox.set(Some(modes));
|
||||
}
|
||||
|
||||
if "src" == name.as_slice() {
|
||||
let node: JSRef<Node> = NodeCast::from_ref(*self);
|
||||
if node.is_in_doc() {
|
||||
self.process_the_iframe_attributes()
|
||||
}
|
||||
match attr.local_name() {
|
||||
&atom!("sandbox") => {
|
||||
let mut modes = AllowNothing as u8;
|
||||
for word in attr.value().as_slice().split(' ') {
|
||||
modes |= match word.to_ascii_lower().as_slice() {
|
||||
"allow-same-origin" => AllowSameOrigin,
|
||||
"allow-forms" => AllowForms,
|
||||
"allow-pointer-lock" => AllowPointerLock,
|
||||
"allow-popups" => AllowPopups,
|
||||
"allow-scripts" => AllowScripts,
|
||||
"allow-top-navigation" => AllowTopNavigation,
|
||||
_ => AllowNothing
|
||||
} as u8;
|
||||
}
|
||||
self.sandbox.set(Some(modes));
|
||||
},
|
||||
&atom!("src") => {
|
||||
let node: JSRef<Node> = NodeCast::from_ref(*self);
|
||||
if node.is_in_doc() {
|
||||
self.process_the_iframe_attributes()
|
||||
}
|
||||
},
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
|
||||
fn before_remove_attr(&self, name: &Atom, value: DOMString) {
|
||||
fn before_remove_attr(&self, attr: JSRef<Attr>) {
|
||||
match self.super_type() {
|
||||
Some(ref s) => s.before_remove_attr(name, value),
|
||||
_ => (),
|
||||
Some(ref s) => s.before_remove_attr(attr),
|
||||
_ => ()
|
||||
}
|
||||
|
||||
if "sandbox" == name.as_slice() {
|
||||
self.sandbox.set(None);
|
||||
match attr.local_name() {
|
||||
&atom!("sandbox") => self.sandbox.set(None),
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue