Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move storage of color attribute on <font>.

Browse source
This commit is contained in:
Eli Friedman 2015-11-07 23:51:31 -08:00
parent 0901e5bc97
commit ef52da7acd
1 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/script/dom/htmlfontelement.rs
View file

@ -3,25 +3,23 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::RGBA; use cssparser::RGBA;
use dom::attr::{Attr, AttrValue}; use dom::attr::AttrValue;
use dom::bindings::codegen::Bindings::HTMLFontElementBinding; use dom::bindings::codegen::Bindings::HTMLFontElementBinding;
use dom::bindings::codegen::Bindings::HTMLFontElementBinding::HTMLFontElementMethods; use dom::bindings::codegen::Bindings::HTMLFontElementBinding::HTMLFontElementMethods;
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::Root; use dom::bindings::js::Root;
use dom::document::Document; use dom::document::Document;
use dom::element::{AttributeMutation, Element, RawLayoutElementHelpers}; use dom::element::{Element, RawLayoutElementHelpers};
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::node::Node; use dom::node::Node;
use dom::virtualmethods::VirtualMethods; use dom::virtualmethods::VirtualMethods;
use std::cell::Cell;
use string_cache::Atom; use string_cache::Atom;
use style::values::specified; use style::values::specified;
use util::str::{self, DOMString, parse_legacy_font_size}; use util::str::{DOMString, parse_legacy_font_size};
#[dom_struct] #[dom_struct]
pub struct HTMLFontElement { pub struct HTMLFontElement {
htmlelement: HTMLElement, htmlelement: HTMLElement,
color: Cell<Option<RGBA>>,
} }
@ -29,7 +27,6 @@ impl HTMLFontElement {
fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLFontElement { fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLFontElement {
HTMLFontElement { HTMLFontElement {
htmlelement: HTMLElement::new_inherited(localName, prefix, document), htmlelement: HTMLElement::new_inherited(localName, prefix, document),
color: Cell::new(None),
} }
} }
@ -47,7 +44,7 @@ impl HTMLFontElementMethods for HTMLFontElement {
make_getter!(Color, "color"); make_getter!(Color, "color");
// https://html.spec.whatwg.org/multipage/#dom-font-color // https://html.spec.whatwg.org/multipage/#dom-font-color
make_setter!(SetColor, "color"); make_legacy_color_setter!(SetColor, "color");
// https://html.spec.whatwg.org/multipage/#dom-font-face // https://html.spec.whatwg.org/multipage/#dom-font-face
make_getter!(Face); make_getter!(Face);
@ -71,21 +68,10 @@ impl VirtualMethods for HTMLFontElement {
Some(self.upcast::<HTMLElement>() as &VirtualMethods) Some(self.upcast::<HTMLElement>() as &VirtualMethods)
} }
fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
self.super_type().unwrap().attribute_mutated(attr, mutation);
match attr.local_name() {
&atom!(color) => {
self.color.set(mutation.new_value(attr).and_then(|value| {
str::parse_legacy_color(&value).ok()
}));
},
_ => {},
}
}
fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue {
match name { match name {
&atom!("face") => AttrValue::from_atomic(value), &atom!("face") => AttrValue::from_atomic(value),
&atom!("color") => AttrValue::from_legacy_color(value),
&atom!("size") => { &atom!("size") => {
let length = parse_length(&value); let length = parse_length(&value);
AttrValue::Length(value, length) AttrValue::Length(value, length)
@ -97,8 +83,14 @@ impl VirtualMethods for HTMLFontElement {
impl HTMLFontElement { impl HTMLFontElement {
#[allow(unsafe_code)]
pub fn get_color(&self) -> Option<RGBA> { pub fn get_color(&self) -> Option<RGBA> {
self.color.get() unsafe {
self.upcast::<Element>()
.get_attr_for_layout(&ns!(""), &atom!("color"))
.and_then(AttrValue::as_color)
.cloned()
}
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]