script: Add pre element obsolete width attribute support (#31792)

This commit is contained in:
Bastiaan van der Plaat 2024-03-25 12:36:48 +01:00 committed by GitHub
parent bd39e03eeb
commit 97144ddf71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 35 additions and 543 deletions

View file

@ -3,13 +3,18 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix};
use html5ever::{local_name, LocalName, Prefix};
use js::rust::HandleObject;
use style::attr::AttrValue;
use crate::dom::bindings::codegen::Bindings::HTMLPreElementBinding::HTMLPreElementMethods;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::str::DOMString;
use crate::dom::document::Document;
use crate::dom::htmlelement::HTMLElement;
use crate::dom::node::Node;
use crate::dom::virtualmethods::VirtualMethods;
#[dom_struct]
pub struct HTMLPreElement {
@ -41,3 +46,27 @@ impl HTMLPreElement {
)
}
}
impl VirtualMethods for HTMLPreElement {
fn super_type(&self) -> Option<&dyn VirtualMethods> {
Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
}
fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
match *name {
local_name!("width") => AttrValue::from_limited_i32(value.into(), 0),
_ => self
.super_type()
.unwrap()
.parse_plain_attribute(name, value),
}
}
}
impl HTMLPreElementMethods for HTMLPreElement {
// https://html.spec.whatwg.org/multipage/#dom-pre-width
make_int_getter!(Width, "width", 0);
// https://html.spec.whatwg.org/multipage/#dom-pre-width
make_int_setter!(SetWidth, "width", 0);
}

View file

@ -40,6 +40,7 @@ use crate::dom::htmlobjectelement::HTMLObjectElement;
use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
use crate::dom::htmloptionelement::HTMLOptionElement;
use crate::dom::htmloutputelement::HTMLOutputElement;
use crate::dom::htmlpreelement::HTMLPreElement;
use crate::dom::htmlscriptelement::HTMLScriptElement;
use crate::dom::htmlselectelement::HTMLSelectElement;
use crate::dom::htmlsourceelement::HTMLSourceElement;
@ -233,6 +234,9 @@ pub fn vtable_for(node: &Node) -> &dyn VirtualMethods {
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOutputElement)) => {
node.downcast::<HTMLOutputElement>().unwrap() as &dyn VirtualMethods
},
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLPreElement)) => {
node.downcast::<HTMLPreElement>().unwrap() as &dyn VirtualMethods
},
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLScriptElement)) => {
node.downcast::<HTMLScriptElement>().unwrap() as &dyn VirtualMethods
},

View file

@ -12,6 +12,5 @@ interface HTMLPreElement : HTMLElement {
// https://html.spec.whatwg.org/multipage/#HTMLPreElement-partial
partial interface HTMLPreElement {
// [CEReactions]
// attribute long width;
[CEReactions] attribute long width;
};

View file

@ -2823,9 +2823,6 @@
[HTMLAllCollection interface: existence and properties of interface prototype object]
expected: FAIL
[HTMLPreElement interface: document.createElement("listing") must inherit property "width" with the proper type]
expected: FAIL
[HTMLHRElement interface: document.createElement("hr") must inherit property "noShade" with the proper type]
expected: FAIL
@ -3867,9 +3864,6 @@
[HTMLAreaElement interface: attribute referrerPolicy]
expected: FAIL
[HTMLPreElement interface: attribute width]
expected: FAIL
[HTMLInputElement interface: createInput("week") must inherit property "height" with the proper type]
expected: FAIL
@ -4272,9 +4266,6 @@
[HTMLParamElement interface: attribute type]
expected: FAIL
[HTMLPreElement interface: document.createElement("xmp") must inherit property "width" with the proper type]
expected: FAIL
[HTMLTableRowElement interface: document.createElement("tr") must inherit property "ch" with the proper type]
expected: FAIL
@ -4566,9 +4557,6 @@
[HTMLInputElement interface: createInput("week") must inherit property "autofocus" with the proper type]
expected: FAIL
[HTMLPreElement interface: document.createElement("pre") must inherit property "width" with the proper type]
expected: FAIL
[HTMLOptGroupElement interface: attribute label]
expected: FAIL

View file

@ -2265,12 +2265,6 @@
[pre.tabIndex: IDL set to -2147483648 followed by getAttribute()]
expected: FAIL
[pre.width: typeof IDL attribute]
expected: FAIL
[pre.width: IDL get with DOM attribute unset]
expected: FAIL
[pre.width: setAttribute() to -36 followed by IDL get]
expected: FAIL
@ -14622,174 +14616,12 @@
[pre.width: setAttribute() to -1]
expected: FAIL
[pre.width: setAttribute() to 0]
expected: FAIL
[pre.width: setAttribute() to 1]
expected: FAIL
[pre.width: setAttribute() to 2147483647]
expected: FAIL
[pre.width: setAttribute() to -2147483648]
expected: FAIL
[pre.width: setAttribute() to 2147483648]
expected: FAIL
[pre.width: setAttribute() to -2147483649]
expected: FAIL
[pre.width: setAttribute() to 4294967295]
expected: FAIL
[pre.width: setAttribute() to 4294967296]
expected: FAIL
[pre.width: setAttribute() to ""]
expected: FAIL
[pre.width: setAttribute() to "-1"]
expected: FAIL
[pre.width: setAttribute() to "-0"]
expected: FAIL
[pre.width: setAttribute() to "0"]
expected: FAIL
[pre.width: setAttribute() to "1"]
expected: FAIL
[pre.width: 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 "]
expected: FAIL
[pre.width: setAttribute() to "\\t7"]
expected: FAIL
[pre.width: setAttribute() to "\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\f7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "\\n7"]
expected: FAIL
[pre.width: setAttribute() to "\\r7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to undefined]
expected: FAIL
[pre.width: setAttribute() to 1.5]
expected: FAIL
[pre.width: setAttribute() to true]
expected: FAIL
[pre.width: setAttribute() to false]
expected: FAIL
[pre.width: setAttribute() to object "[object Object\]"]
expected: FAIL
[pre.width: setAttribute() to NaN]
expected: FAIL
[pre.width: setAttribute() to Infinity]
expected: FAIL
[pre.width: setAttribute() to -Infinity]
expected: FAIL
[pre.width: setAttribute() to "\\0"]
expected: FAIL
[pre.width: setAttribute() to object "2"]
expected: FAIL
[pre.width: setAttribute() to object "3"]
expected: FAIL
[pre.width: IDL set to -36]
expected: FAIL
[pre.width: IDL set to -1]
expected: FAIL
[pre.width: IDL set to 0]
expected: FAIL
[pre.width: IDL set to 1]
expected: FAIL
[pre.width: IDL set to 2147483647]
expected: FAIL
[pre.width: IDL set to -2147483648]
expected: FAIL
[blockquote.accessKey: setAttribute() to ""]
expected: FAIL
@ -17454,9 +17286,6 @@
[blockquote.cite: IDL set to "5%"]
expected: FAIL
[pre.width: setAttribute() to "5%"]
expected: FAIL
[ol.start: setAttribute() to "7"]
expected: FAIL
@ -17508,9 +17337,6 @@
[ol.start: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[hr.size: setAttribute() to "5%"]
expected: FAIL
@ -17520,21 +17346,9 @@
[hr.tabIndex: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[li.accessKey: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[ul.accessKey: IDL set to "5%"]
expected: FAIL
@ -17547,18 +17361,12 @@
[ol.start: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[p.accessKey: IDL set to "5%"]
expected: FAIL
[ol.type: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[figure.accessKey: IDL set to "5%"]
expected: FAIL
@ -17568,15 +17376,9 @@
[dl.accessKey: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[figcaption.tabIndex: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[dt.tabIndex: setAttribute() to "5%"]
expected: FAIL
@ -17637,9 +17439,6 @@
[li.type: IDL set to "5%"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[dl.compact: setAttribute() to "5%"]
expected: FAIL
@ -17649,12 +17448,6 @@
[ol.start: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[p.align: IDL set to "5%"]
expected: FAIL
@ -17688,18 +17481,6 @@
[hr.size: IDL set to "5%"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[figure.tabIndex: setAttribute() to "5%"]
expected: FAIL
@ -17733,15 +17514,6 @@
[p.accessKey: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[ol.reversed: IDL set to "5%"]
expected: FAIL
@ -17859,9 +17631,6 @@
[ol.reversed: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[ul.accessKey: IDL set to "+100"]
expected: FAIL
@ -17895,24 +17664,12 @@
[dd.accessKey: setAttribute() to ".5"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[div.accessKey: IDL set to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[hr.tabIndex: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[main.accessKey: setAttribute() to ".5"]
expected: FAIL
@ -17934,9 +17691,6 @@
[ul.type: setAttribute() to ".5"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.tabIndex: setAttribute() to "+100"]
expected: FAIL
@ -17949,18 +17703,12 @@
[ol.start: setAttribute() to ".5"]
expected: FAIL
[pre.width: setAttribute() to ".5"]
expected: FAIL
[p.tabIndex: setAttribute() to "+100"]
expected: FAIL
[figcaption.tabIndex: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[ol.compact: setAttribute() to "+100"]
expected: FAIL
@ -17970,15 +17718,6 @@
[ol.start: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "+100"]
expected: FAIL
[ol.compact: IDL set to "+100"]
expected: FAIL
@ -18045,21 +17784,12 @@
[main.tabIndex: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[hr.size: setAttribute() to ".5"]
expected: FAIL
[ol.start: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[ol.compact: IDL set to ".5"]
expected: FAIL
@ -18129,21 +17859,9 @@
[hr.noShade: IDL set to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[li.type: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[figure.accessKey: setAttribute() to "+100"]
expected: FAIL
@ -18180,18 +17898,9 @@
[ul.type: IDL set to ".5"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[main.accessKey: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[p.accessKey: IDL set to ".5"]
expected: FAIL
@ -19845,30 +19554,6 @@
[pre.tabIndex: setAttribute() to object "3"]
expected: FAIL
[pre.width: setAttribute() to "-"]
expected: FAIL
[pre.width: setAttribute() to "+"]
expected: FAIL
[pre.width: setAttribute() to "\\t\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\n\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\f\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\r\\v7"]
expected: FAIL
[pre.width: setAttribute() to " \\v7"]
expected: FAIL
[pre.width: setAttribute() to "7\\v"]
expected: FAIL
[blockquote.tabIndex: setAttribute() to "7\\v"]
expected: FAIL

View file

@ -2982,9 +2982,6 @@
[HTMLMarqueeElement interface: document.createElement("marquee") must inherit property "behavior" with the proper type]
expected: FAIL
[HTMLPreElement interface: document.createElement("listing") must inherit property "width" with the proper type]
expected: FAIL
[HTMLInputElement interface: createInput("file") must inherit property "align" with the proper type]
expected: FAIL
@ -3690,9 +3687,6 @@
[HTMLAreaElement interface: attribute referrerPolicy]
expected: FAIL
[HTMLPreElement interface: attribute width]
expected: FAIL
[HTMLInputElement interface: createInput("week") must inherit property "height" with the proper type]
expected: FAIL
@ -4077,9 +4071,6 @@
[HTMLParamElement interface: attribute type]
expected: FAIL
[HTMLPreElement interface: document.createElement("xmp") must inherit property "width" with the proper type]
expected: FAIL
[HTMLTableRowElement interface: document.createElement("tr") must inherit property "ch" with the proper type]
expected: FAIL
@ -4362,9 +4353,6 @@
[HTMLTableCellElement interface: document.createElement("td") must inherit property "headers" with the proper type]
expected: FAIL
[HTMLPreElement interface: document.createElement("pre") must inherit property "width" with the proper type]
expected: FAIL
[HTMLOptGroupElement interface: attribute label]
expected: FAIL

View file

@ -1259,195 +1259,18 @@
[pre.tabIndex: IDL set to -2147483648]
expected: FAIL
[pre.width: typeof IDL attribute]
expected: FAIL
[pre.width: IDL get with DOM attribute unset]
expected: FAIL
[pre.width: setAttribute() to -36]
expected: FAIL
[pre.width: setAttribute() to -1]
expected: FAIL
[pre.width: setAttribute() to 0]
expected: FAIL
[pre.width: setAttribute() to 1]
expected: FAIL
[pre.width: setAttribute() to 2147483647]
expected: FAIL
[pre.width: setAttribute() to -2147483648]
expected: FAIL
[pre.width: setAttribute() to 2147483648]
expected: FAIL
[pre.width: setAttribute() to -2147483649]
expected: FAIL
[pre.width: setAttribute() to 4294967295]
expected: FAIL
[pre.width: setAttribute() to 4294967296]
expected: FAIL
[pre.width: setAttribute() to ""]
expected: FAIL
[pre.width: setAttribute() to "-1"]
expected: FAIL
[pre.width: setAttribute() to "-0"]
expected: FAIL
[pre.width: setAttribute() to "0"]
expected: FAIL
[pre.width: setAttribute() to "1"]
expected: FAIL
[pre.width: 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 "]
expected: FAIL
[pre.width: setAttribute() to "\\t7"]
expected: FAIL
[pre.width: setAttribute() to "\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\f7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "\\n7"]
expected: FAIL
[pre.width: setAttribute() to "\\r7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to "7"]
expected: FAIL
[pre.width: setAttribute() to " 7"]
expected: FAIL
[pre.width: setAttribute() to undefined]
expected: FAIL
[pre.width: setAttribute() to 1.5]
expected: FAIL
[pre.width: setAttribute() to "5%"]
expected: FAIL
[pre.width: setAttribute() to "+100"]
expected: FAIL
[pre.width: setAttribute() to ".5"]
expected: FAIL
[pre.width: setAttribute() to true]
expected: FAIL
[pre.width: setAttribute() to false]
expected: FAIL
[pre.width: setAttribute() to object "[object Object\]"]
expected: FAIL
[pre.width: setAttribute() to NaN]
expected: FAIL
[pre.width: setAttribute() to Infinity]
expected: FAIL
[pre.width: setAttribute() to -Infinity]
expected: FAIL
[pre.width: setAttribute() to "\\0"]
expected: FAIL
[pre.width: setAttribute() to object "2"]
expected: FAIL
[pre.width: setAttribute() to object "3"]
expected: FAIL
[pre.width: IDL set to -36]
expected: FAIL
[pre.width: IDL set to -1]
expected: FAIL
[pre.width: IDL set to 0]
expected: FAIL
[pre.width: IDL set to 1]
expected: FAIL
[pre.width: IDL set to 2147483647]
expected: FAIL
[pre.width: IDL set to -2147483648]
expected: FAIL
[blockquote.autofocus: typeof IDL attribute]
expected: FAIL
@ -5951,30 +5774,6 @@
[pre.tabIndex: setAttribute() to object "3"]
expected: FAIL
[pre.width: setAttribute() to "-"]
expected: FAIL
[pre.width: setAttribute() to "+"]
expected: FAIL
[pre.width: setAttribute() to "\\t\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\n\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\f\\v7"]
expected: FAIL
[pre.width: setAttribute() to "\\r\\v7"]
expected: FAIL
[pre.width: setAttribute() to " \\v7"]
expected: FAIL
[pre.width: setAttribute() to "7\\v"]
expected: FAIL
[blockquote.tabIndex: setAttribute() to "7\\v"]
expected: FAIL