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/htmloptionelement.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/htmloptionelement.rs')
-rw-r--r-- | components/script/dom/htmloptionelement.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index b29d0bc2332..22fe44c0d2f 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -72,7 +72,7 @@ impl HTMLOptionElement { // FIXME(ajeffrey): Provide a way of buffering DOMStrings other than using Strings fn collect_text(element: &Element, value: &mut String) { - let svg_script = *element.namespace() == ns!(SVG) && element.local_name() == &atom!("script"); + let svg_script = *element.namespace() == ns!(svg) && element.local_name() == &atom!("script"); let html_script = element.is::<HTMLScriptElement>(); if svg_script || html_script { return; @@ -162,7 +162,7 @@ impl VirtualMethods for HTMLOptionElement { fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) { self.super_type().unwrap().attribute_mutated(attr, mutation); match attr.local_name() { - &atom!(disabled) => { + &atom!("disabled") => { let el = self.upcast::<Element>(); match mutation { AttributeMutation::Set(_) => { @@ -176,7 +176,7 @@ impl VirtualMethods for HTMLOptionElement { } } }, - &atom!(selected) => { + &atom!("selected") => { match mutation { AttributeMutation::Set(_) => { // https://html.spec.whatwg.org/multipage/#concept-option-selectedness |