Implement <hr> 'color' attribute

4 files changed, 58 insertions, 3 deletions

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index d420e9b5405..9b5fb30c1c6 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -40,6 +40,7 @@ use dom::htmlbodyelement::HTMLBodyElement;
 use dom::htmlcollection::HTMLCollection;
 use dom::htmlfieldsetelement::HTMLFieldSetElement;
 use dom::htmlfontelement::HTMLFontElement;
+use dom::htmlhrelement::{HTMLHRElement, HTMLHRLayoutHelpers};
 use dom::htmliframeelement::HTMLIFrameElement;
 use dom::htmlinputelement::{HTMLInputElement, LayoutHTMLInputElementHelpers};
 use dom::htmllabelelement::HTMLLabelElement;
@@ -309,6 +310,9 @@ impl LayoutElementHelpers for LayoutJS<Element> {
         } else if let Some(this) = self.downcast::<HTMLBodyElement>() {
             // https://html.spec.whatwg.org/multipage/#the-page:the-body-element-20
             (*this.unsafe_get()).get_color()
+        } else if let Some(this) = self.downcast::<HTMLHRElement>() {
+            // https://html.spec.whatwg.org/multipage/#the-hr-element-2:presentational-hints-5
+            this.get_color()
         } else {
             None
         };
diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs
index dc5ab695d6b..6f2362f592c 100644
--- a/components/script/dom/htmlhrelement.rs
+++ b/components/script/dom/htmlhrelement.rs
@@ -2,11 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::HTMLHRElementBinding;
-use dom::bindings::js::Root;
+use cssparser::RGBA;
+use dom::attr::AttrValue;
+use dom::bindings::codegen::Bindings::HTMLHRElementBinding::{self, HTMLHRElementMethods};
+use dom::bindings::inheritance::Castable;
+use dom::bindings::js::{LayoutJS, Root};
 use dom::document::Document;
+use dom::element::{Element, RawLayoutElementHelpers};
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use dom::virtualmethods::VirtualMethods;
+use string_cache::Atom;
 use util::str::DOMString;
 
 #[dom_struct]
@@ -29,3 +35,44 @@ impl HTMLHRElement {
         Node::reflect_node(box element, document, HTMLHRElementBinding::Wrap)
     }
 }
+
+impl HTMLHRElementMethods for HTMLHRElement {
+    // https://html.spec.whatwg.org/multipage/#dom-hr-color
+    make_getter!(Color);
+
+    // https://html.spec.whatwg.org/multipage/#dom-hr-color
+    fn SetColor(&self, value: DOMString) {
+        self.upcast::<Element>()
+            .set_attribute(&atom!("color"), AttrValue::from_legacy_color(value));
+    }
+}
+
+pub trait HTMLHRLayoutHelpers {
+    fn get_color(&self) -> Option<RGBA>;
+}
+
+impl HTMLHRLayoutHelpers for LayoutJS<HTMLHRElement> {
+    #[allow(unsafe_code)]
+    fn get_color(&self) -> Option<RGBA> {
+        unsafe {
+            (&*self.upcast::<Element>().unsafe_get())
+                .get_attr_for_layout(&ns!(""), &atom!("color"))
+                .and_then(AttrValue::as_color)
+                .cloned()
+        }
+    }
+}
+
+
+impl VirtualMethods for HTMLHRElement {
+    fn super_type(&self) -> Option<&VirtualMethods> {
+        Some(self.upcast::<HTMLElement>() as &VirtualMethods)
+    }
+
+    fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue {
+        match name {
+            &atom!("color") => AttrValue::from_legacy_color(value),
+            _ => self.super_type().unwrap().parse_plain_attribute(name, value),
+        }
+    }
+}
diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs
index 7223ffd8b37..d2a436606d7 100644
--- a/components/script/dom/virtualmethods.rs
+++ b/components/script/dom/virtualmethods.rs
@@ -22,6 +22,7 @@ use dom::htmlfieldsetelement::HTMLFieldSetElement;
 use dom::htmlfontelement::HTMLFontElement;
 use dom::htmlformelement::HTMLFormElement;
 use dom::htmlheadelement::HTMLHeadElement;
+use dom::htmlhrelement::HTMLHRElement;
 use dom::htmliframeelement::HTMLIFrameElement;
 use dom::htmlimageelement::HTMLImageElement;
 use dom::htmlinputelement::HTMLInputElement;
@@ -156,6 +157,9 @@ pub fn vtable_for(node: &Node) -> &VirtualMethods {
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadElement)) => {
             node.downcast::<HTMLHeadElement>().unwrap() as &VirtualMethods
         }
+        NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHRElement)) => {
+            node.downcast::<HTMLHRElement>().unwrap() as &VirtualMethods
+        }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLImageElement)) => {
             node.downcast::<HTMLImageElement>().unwrap() as &VirtualMethods
         }
diff --git a/components/script/dom/webidls/HTMLHRElement.webidl b/components/script/dom/webidls/HTMLHRElement.webidl
index 5036d6c20b3..185100712f5 100644
--- a/components/script/dom/webidls/HTMLHRElement.webidl
+++ b/components/script/dom/webidls/HTMLHRElement.webidl
@@ -11,7 +11,7 @@ interface HTMLHRElement : HTMLElement {
 // https://html.spec.whatwg.org/multipage/#HTMLHRElement-partial
 partial interface HTMLHRElement {
   //         attribute DOMString align;
-  //         attribute DOMString color;
+  attribute DOMString color;
   //         attribute boolean noShade;
   //         attribute DOMString size;
   //         attribute DOMString width;