servo: Merge #14086 - Add DateTime string attribute to Time (from chajath:time-datetime-attribute); r=ConnorGBrewster
authorIn-Ho Yi <yiinho@google.com>
Sat, 03 Dec 2016 13:23:27 -0800
changeset 340271 b1ff3ce9c6253045fda06ecbc6e1fc97dfb24c1f
parent 340270 07a4d94a1e24724916bb54bb55705c0797f55e6e
child 340272 37bf28cc0b3321d0af8e509b8d8cdf28f53aa993
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersConnorGBrewster
servo: Merge #14086 - Add DateTime string attribute to Time (from chajath:time-datetime-attribute); r=ConnorGBrewster <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix part of #12967, content parsing will come as a separate PR. <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 8992b654102f83bb809fa230ea3a5b84c2758946
servo/components/script/dom/htmltimeelement.rs
servo/components/script/dom/webidls/HTMLTimeElement.webidl
--- a/servo/components/script/dom/htmltimeelement.rs
+++ b/servo/components/script/dom/htmltimeelement.rs
@@ -1,33 +1,56 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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::ElementBinding::ElementBinding::ElementMethods;
 use dom::bindings::codegen::Bindings::HTMLTimeElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTimeElementBinding::HTMLTimeElementMethods;
+use dom::bindings::inheritance::Castable;
 use dom::bindings::js::Root;
 use dom::bindings::str::DOMString;
 use dom::document::Document;
+use dom::element::Element;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]
 pub struct HTMLTimeElement {
-    htmlelement: HTMLElement
+    htmlelement: HTMLElement,
 }
 
 impl HTMLTimeElement {
     fn new_inherited(local_name: LocalName, prefix: Option<DOMString>, document: &Document) -> HTMLTimeElement {
         HTMLTimeElement {
-            htmlelement: HTMLElement::new_inherited(local_name, prefix, document)
+            htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
         }
     }
 
     #[allow(unrooted_must_root)]
     pub fn new(local_name: LocalName,
                prefix: Option<DOMString>,
                document: &Document) -> Root<HTMLTimeElement> {
         Node::reflect_node(box HTMLTimeElement::new_inherited(local_name, prefix, document),
                            document,
                            HTMLTimeElementBinding::Wrap)
     }
 }
+
+impl HTMLTimeElementMethods for HTMLTimeElement {
+    // https://html.spec.whatwg.org/multipage/#dom-time-datetime
+    //make_getter!(DateTime, "datetime");
+    fn DateTime(&self) -> DOMString {
+        let element = self.upcast::<Element>();
+        if element.has_attribute(&local_name!("datetime")) {
+            return element.get_string_attribute(&local_name!("datetime"))
+        } else {
+            match element.GetInnerHTML() {
+                Ok(x) => x,
+                _ => DOMString::new(),
+            }
+        }
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-time-datetime
+    make_setter!(SetDateTime, "datetime");
+}
--- a/servo/components/script/dom/webidls/HTMLTimeElement.webidl
+++ b/servo/components/script/dom/webidls/HTMLTimeElement.webidl
@@ -1,8 +1,8 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 // https://html.spec.whatwg.org/multipage/#htmltimeelement
 interface HTMLTimeElement : HTMLElement {
-  //         attribute DOMString dateTime;
+  attribute DOMString dateTime;
 };