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

Merge pull request #3031 from Ms2ger/attr-cell

Browse source 
Make Attr::owner immutable; r=jdm
This commit is contained in:
Ms2ger 2014-08-07 11:41:57 +02:00
commit 1e3dc0341b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/script/dom/attr.rs
View file

@ -17,7 +17,7 @@ use servo_util::atom::Atom;
use servo_util::namespace; use servo_util::namespace;
use servo_util::namespace::Namespace; use servo_util::namespace::Namespace;
use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS}; use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
use std::cell::{Ref, Cell, RefCell}; use std::cell::{Ref, RefCell};
use std::mem; use std::mem;
pub enum AttrSettingType { pub enum AttrSettingType {
@ -76,7 +76,7 @@ pub struct Attr {
pub prefix: Option<DOMString>, pub prefix: Option<DOMString>,
/// the element that owns this attribute. /// the element that owns this attribute.
owner: Cell<JS<Element>>, owner: JS<Element>,
} }
impl Reflectable for Attr { impl Reflectable for Attr {
@ -96,7 +96,7 @@ impl Attr {
name: name, name: name,
namespace: namespace, namespace: namespace,
prefix: prefix, prefix: prefix,
owner: Cell::new(JS::from_rooted(owner)), owner: JS::from_rooted(owner),
} }
} }
@ -108,7 +108,7 @@ impl Attr {
} }
pub fn set_value(&self, set_type: AttrSettingType, value: AttrValue) { pub fn set_value(&self, set_type: AttrSettingType, value: AttrValue) {
let owner = self.owner.get().root(); let owner = self.owner.root();
let node: &JSRef<Node> = NodeCast::from_ref(&*owner); let node: &JSRef<Node> = NodeCast::from_ref(&*owner);
let namespace_is_null = self.namespace == namespace::Null; let namespace_is_null = self.namespace == namespace::Null;
@ -143,7 +143,7 @@ impl<'a> AttrMethods for JSRef<'a, Attr> {
} }
fn SetValue(&self, value: DOMString) { fn SetValue(&self, value: DOMString) {
let owner = self.owner.get().root(); let owner = self.owner.root();
let value = owner.deref().parse_attribute( let value = owner.deref().parse_attribute(
&self.namespace, self.deref().local_name.as_slice(), value); &self.namespace, self.deref().local_name.as_slice(), value);
self.set_value(ReplacedAttr, value); self.set_value(ReplacedAttr, value);