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/htmlbodyelement.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/htmlbodyelement.rs')
| -rw-r--r-- | components/script/dom/htmlbodyelement.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index 32efe1bd53b..ffc4d0985d6 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -97,7 +97,7 @@ impl HTMLBodyElementLayoutHelpers for LayoutJS<HTMLBodyElement> { fn get_background_color(&self) -> Option<RGBA> { unsafe { (*self.upcast::<Element>().unsafe_get()) - .get_attr_for_layout(&ns!(""), &atom!("bgcolor")) + .get_attr_for_layout(&ns!(), &atom!("bgcolor")) .and_then(AttrValue::as_color) .cloned() } @@ -107,7 +107,7 @@ impl HTMLBodyElementLayoutHelpers for LayoutJS<HTMLBodyElement> { fn get_color(&self) -> Option<RGBA> { unsafe { (*self.upcast::<Element>().unsafe_get()) - .get_attr_for_layout(&ns!(""), &atom!("text")) + .get_attr_for_layout(&ns!(), &atom!("text")) .and_then(AttrValue::as_color) .cloned() } @@ -153,7 +153,7 @@ impl VirtualMethods for HTMLBodyElement { fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) { let do_super_mutate = match (attr.local_name(), mutation) { - (&atom!(background), _) => { + (&atom!("background"), _) => { *self.background.borrow_mut() = mutation.new_value(attr).and_then(|value| { let document = document_from_node(self); let base = document.url(); @@ -169,11 +169,11 @@ impl VirtualMethods for HTMLBodyElement { // https://html.spec.whatwg.org/multipage/ // #event-handlers-on-elements,-document-objects,-and-window-objects:event-handlers-3 match name { - &atom!(onfocus) | &atom!(onload) | &atom!(onscroll) | &atom!(onafterprint) | - &atom!(onbeforeprint) | &atom!(onbeforeunload) | &atom!(onhashchange) | - &atom!(onlanguagechange) | &atom!(onmessage) | &atom!(onoffline) | &atom!(ononline) | - &atom!(onpagehide) | &atom!(onpageshow) | &atom!(onpopstate) | &atom!(onstorage) | - &atom!(onresize) | &atom!(onunload) | &atom!(onerror) + &atom!("onfocus") | &atom!("onload") | &atom!("onscroll") | &atom!("onafterprint") | + &atom!("onbeforeprint") | &atom!("onbeforeunload") | &atom!("onhashchange") | + &atom!("onlanguagechange") | &atom!("onmessage") | &atom!("onoffline") | &atom!("ononline") | + &atom!("onpagehide") | &atom!("onpageshow") | &atom!("onpopstate") | &atom!("onstorage") | + &atom!("onresize") | &atom!("onunload") | &atom!("onerror") => { let evtarget = window.upcast::<EventTarget>(); // forwarded event evtarget.set_event_handler_uncompiled(cx, url, reflector, |