mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Update string_cache to 0.2.
Updated string_cache, html5ever, xml5ever and selectors in Cargo.toml files and Cargo.lock. 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!(foo) by atom!("foo"). Replaced Atom::from_slice by Atom::from. Replaced atom.as_slice() by &*atom.
This commit is contained in:
parent
e7b1924948
commit
3dec6edd10
68 changed files with 328 additions and 434 deletions
|
@ -78,7 +78,7 @@ impl HTMLLinkElement {
|
|||
}
|
||||
|
||||
fn get_attr(element: &Element, local_name: &Atom) -> Option<String> {
|
||||
let elem = element.get_attribute(&ns!(""), local_name);
|
||||
let elem = element.get_attribute(&ns!(), local_name);
|
||||
elem.map(|e| {
|
||||
let value = e.value();
|
||||
(**value).to_owned()
|
||||
|
@ -119,9 +119,9 @@ impl VirtualMethods for HTMLLinkElement {
|
|||
return;
|
||||
}
|
||||
|
||||
let rel = get_attr(self.upcast(), &atom!(rel));
|
||||
let rel = get_attr(self.upcast(), &atom!("rel"));
|
||||
match attr.local_name() {
|
||||
&atom!(href) => {
|
||||
&atom!("href") => {
|
||||
if string_is_stylesheet(&rel) {
|
||||
self.handle_stylesheet_url(&attr.value());
|
||||
} else if is_favicon(&rel) {
|
||||
|
@ -136,7 +136,7 @@ impl VirtualMethods for HTMLLinkElement {
|
|||
}
|
||||
}
|
||||
},
|
||||
&atom!(media) => {
|
||||
&atom!("media") => {
|
||||
if string_is_stylesheet(&rel) {
|
||||
self.handle_stylesheet_url(&attr.value());
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ impl HTMLLinkElement {
|
|||
Ok(url) => {
|
||||
let element = self.upcast::<Element>();
|
||||
|
||||
let mq_attribute = element.get_attribute(&ns!(""), &atom!("media"));
|
||||
let mq_attribute = element.get_attribute(&ns!(), &atom!("media"));
|
||||
let value = mq_attribute.r().map(|a| a.value());
|
||||
let mq_str = match value {
|
||||
Some(ref value) => &***value,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue