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

Remove parsed attribute 'background' field on HTMLBodyElement

Browse source 
https://github.com/servo/servo/issues/7863
This commit is contained in:
Corey Farwell 2016-01-02 16:32:09 -08:00
parent 9a1fd472ab
commit 1a808219a8
3 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/dom/htmlbodyelement.rs
View file

@ -4,7 +4,6 @@
use cssparser::RGBA;
use dom::attr::{Attr, AttrValue};
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
use dom::bindings::codegen::Bindings::HTMLBodyElementBinding::{self, HTMLBodyElementMethods};
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
@ -32,7 +31,6 @@ const INITIAL_REFLOW_DELAY: u64 = 200_000_000;
#[dom_struct]
pub struct HTMLBodyElement {
htmlelement: HTMLElement,
background: DOMRefCell<Option<Url>>
}
impl HTMLBodyElement {
@ -40,7 +38,6 @@ impl HTMLBodyElement {
-> HTMLBodyElement {
HTMLBodyElement {
htmlelement: HTMLElement::new_inherited(localName, prefix, document),
background: DOMRefCell::new(None)
}
}
@ -89,12 +86,7 @@ impl HTMLBodyElementMethods for HTMLBodyElement {
make_getter!(Background, "background");
// https://html.spec.whatwg.org/multipage/#dom-body-background
fn SetBackground(&self, value: DOMString) {
let document = document_from_node(self);
let base = document.url();
*self.background.borrow_mut() = base.join(&value).ok();
self.upcast::<Element>().set_string_attribute(&atom!("background"), value);
}
make_url_setter!(SetBackground, "background");
}
pub trait HTMLBodyElementLayoutHelpers {
@ -127,7 +119,10 @@ impl HTMLBodyElementLayoutHelpers for LayoutJS<HTMLBodyElement> {
#[allow(unsafe_code)]
fn get_background(&self) -> Option<Url> {
unsafe {
(*self.unsafe_get()).background.borrow_for_layout().clone()
(*self.upcast::<Element>().unsafe_get())
.get_attr_for_layout(&ns!(), &atom!("background"))
.and_then(AttrValue::as_url)
.cloned()
}
}
}
@ -158,20 +153,13 @@ impl VirtualMethods for HTMLBodyElement {
match *name {
atom!("bgcolor") |
atom!("text") => AttrValue::from_legacy_color(value),
atom!("background") => AttrValue::from_url(document_from_node(self).url(), value),
_ => self.super_type().unwrap().parse_plain_attribute(name, value),
}
}
fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
let do_super_mutate = match (attr.local_name(), mutation) {
(&atom!("background"), _) => {
*self.background.borrow_mut() = mutation.new_value(attr).and_then(|value| {
let document = document_from_node(self);
let base = document.url();
base.join(&value).ok()
});
true
},
(name, AttributeMutation::Set(_)) if name.starts_with("on") => {
let window = window_from_node(self);
let (cx, url, reflector) = (window.get_cx(),

14
components/script/dom/macros.rs
View file

@ -152,6 +152,20 @@ macro_rules! make_bool_setter(
);
);
#[macro_export]
macro_rules! make_url_setter(
( $attr:ident, $htmlname:tt ) => (
fn $attr(&self, value: DOMString) {
use dom::bindings::inheritance::Castable;
use dom::element::Element;
use dom::node::document_from_node;
let value = AttrValue::from_url(document_from_node(self).url(), value);
let element = self.upcast::<Element>();
element.set_attribute(&atom!($htmlname), value);
}
);
);
#[macro_export]
macro_rules! make_uint_setter(
($attr:ident, $htmlname:tt, $default:expr) => (