mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Treat the keygen
element as obsolete (#30429)
* Eradicate the `keygen` element * Run `./mach fmt` * Fix relevant Servo test * Fix outdated manifest
This commit is contained in:
parent
f330cf534d
commit
80d9a2bb4f
10 changed files with 31 additions and 47 deletions
|
@ -308,6 +308,8 @@ pub fn create_native_html_element(
|
|||
// https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:isindex-2
|
||||
local_name!("isindex") => make!(HTMLUnknownElement),
|
||||
local_name!("kbd") => make!(HTMLElement),
|
||||
// https://html.spec.whatwg.org/multipage/#keygen
|
||||
local_name!("keygen") => make!(HTMLUnknownElement),
|
||||
local_name!("label") => make!(HTMLLabelElement),
|
||||
local_name!("legend") => make!(HTMLLegendElement),
|
||||
local_name!("li") => make!(HTMLLIElement),
|
||||
|
|
|
@ -3949,13 +3949,21 @@ impl Element {
|
|||
fn click_event_filter_by_disabled_state(&self) -> bool {
|
||||
let node = self.upcast::<Node>();
|
||||
match node.type_id() {
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLButtonElement)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) |
|
||||
// NodeTypeId::Element(ElementTypeId::HTMLKeygenElement) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptionElement)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSelectElement)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement))
|
||||
if self.disabled_state() => true,
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(
|
||||
HTMLElementTypeId::HTMLButtonElement,
|
||||
)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(
|
||||
HTMLElementTypeId::HTMLInputElement,
|
||||
)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(
|
||||
HTMLElementTypeId::HTMLOptionElement,
|
||||
)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(
|
||||
HTMLElementTypeId::HTMLSelectElement,
|
||||
)) |
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(
|
||||
HTMLElementTypeId::HTMLTextAreaElement,
|
||||
)) if self.disabled_state() => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -650,7 +650,6 @@ impl HTMLElement {
|
|||
|
||||
// https://html.spec.whatwg.org/multipage/#category-label
|
||||
pub fn is_labelable_element(&self) -> bool {
|
||||
// Note: HTMLKeygenElement is omitted because Servo doesn't currently implement it
|
||||
match self.upcast::<Node>().type_id() {
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(type_id)) => match type_id {
|
||||
HTMLElementTypeId::HTMLInputElement => {
|
||||
|
@ -670,12 +669,6 @@ impl HTMLElement {
|
|||
|
||||
// https://html.spec.whatwg.org/multipage/#category-listed
|
||||
pub fn is_listed_element(&self) -> bool {
|
||||
// Servo does not implement HTMLKeygenElement
|
||||
// https://github.com/servo/servo/issues/2782
|
||||
if self.upcast::<Element>().local_name() == &local_name!("keygen") {
|
||||
return true;
|
||||
}
|
||||
|
||||
match self.upcast::<Node>().type_id() {
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(type_id)) => match type_id {
|
||||
HTMLElementTypeId::HTMLButtonElement |
|
||||
|
|
|
@ -366,10 +366,10 @@ impl HTMLFormElementMethods for HTMLFormElement {
|
|||
elem.downcast::<HTMLTextAreaElement>().unwrap().form_owner()
|
||||
},
|
||||
_ => {
|
||||
debug_assert!(
|
||||
!elem.downcast::<HTMLElement>().unwrap().is_listed_element() ||
|
||||
elem.local_name() == &local_name!("keygen")
|
||||
);
|
||||
debug_assert!(!elem
|
||||
.downcast::<HTMLElement>()
|
||||
.unwrap()
|
||||
.is_listed_element());
|
||||
return false;
|
||||
},
|
||||
},
|
||||
|
@ -1287,11 +1287,6 @@ impl HTMLFormElement {
|
|||
)) => {
|
||||
child.downcast::<HTMLInputElement>().unwrap().reset();
|
||||
},
|
||||
// TODO HTMLKeygenElement unimplemented
|
||||
//NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLKeygenElement)) => {
|
||||
// // Unimplemented
|
||||
// {}
|
||||
//}
|
||||
NodeTypeId::Element(ElementTypeId::HTMLElement(
|
||||
HTMLElementTypeId::HTMLSelectElement,
|
||||
)) => {
|
||||
|
|
|
@ -521,13 +521,6 @@ impl Tokenizer {
|
|||
|
||||
if let Some(control) = control {
|
||||
control.set_form_owner_from_parser(&form);
|
||||
} else {
|
||||
// TODO remove this code when keygen is implemented.
|
||||
assert_eq!(
|
||||
node.NodeName(),
|
||||
"KEYGEN",
|
||||
"Unknown form-associatable element"
|
||||
);
|
||||
}
|
||||
},
|
||||
ParseOperation::Pop { node } => {
|
||||
|
|
|
@ -1182,13 +1182,6 @@ impl TreeSink for Sink {
|
|||
|
||||
if let Some(control) = control {
|
||||
control.set_form_owner_from_parser(&form);
|
||||
} else {
|
||||
// TODO remove this code when keygen is implemented.
|
||||
assert_eq!(
|
||||
node.NodeName(),
|
||||
"KEYGEN",
|
||||
"Unknown form-associatable element"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue