From 656a8ee3c8ebfe4b73d7488b230823363a2f2d08 Mon Sep 17 00:00:00 2001 From: Jinwoo Song Date: Tue, 12 May 2015 15:46:55 +0900 Subject: [PATCH] Implement HTMLSelectElement.{multiple, name, size} (fixes #6017) --- components/script/dom/htmlselectelement.rs | 37 +- .../dom/webidls/HTMLSelectElement.webidl | 6 +- .../wpt/metadata/html/dom/interfaces.html.ini | 18 - .../html/dom/reflection-forms.html.ini | 417 ------------------ 4 files changed, 34 insertions(+), 444 deletions(-) diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 1d3ce090510..6b8e38e9161 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -2,17 +2,16 @@ * 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::AttrHelpers; +use dom::attr::{Attr, AttrHelpers, AttrValue}; use dom::bindings::codegen::Bindings::HTMLSelectElementBinding; use dom::bindings::codegen::Bindings::HTMLSelectElementBinding::HTMLSelectElementMethods; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, NodeCast}; -use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLSelectElementDerived, HTMLFieldSetElementDerived}; +use dom::bindings::codegen::InheritTypes::{HTMLSelectElementDerived, HTMLFieldSetElementDerived}; use dom::bindings::codegen::UnionTypes::HTMLElementOrLong; use dom::bindings::codegen::UnionTypes::HTMLOptionElementOrHTMLOptGroupElement; use dom::bindings::js::{JSRef, Rootable, Temporary}; use dom::document::Document; -use dom::element::{AttributeHandlers, Element}; +use dom::element::AttributeHandlers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; @@ -36,6 +35,8 @@ impl HTMLSelectElementDerived for EventTarget { } } +static DEFAULT_SELECT_SIZE: u32 = 0; + impl HTMLSelectElement { fn new_inherited(localName: DOMString, prefix: Option, document: JSRef) -> HTMLSelectElement { HTMLSelectElement { @@ -66,10 +67,27 @@ impl<'a> HTMLSelectElementMethods for JSRef<'a, HTMLSelectElement> { // https://www.whatwg.org/html/#dom-fe-disabled make_bool_setter!(SetDisabled, "disabled"); + // https://html.spec.whatwg.org/multipage/#dom-select-multiple + make_bool_getter!(Multiple); + + // https://html.spec.whatwg.org/multipage/#dom-select-multiple + make_bool_setter!(SetMultiple, "multiple"); + + // https://html.spec.whatwg.org/multipage/#dom-fe-name + make_getter!(Name); + + // https://html.spec.whatwg.org/multipage/#dom-fe-name + make_setter!(SetName, "name"); + + // https://html.spec.whatwg.org/multipage/#dom-select-size + make_uint_getter!(Size, "size", DEFAULT_SELECT_SIZE); + + // https://html.spec.whatwg.org/multipage/#dom-select-size + make_uint_setter!(SetSize, "size", DEFAULT_SELECT_SIZE); + // https://html.spec.whatwg.org/multipage/#dom-select-type fn Type(self) -> DOMString { - let elem: JSRef = ElementCast::from_ref(self); - if elem.has_attribute(&atom!("multiple")) { + if self.Multiple() { "select-multiple".to_owned() } else { "select-one".to_owned() @@ -135,5 +153,12 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLSelectElement> { node.check_disabled_attribute(); } } + + fn parse_plain_attribute(&self, local_name: &Atom, value: DOMString) -> AttrValue { + match local_name { + &atom!("size") => AttrValue::from_u32(value, DEFAULT_SELECT_SIZE), + _ => self.super_type().unwrap().parse_plain_attribute(local_name, value), + } + } } diff --git a/components/script/dom/webidls/HTMLSelectElement.webidl b/components/script/dom/webidls/HTMLSelectElement.webidl index c246eddb850..09f36334e7b 100644 --- a/components/script/dom/webidls/HTMLSelectElement.webidl +++ b/components/script/dom/webidls/HTMLSelectElement.webidl @@ -8,10 +8,10 @@ interface HTMLSelectElement : HTMLElement { // attribute boolean autofocus; attribute boolean disabled; //readonly attribute HTMLFormElement? form; - // attribute boolean multiple; - // attribute DOMString name; + attribute boolean multiple; + attribute DOMString name; // attribute boolean required; - // attribute unsigned long size; + attribute unsigned long size; readonly attribute DOMString type; diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index 8b2e80f9c29..9dbf7c9c8d2 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -5808,18 +5808,9 @@ [HTMLSelectElement interface: attribute form] expected: FAIL - [HTMLSelectElement interface: attribute multiple] - expected: FAIL - - [HTMLSelectElement interface: attribute name] - expected: FAIL - [HTMLSelectElement interface: attribute required] expected: FAIL - [HTMLSelectElement interface: attribute size] - expected: FAIL - [HTMLSelectElement interface: attribute options] expected: FAIL @@ -5877,18 +5868,9 @@ [HTMLSelectElement interface: document.createElement("select") must inherit property "form" with the proper type (3)] expected: FAIL - [HTMLSelectElement interface: document.createElement("select") must inherit property "multiple" with the proper type (4)] - expected: FAIL - - [HTMLSelectElement interface: document.createElement("select") must inherit property "name" with the proper type (5)] - expected: FAIL - [HTMLSelectElement interface: document.createElement("select") must inherit property "required" with the proper type (6)] expected: FAIL - [HTMLSelectElement interface: document.createElement("select") must inherit property "size" with the proper type (7)] - expected: FAIL - [HTMLSelectElement interface: document.createElement("select") must inherit property "options" with the proper type (9)] expected: FAIL diff --git a/tests/wpt/metadata/html/dom/reflection-forms.html.ini b/tests/wpt/metadata/html/dom/reflection-forms.html.ini index c113263aabe..dfe37db7f85 100644 --- a/tests/wpt/metadata/html/dom/reflection-forms.html.ini +++ b/tests/wpt/metadata/html/dom/reflection-forms.html.ini @@ -8118,243 +8118,6 @@ [select.autofocus: IDL set to object "test-valueOf" followed by IDL get] expected: FAIL - [select.multiple: typeof IDL attribute] - expected: FAIL - - [select.multiple: IDL get with DOM attribute unset] - expected: FAIL - - [select.multiple: setAttribute() to "" followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to " foo " followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to null followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to true followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to false followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [select.multiple: setAttribute() to "multiple" followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to "" followed by hasAttribute()] - expected: FAIL - - [select.multiple: IDL set to "" followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to " foo " followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to undefined followed by hasAttribute()] - expected: FAIL - - [select.multiple: IDL set to undefined followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to null followed by hasAttribute()] - expected: FAIL - - [select.multiple: IDL set to null followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to 7 followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to false followed by hasAttribute()] - expected: FAIL - - [select.multiple: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to NaN followed by hasAttribute()] - expected: FAIL - - [select.multiple: IDL set to NaN followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to Infinity followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to "\\0" followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [select.multiple: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - - [select.name: typeof IDL attribute] - expected: FAIL - - [select.name: IDL get with DOM attribute unset] - expected: FAIL - - [select.name: setAttribute() to "" followed by IDL get] - expected: FAIL - - [select.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 - - [select.name: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to true followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to false followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to null followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [select.name: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [select.name: IDL set to "" followed by getAttribute()] - expected: FAIL - - [select.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 - - [select.name: IDL set to undefined followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to undefined followed by IDL get] - expected: FAIL - - [select.name: IDL set to 7 followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to 7 followed by IDL get] - expected: FAIL - - [select.name: IDL set to 1.5 followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [select.name: IDL set to true followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to true followed by IDL get] - expected: FAIL - - [select.name: IDL set to false followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to false followed by IDL get] - expected: FAIL - - [select.name: IDL set to object "[object Object\]" followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [select.name: IDL set to NaN followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to NaN followed by IDL get] - expected: FAIL - - [select.name: IDL set to Infinity followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to Infinity followed by IDL get] - expected: FAIL - - [select.name: IDL set to -Infinity followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [select.name: IDL set to "\\0" followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to null followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to null followed by IDL get] - expected: FAIL - - [select.name: IDL set to object "test-toString" followed by getAttribute()] - expected: FAIL - - [select.name: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [select.name: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - [select.required: typeof IDL attribute] expected: FAIL @@ -8463,192 +8226,12 @@ [select.required: IDL set to object "test-valueOf" followed by IDL get] expected: FAIL - [select.size: typeof IDL attribute] - expected: FAIL - - [select.size: IDL get with DOM attribute unset] - expected: FAIL - - [select.size: setAttribute() to -2147483649 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to -2147483648 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to -36 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to -1 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 0 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 1 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 257 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 2147483647 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 2147483648 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 4294967295 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 4294967296 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "-1" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "-0" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "0" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "1" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "\\t7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "\\v7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "\\f7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "\\n7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "\\r7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "
7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "
7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "᠎7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to " 7" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "　7" followed by IDL get] - expected: FAIL - - [select.size: 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 - - [select.size: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to true followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to false followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [select.size: setAttribute() to object "2" followed by IDL get] - expected: FAIL - [select.size: setAttribute() to object "3" followed by getAttribute()] expected: FAIL [select.size: setAttribute() to object "3" followed by IDL get] expected: FAIL - [select.size: IDL set to 0 followed by getAttribute()] - expected: FAIL - - [select.size: IDL set to 1 followed by getAttribute()] - expected: FAIL - - [select.size: IDL set to 257 followed by getAttribute()] - expected: FAIL - - [select.size: IDL set to 2147483647 followed by getAttribute()] - expected: FAIL - - [select.size: IDL set to "-0" followed by getAttribute()] - expected: FAIL - - [select.size: IDL set to "-0" followed by IDL get] - expected: FAIL - [select.itemScope: typeof IDL attribute] expected: FAIL