Skip to content

Commit

Permalink
Implement HTMLMetaElement.{name,content} (fixes #5663).
Browse files Browse the repository at this point in the history
  • Loading branch information
@JayNakrani @Ms2ger
JayNakrani authored and Ms2ger committed Apr 24, 2015
1 parent 07aa630 commit 7314116
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 281 deletions.
15 changes: 15 additions & 0 deletions components/script/dom/htmlmetaelement.rs
View file
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -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");
}
4 changes: 2 additions & 2 deletions components/script/dom/webidls/HTMLMetaElement.webidl
View file
Expand Up @@ -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
};
Expand Down
3 changes: 0 additions & 3 deletions tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini
View file

This file was deleted.

1 change: 0 additions & 1 deletion tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini
View file
@@ -1,4 +1,3 @@
[xmlhttprequest-timeout-worker-overrides.html]
type: testharness
disabled: flaky - https://github.com/w3c/web-platform-tests/issues/1362

1 change: 0 additions & 1 deletion tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini
View file
@@ -1,4 +1,3 @@
[xmlhttprequest-timeout-worker-overridesexpires.html]
type: testharness
disabled: racy test

3 changes: 0 additions & 3 deletions tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini
View file

This file was deleted.

1 change: 0 additions & 1 deletion tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini
View file
@@ -1,4 +1,3 @@
[xmlhttprequest-timeout-worker-twice.html]
type: testharness
disabled: flaky

12 changes: 0 additions & 12 deletions tests/wpt/metadata/html/dom/interfaces.html.ini
View file
Expand Up @@ -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
Expand Down
258 changes: 0 additions & 258 deletions tests/wpt/metadata/html/dom/reflection-metadata.html.ini
View file
Expand Up @@ -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 (<meta http-equiv>): typeof IDL attribute]
expected: FAIL

Expand Down Expand Up @@ -4413,135 +4284,6 @@
[meta.httpEquiv (<meta http-equiv>): 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

Expand Down

0 comments on commit 7314116

Please sign in to comment.