Auto merge of #9136 - frewsxcv:htmlbodyelement-background, r=nox

HTMLBodyElement 'background' attribute improvements

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9136)
<!-- Reviewable:end -->

3 files changed, 26 insertions, 13 deletions

diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
index f107d201969..f082a4c8ced 100644
--- a/components/script/dom/htmlbodyelement.rs
+++ b/components/script/dom/htmlbodyelement.rs
@@ -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)
         }
     }
 
@@ -84,6 +81,12 @@ impl HTMLBodyElementMethods for HTMLBodyElement {
     fn SetOnstorage(&self, listener: Option<Rc<EventHandlerNonNull>>) {
         window_from_node(self).SetOnstorage(listener)
     }
+
+    // https://html.spec.whatwg.org/multipage/#dom-body-background
+    make_getter!(Background, "background");
+
+    // https://html.spec.whatwg.org/multipage/#dom-body-background
+    make_url_setter!(SetBackground, "background");
 }
 
 pub trait HTMLBodyElementLayoutHelpers {
@@ -116,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()
         }
     }
 }
@@ -147,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(),
diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index eb60a2c5798..60ed65860f8 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -153,6 +153,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) => (
         fn $attr(&self, value: u32) {
diff --git a/components/script/dom/webidls/HTMLBodyElement.webidl b/components/script/dom/webidls/HTMLBodyElement.webidl
index 50e834d1813..36a7a99f996 100644
--- a/components/script/dom/webidls/HTMLBodyElement.webidl
+++ b/components/script/dom/webidls/HTMLBodyElement.webidl
@@ -23,5 +23,5 @@ partial interface HTMLBodyElement {
   //[TreatNullAs=EmptyString] attribute DOMString aLink;
 
     [TreatNullAs=EmptyString] attribute DOMString bgColor;
-  //                          attribute DOMString background;
+  attribute DOMString background;
 };