aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-13 18:51:42 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-13 18:51:42 +0530
commit3ad1b9134f17803f04ac94754e640e7f876799d8 (patch)
tree52cd699eb4fe92e420a4c92784b86341fd5fffab
parent9954ee1334e6224409bf82db620d80721f56bb13 (diff)
parent4a1eb479379931d2e9c283241df011a0fdf9948e (diff)
downloadservo-3ad1b9134f17803f04ac94754e640e7f876799d8.tar.gz
servo-3ad1b9134f17803f04ac94754e640e7f876799d8.zip
Auto merge of #10512 - KiChjang:base-element-attr, r=Ms2ger
Implement HTMLBaseElement attributes The remaining test failure in `base_multiple.html` looks like there's a problem with the test itself (it does not have a `<base>` tag at all). <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10512) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/htmlbaseelement.rs30
-rw-r--r--components/script/dom/webidls/HTMLBaseElement.webidl4
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/open-url-base-inserted.htm.ini5
-rw-r--r--tests/wpt/metadata/html/dom/interfaces.html.ini10
-rw-r--r--tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_empty.html.ini8
-rw-r--r--tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html.ini5
-rw-r--r--tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_unspecified.html.ini8
7 files changed, 33 insertions, 37 deletions
diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs
index 7f1ce7641d3..241c209c7a8 100644
--- a/components/script/dom/htmlbaseelement.rs
+++ b/components/script/dom/htmlbaseelement.rs
@@ -2,8 +2,9 @@
* 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::attr::Attr;
+use dom::attr::{Attr, AttrValue};
use dom::bindings::codegen::Bindings::HTMLBaseElementBinding;
+use dom::bindings::codegen::Bindings::HTMLBaseElementBinding::HTMLBaseElementMethods;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::Root;
use dom::document::Document;
@@ -60,6 +61,33 @@ impl HTMLBaseElement {
}
}
+impl HTMLBaseElementMethods for HTMLBaseElement {
+ // https://html.spec.whatwg.org/multipage/#dom-base-href
+ fn Href(&self) -> DOMString {
+ let document = document_from_node(self);
+
+ // Step 1.
+ if !self.upcast::<Element>().has_attribute(&atom!("href")) {
+ return DOMString::from(document.base_url().serialize());
+ }
+
+ // Step 2.
+ let fallback_base_url = document.fallback_base_url();
+
+ // Step 3.
+ let url = self.upcast::<Element>().get_url_attribute(&atom!("href"));
+
+ // Step 4.
+ let url_record = fallback_base_url.join(&*url);
+
+ // Step 5, 6.
+ DOMString::from(url_record.ok().map_or("".to_owned(), |record| record.serialize()))
+ }
+
+ // https://html.spec.whatwg.org/multipage/#dom-base-href
+ make_url_setter!(SetHref, "href");
+}
+
impl VirtualMethods for HTMLBaseElement {
fn super_type(&self) -> Option<&VirtualMethods> {
Some(self.upcast::<HTMLElement>() as &VirtualMethods)
diff --git a/components/script/dom/webidls/HTMLBaseElement.webidl b/components/script/dom/webidls/HTMLBaseElement.webidl
index 5c59c62f9be..549a6df1004 100644
--- a/components/script/dom/webidls/HTMLBaseElement.webidl
+++ b/components/script/dom/webidls/HTMLBaseElement.webidl
@@ -5,6 +5,6 @@
// https://html.spec.whatwg.org/multipage/#htmlbaseelement
interface HTMLBaseElement : HTMLElement {
- // attribute DOMString href;
- // attribute DOMString target;
+ attribute DOMString href;
+// attribute DOMString target;
};
diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-base-inserted.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-base-inserted.htm.ini
deleted file mode 100644
index 9e24c9d78d0..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/open-url-base-inserted.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[open-url-base-inserted.htm]
- type: testharness
- [XMLHttpRequest: open() resolving URLs - insert ]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 45ee46c1a54..ee5faa808dd 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -1977,16 +1977,13 @@
[HTMLHtmlElement interface: document.createElement("html") must inherit property "version" with the proper type (0)]
expected: FAIL
- [HTMLBaseElement interface: attribute href]
- expected: FAIL
-
[HTMLBaseElement interface: attribute target]
expected: FAIL
- [HTMLBaseElement interface: document.createElement("base") must inherit property "href" with the proper type (0)]
+ [HTMLBaseElement interface: document.createElement("base") must inherit property "target" with the proper type (1)]
expected: FAIL
- [HTMLBaseElement interface: document.createElement("base") must inherit property "target" with the proper type (1)]
+ [HTMLLinkElement interface: attribute crossOrigin]
expected: FAIL
[HTMLLinkElement interface: attribute sizes]
@@ -8898,6 +8895,3 @@
[Document interface: new Document() must inherit property "onwaiting" with the proper type (156)]
expected: FAIL
- [HTMLLinkElement interface: attribute crossOrigin]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_empty.html.ini b/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_empty.html.ini
deleted file mode 100644
index 68bff358e19..00000000000
--- a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_empty.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[base_href_empty.html]
- type: testharness
- [The value of the href attribute must be the document's address if it is empty]
- expected: FAIL
-
- [The src attribute of the img element must relative to document's address]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html.ini b/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html.ini
deleted file mode 100644
index 4bf60923372..00000000000
--- a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[base_href_specified.sub.html]
- type: testharness
- [The href attribute of the base element is specified]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_unspecified.html.ini b/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_unspecified.html.ini
deleted file mode 100644
index b782c6c77c4..00000000000
--- a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_href_unspecified.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[base_href_unspecified.html]
- type: testharness
- [The value of the href attribute must be the document's address if it is unspecified]
- expected: FAIL
-
- [The src attribute of the img element must relative to document's address]
- expected: FAIL
-