mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Update to string-cache 0.3
This commit is contained in:
parent
9fcc9d9d3f
commit
53b638c0e2
170 changed files with 1309 additions and 1050 deletions
|
@ -16,7 +16,7 @@ use dom::htmlelement::HTMLElement;
|
|||
use dom::htmlformelement::{FormControl, HTMLFormElement};
|
||||
use dom::node::{document_from_node, Node};
|
||||
use dom::virtualmethods::VirtualMethods;
|
||||
use string_cache::Atom;
|
||||
use html5ever_atoms::LocalName;
|
||||
use style::attr::AttrValue;
|
||||
|
||||
#[dom_struct]
|
||||
|
@ -25,7 +25,7 @@ pub struct HTMLLabelElement {
|
|||
}
|
||||
|
||||
impl HTMLLabelElement {
|
||||
fn new_inherited(local_name: Atom,
|
||||
fn new_inherited(local_name: LocalName,
|
||||
prefix: Option<DOMString>,
|
||||
document: &Document) -> HTMLLabelElement {
|
||||
HTMLLabelElement {
|
||||
|
@ -35,7 +35,7 @@ impl HTMLLabelElement {
|
|||
}
|
||||
|
||||
#[allow(unrooted_must_root)]
|
||||
pub fn new(local_name: Atom,
|
||||
pub fn new(local_name: LocalName,
|
||||
prefix: Option<DOMString>,
|
||||
document: &Document) -> Root<HTMLLabelElement> {
|
||||
Node::reflect_node(box HTMLLabelElement::new_inherited(local_name, prefix, document),
|
||||
|
@ -102,7 +102,7 @@ impl HTMLLabelElementMethods for HTMLLabelElement {
|
|||
return None;
|
||||
}
|
||||
|
||||
let for_attr = match self.upcast::<Element>().get_attribute(&ns!(), &atom!("for")) {
|
||||
let for_attr = match self.upcast::<Element>().get_attribute(&ns!(), &local_name!("for")) {
|
||||
Some(for_attr) => for_attr,
|
||||
None => return self.first_labelable_descendant(),
|
||||
};
|
||||
|
@ -121,9 +121,9 @@ impl VirtualMethods for HTMLLabelElement {
|
|||
Some(self.upcast::<HTMLElement>() as &VirtualMethods)
|
||||
}
|
||||
|
||||
fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue {
|
||||
fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
|
||||
match name {
|
||||
&atom!("for") => AttrValue::from_atomic(value.into()),
|
||||
&local_name!("for") => AttrValue::from_atomic(value.into()),
|
||||
_ => self.super_type().unwrap().parse_plain_attribute(name, value),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue