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

Remove Traceable from attr.rs

Browse source
This commit is contained in:
Manish Goregaokar 2014-09-28 16:28:31 +05:30
parent d23e45fe5d
commit b908d5accb
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/attr.rs
View file

@ -7,7 +7,6 @@ use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods;
use dom::bindings::codegen::InheritTypes::NodeCast; use dom::bindings::codegen::InheritTypes::NodeCast;
use dom::bindings::global; use dom::bindings::global;
use dom::bindings::js::{JS, JSRef, Temporary}; use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::trace::Traceable;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::element::{Element, AttributeHandlers}; use dom::element::{Element, AttributeHandlers};
use dom::node::Node; use dom::node::Node;
@ -76,7 +75,7 @@ impl Str for AttrValue {
pub struct Attr { pub struct Attr {
reflector_: Reflector, reflector_: Reflector,
local_name: Atom, local_name: Atom,
value: Traceable<RefCell<AttrValue>>, value: RefCell<AttrValue>,
pub name: Atom, pub name: Atom,
pub namespace: Namespace, pub namespace: Namespace,
pub prefix: Option<DOMString>, pub prefix: Option<DOMString>,
@ -98,7 +97,7 @@ impl Attr {
Attr { Attr {
reflector_: Reflector::new(), reflector_: Reflector::new(),
local_name: local_name, local_name: local_name,
value: Traceable::new(RefCell::new(value)), value: RefCell::new(value),
name: name, name: name,
namespace: namespace, namespace: namespace,
prefix: prefix, prefix: prefix,
@ -170,7 +169,7 @@ impl<'a> AttrHelpers<'a> for JSRef<'a, Attr> {
FirstSetAttr => {} FirstSetAttr => {}
} }
*self.value.deref().borrow_mut() = value; *self.value.borrow_mut() = value;
if namespace_is_null { if namespace_is_null {
vtable_for(&node).after_set_attr( vtable_for(&node).after_set_attr(
@ -207,13 +206,13 @@ pub trait AttrHelpersForLayout {
impl AttrHelpersForLayout for Attr { impl AttrHelpersForLayout for Attr {
unsafe fn value_ref_forever(&self) -> &'static str { unsafe fn value_ref_forever(&self) -> &'static str {
// cast to point to T in RefCell<T> directly // cast to point to T in RefCell<T> directly
let value = mem::transmute::<&RefCell<AttrValue>, &AttrValue>(self.value.deref()); let value = mem::transmute::<&RefCell<AttrValue>, &AttrValue>(&self.value);
value.as_slice() value.as_slice()
} }
unsafe fn value_atom_forever(&self) -> Option<Atom> { unsafe fn value_atom_forever(&self) -> Option<Atom> {
// cast to point to T in RefCell<T> directly // cast to point to T in RefCell<T> directly
let value = mem::transmute::<&RefCell<AttrValue>, &AttrValue>(self.value.deref()); let value = mem::transmute::<&RefCell<AttrValue>, &AttrValue>(&self.value);
match *value { match *value {
AtomAttrValue(ref val) => Some(val.clone()), AtomAttrValue(ref val) => Some(val.clone()),
_ => None, _ => None,
@ -222,7 +221,7 @@ impl AttrHelpersForLayout for Attr {
unsafe fn value_tokens_forever(&self) -> Option<Items<Atom>> { unsafe fn value_tokens_forever(&self) -> Option<Items<Atom>> {
// cast to point to T in RefCell<T> directly // cast to point to T in RefCell<T> directly
let value = mem::transmute::<&RefCell<AttrValue>, &AttrValue>(self.value.deref()); let value = mem::transmute::<&RefCell<AttrValue>, &AttrValue>(&self.value);
match *value { match *value {
TokenListAttrValue(_, ref tokens) => Some(tokens.iter()), TokenListAttrValue(_, ref tokens) => Some(tokens.iter()),
_ => None, _ => None,