From 731411660cde924534807df1ea803aad16d74391 Mon Sep 17 00:00:00 2001 From: Dhananjay Nakrani Date: Tue, 14 Apr 2015 09:43:22 -0700 Subject: [PATCH] Implement HTMLMetaElement.{name,content} (fixes #5663). --- components/script/dom/htmlmetaelement.rs | 15 + .../script/dom/webidls/HTMLMetaElement.webidl | 4 +- ...ttprequest-timeout-worker-aborted.html.ini | 3 - ...prequest-timeout-worker-overrides.html.ini | 1 - ...t-timeout-worker-overridesexpires.html.ini | 1 - ...httprequest-timeout-worker-simple.html.ini | 3 - ...lhttprequest-timeout-worker-twice.html.ini | 1 - .../wpt/metadata/html/dom/interfaces.html.ini | 12 - .../html/dom/reflection-metadata.html.ini | 258 ------------------ 9 files changed, 17 insertions(+), 281 deletions(-) delete mode 100644 tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini delete mode 100644 tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 730e1267d7bd..9b12cd20e4eb 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::Bindings::HTMLMetaElementBinding; +use dom::bindings::codegen::Bindings::HTMLMetaElementBinding::HTMLMetaElementMethods; use dom::bindings::codegen::InheritTypes::HTMLMetaElementDerived; use dom::bindings::js::{JSRef, Temporary}; use dom::document::Document; @@ -11,6 +12,7 @@ use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; +use string_cache::Atom; #[dom_struct] pub struct HTMLMetaElement { @@ -37,3 +39,16 @@ impl HTMLMetaElement { } } +impl<'a> HTMLMetaElementMethods for JSRef<'a, HTMLMetaElement> { + // https://html.spec.whatwg.org/multipage/#dom-meta-name + make_getter!(Name, "name"); + + // https://html.spec.whatwg.org/multipage/#dom-meta-name + make_setter!(SetName, "name"); + + // https://html.spec.whatwg.org/multipage/#dom-meta-content + make_getter!(Content, "content"); + + // https://html.spec.whatwg.org/multipage/#dom-meta-content + make_setter!(SetContent, "content"); +} diff --git a/components/script/dom/webidls/HTMLMetaElement.webidl b/components/script/dom/webidls/HTMLMetaElement.webidl index bef266bc9fe5..3703b0f8d19b 100644 --- a/components/script/dom/webidls/HTMLMetaElement.webidl +++ b/components/script/dom/webidls/HTMLMetaElement.webidl @@ -5,9 +5,9 @@ // https://www.whatwg.org/html/#htmlmetaelement interface HTMLMetaElement : HTMLElement { - // attribute DOMString name; + attribute DOMString name; // attribute DOMString httpEquiv; - // attribute DOMString content; + attribute DOMString content; // also has obsolete members }; diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini deleted file mode 100644 index ff19591c2a59..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[xmlhttprequest-timeout-worker-aborted.html] - type: testharness - expected: TIMEOUT diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini index 109458ef6bb7..2a74114b11a8 100644 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini +++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini @@ -1,4 +1,3 @@ [xmlhttprequest-timeout-worker-overrides.html] type: testharness disabled: flaky - https://github.com/w3c/web-platform-tests/issues/1362 - diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini index de2fbbb878d6..b3aed223b512 100644 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini +++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini @@ -1,4 +1,3 @@ [xmlhttprequest-timeout-worker-overridesexpires.html] type: testharness disabled: racy test - diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini deleted file mode 100644 index 746c7d262dc6..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[xmlhttprequest-timeout-worker-simple.html] - type: testharness - expected: TIMEOUT diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini index ddda4ae50d2d..3ce04c639cf2 100644 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini +++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini @@ -1,4 +1,3 @@ [xmlhttprequest-timeout-worker-twice.html] type: testharness disabled: flaky - diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index 998f512b9e9a..72033c58b144 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -2319,27 +2319,15 @@ [HTMLMetaElement interface object length] expected: FAIL - [HTMLMetaElement interface: attribute name] - expected: FAIL - [HTMLMetaElement interface: attribute httpEquiv] expected: FAIL - [HTMLMetaElement interface: attribute content] - expected: FAIL - [HTMLMetaElement interface: attribute scheme] expected: FAIL - [HTMLMetaElement interface: document.createElement("meta") must inherit property "name" with the proper type (0)] - expected: FAIL - [HTMLMetaElement interface: document.createElement("meta") must inherit property "httpEquiv" with the proper type (1)] expected: FAIL - [HTMLMetaElement interface: document.createElement("meta") must inherit property "content" with the proper type (2)] - expected: FAIL - [HTMLMetaElement interface: document.createElement("meta") must inherit property "scheme" with the proper type (3)] expected: FAIL diff --git a/tests/wpt/metadata/html/dom/reflection-metadata.html.ini b/tests/wpt/metadata/html/dom/reflection-metadata.html.ini index d4836ed1e263..b842821d8512 100644 --- a/tests/wpt/metadata/html/dom/reflection-metadata.html.ini +++ b/tests/wpt/metadata/html/dom/reflection-metadata.html.ini @@ -4155,135 +4155,6 @@ [meta.tabIndex: IDL set to -2147483648 followed by getAttribute()] expected: FAIL - [meta.name: typeof IDL attribute] - expected: FAIL - - [meta.name: IDL get with DOM attribute unset] - expected: FAIL - - [meta.name: setAttribute() to "" followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to true followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to false followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to null followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [meta.name: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [meta.name: IDL set to "" followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to undefined followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to undefined followed by IDL get] - expected: FAIL - - [meta.name: IDL set to 7 followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to 7 followed by IDL get] - expected: FAIL - - [meta.name: IDL set to 1.5 followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [meta.name: IDL set to true followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to true followed by IDL get] - expected: FAIL - - [meta.name: IDL set to false followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to false followed by IDL get] - expected: FAIL - - [meta.name: IDL set to object "[object Object\]" followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [meta.name: IDL set to NaN followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to NaN followed by IDL get] - expected: FAIL - - [meta.name: IDL set to Infinity followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to Infinity followed by IDL get] - expected: FAIL - - [meta.name: IDL set to -Infinity followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [meta.name: IDL set to "\\0" followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to null followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to null followed by IDL get] - expected: FAIL - - [meta.name: IDL set to object "test-toString" followed by getAttribute()] - expected: FAIL - - [meta.name: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [meta.name: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - [meta.httpEquiv (): typeof IDL attribute] expected: FAIL @@ -4413,135 +4284,6 @@ [meta.httpEquiv (): IDL set to object "test-valueOf" followed by IDL get] expected: FAIL - [meta.content: typeof IDL attribute] - expected: FAIL - - [meta.content: IDL get with DOM attribute unset] - expected: FAIL - - [meta.content: setAttribute() to "" followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to true followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to false followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to null followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [meta.content: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [meta.content: IDL set to "" followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to undefined followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to undefined followed by IDL get] - expected: FAIL - - [meta.content: IDL set to 7 followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to 7 followed by IDL get] - expected: FAIL - - [meta.content: IDL set to 1.5 followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [meta.content: IDL set to true followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to true followed by IDL get] - expected: FAIL - - [meta.content: IDL set to false followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to false followed by IDL get] - expected: FAIL - - [meta.content: IDL set to object "[object Object\]" followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [meta.content: IDL set to NaN followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to NaN followed by IDL get] - expected: FAIL - - [meta.content: IDL set to Infinity followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to Infinity followed by IDL get] - expected: FAIL - - [meta.content: IDL set to -Infinity followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [meta.content: IDL set to "\\0" followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to null followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to null followed by IDL get] - expected: FAIL - - [meta.content: IDL set to object "test-toString" followed by getAttribute()] - expected: FAIL - - [meta.content: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [meta.content: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - [meta.scheme: typeof IDL attribute] expected: FAIL