diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-26 00:10:39 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-26 00:10:39 +0530 |
commit | 188fa9378c103093f1f8dac24bff0d9d237fd2bc (patch) | |
tree | 9ef42584eb3b543904524248ad11c1dff84082a5 /components/script/dom/htmlelement.rs | |
parent | e7b19249489eff7a7fd49bf458ee7bd681f8ad13 (diff) | |
parent | 3dec6edd10ec800de50a04c105a75fb98e0411ca (diff) | |
download | servo-188fa9378c103093f1f8dac24bff0d9d237fd2bc.tar.gz servo-188fa9378c103093f1f8dac24bff0d9d237fd2bc.zip |
Auto merge of #8667 - asajeffrey:update-string-cache, r=SimonSapin
Update string cache
Updated string_cache to 0.2, and updated the dependencies that depend on string_cache.
Removed references to string_cache_plugin.
Import atom! and ns! from string_cache.
Replaced ns!("") by ns!().
Replaced ns!(XML) and co by ns!(xml) and co.
Replaced Atom::from_slice by Atom::from.
Replaced atom.as_slice() by &*atom.
r? @SimonSapin
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8667)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlelement.rs')
-rw-r--r-- | components/script/dom/htmlelement.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 85c64b669f8..8fcd4fe7905 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -64,7 +64,7 @@ impl HTMLElement { -> HTMLElement { HTMLElement { element: - Element::new_inherited_with_state(state, tag_name, ns!(HTML), prefix, document), + Element::new_inherited_with_state(state, tag_name, ns!(html), prefix, document), style_decl: Default::default(), dataset: Default::default(), } @@ -100,7 +100,7 @@ impl HTMLElement { } }, _ => { - if let Some(attr) = element.get_attribute(&ns!(""), &atom!("draggable")) { + if let Some(attr) = element.get_attribute(&ns!(), &atom!("draggable")) { let attr = attr.r(); let value = attr.value(); let is_true = match *value { @@ -328,15 +328,17 @@ impl HTMLElement { } pub fn get_custom_attr(&self, local_name: DOMString) -> Option<DOMString> { - let local_name = Atom::from_slice(&to_snake_case(local_name)); - self.upcast::<Element>().get_attribute(&ns!(""), &local_name).map(|attr| { + // FIXME(ajeffrey): Convert directly from DOMString to Atom + let local_name = Atom::from(&*to_snake_case(local_name)); + self.upcast::<Element>().get_attribute(&ns!(), &local_name).map(|attr| { DOMString::from(&**attr.value()) // FIXME(ajeffrey): Convert directly from AttrValue to DOMString }) } pub fn delete_custom_attr(&self, local_name: DOMString) { - let local_name = Atom::from_slice(&to_snake_case(local_name)); - self.upcast::<Element>().remove_attribute(&ns!(""), &local_name); + // FIXME(ajeffrey): Convert directly from DOMString to Atom + let local_name = Atom::from(&*to_snake_case(local_name)); + self.upcast::<Element>().remove_attribute(&ns!(), &local_name); } // https://html.spec.whatwg.org/multipage/#category-label |