Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove parsed attribute 'bgcolor' field HTMLTableElement

Browse source 
https://github.com/servo/servo/issues/7863
This commit is contained in:
Corey Farwell 2015-12-31 13:43:06 -08:00
parent 5e497cf311
commit 7649748b83
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/script/dom/htmltableelement.rs
View file

@ -23,7 +23,6 @@ use util::str::{self, DOMString, LengthOrPercentageOrAuto};
#[dom_struct] #[dom_struct]
pub struct HTMLTableElement { pub struct HTMLTableElement {
htmlelement: HTMLElement, htmlelement: HTMLElement,
background_color: Cell<Option<RGBA>>,
border: Cell<Option<u32>>, border: Cell<Option<u32>>,
cellspacing: Cell<Option<u32>>, cellspacing: Cell<Option<u32>>,
} }
@ -33,7 +32,6 @@ impl HTMLTableElement {
-> HTMLTableElement { -> HTMLTableElement {
HTMLTableElement { HTMLTableElement {
htmlelement: HTMLElement::new_inherited(localName, prefix, document), htmlelement: HTMLElement::new_inherited(localName, prefix, document),
background_color: Cell::new(None),
border: Cell::new(None), border: Cell::new(None),
cellspacing: Cell::new(None), cellspacing: Cell::new(None),
} }
@ -114,7 +112,7 @@ impl HTMLTableElementMethods for HTMLTableElement {
make_getter!(BgColor, "bgcolor"); make_getter!(BgColor, "bgcolor");
// https://html.spec.whatwg.org/multipage/#dom-table-bgcolor // https://html.spec.whatwg.org/multipage/#dom-table-bgcolor
make_setter!(SetBgColor, "bgcolor"); make_legacy_color_setter!(SetBgColor, "bgcolor");
// https://html.spec.whatwg.org/multipage/#dom-table-width // https://html.spec.whatwg.org/multipage/#dom-table-width
make_getter!(Width, "width"); make_getter!(Width, "width");
@ -134,7 +132,10 @@ impl HTMLTableElementLayoutHelpers for LayoutJS<HTMLTableElement> {
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn get_background_color(&self) -> Option<RGBA> { fn get_background_color(&self) -> Option<RGBA> {
unsafe { unsafe {
(*self.unsafe_get()).background_color.get() (*self.upcast::<Element>().unsafe_get())
.get_attr_for_layout(&ns!(), &atom!("bgcolor"))
.and_then(AttrValue::as_color)
.cloned()
} }
} }
@ -172,11 +173,6 @@ impl VirtualMethods for HTMLTableElement {
fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) { fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
self.super_type().unwrap().attribute_mutated(attr, mutation); self.super_type().unwrap().attribute_mutated(attr, mutation);
match *attr.local_name() { match *attr.local_name() {
atom!("bgcolor") => {
self.background_color.set(mutation.new_value(attr).and_then(|value| {
str::parse_legacy_color(&value).ok()
}));
},
atom!("border") => { atom!("border") => {
// According to HTML5 § 14.3.9, invalid values map to 1px. // According to HTML5 § 14.3.9, invalid values map to 1px.
self.border.set(mutation.new_value(attr).map(|value| { self.border.set(mutation.new_value(attr).map(|value| {
@ -196,6 +192,7 @@ impl VirtualMethods for HTMLTableElement {
match *local_name { match *local_name {
atom!("border") => AttrValue::from_u32(value, 1), atom!("border") => AttrValue::from_u32(value, 1),
atom!("width") => AttrValue::from_nonzero_dimension(value), atom!("width") => AttrValue::from_nonzero_dimension(value),
atom!("bgcolor") => AttrValue::from_legacy_color(value),
_ => self.super_type().unwrap().parse_plain_attribute(local_name, value), _ => self.super_type().unwrap().parse_plain_attribute(local_name, value),
} }
} }