mirror of
https://github.com/servo/servo.git
synced 2025-09-30 16:49:16 +01:00
script: use Element::create
instead of DOM struct constructors (#39325)
Creating elements by directly calling their interface constructors leads to some state not being intialized correctly (see #39285). It is also not in line with the specifications as many of them refer to the [`create an element`][1] algorithm when an element needs to be created, which directly maps to `Element::create` in the script crate. So, switch all such places where elements are created by script to use `Element::create`. [1]: https://dom.spec.whatwg.org/#concept-create-element Testing: Existing WPT tests. Fixes: #39285 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
parent
2b261b02bf
commit
07b2ff5d60
13 changed files with 254 additions and 98 deletions
|
@ -5,7 +5,7 @@
|
|||
use std::cell::Cell;
|
||||
|
||||
use dom_struct::dom_struct;
|
||||
use html5ever::{LocalName, Prefix, local_name, ns};
|
||||
use html5ever::{LocalName, Prefix, QualName, local_name, ns};
|
||||
use js::rust::HandleObject;
|
||||
use style::attr::{AttrValue, LengthOrPercentageOrAuto, parse_unsigned_integer};
|
||||
use style::color::AbsoluteColor;
|
||||
|
@ -19,7 +19,9 @@ use crate::dom::bindings::inheritance::Castable;
|
|||
use crate::dom::bindings::root::{Dom, DomRoot, LayoutDom, MutNullableDom};
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::document::Document;
|
||||
use crate::dom::element::{AttributeMutation, Element, LayoutElementHelpers};
|
||||
use crate::dom::element::{
|
||||
AttributeMutation, CustomElementCreationMode, Element, ElementCreator, LayoutElementHelpers,
|
||||
};
|
||||
use crate::dom::html::htmlcollection::{CollectionFilter, HTMLCollection};
|
||||
use crate::dom::html::htmlelement::HTMLElement;
|
||||
use crate::dom::html::htmltablecaptionelement::HTMLTableCaptionElement;
|
||||
|
@ -150,8 +152,18 @@ impl HTMLTableElement {
|
|||
return section;
|
||||
}
|
||||
|
||||
let section =
|
||||
HTMLTableSectionElement::new(atom.clone(), None, &self.owner_document(), None, can_gc);
|
||||
let section = Element::create(
|
||||
QualName::new(None, ns!(html), atom.clone()),
|
||||
None,
|
||||
&self.owner_document(),
|
||||
ElementCreator::ScriptCreated,
|
||||
CustomElementCreationMode::Asynchronous,
|
||||
None,
|
||||
can_gc,
|
||||
);
|
||||
|
||||
let section = DomRoot::downcast::<HTMLTableSectionElement>(section).unwrap();
|
||||
|
||||
match *atom {
|
||||
local_name!("thead") => self.SetTHead(Some(§ion)),
|
||||
local_name!("tfoot") => self.SetTFoot(Some(§ion)),
|
||||
|
@ -227,13 +239,17 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
|
|||
match self.GetCaption() {
|
||||
Some(caption) => caption,
|
||||
None => {
|
||||
let caption = HTMLTableCaptionElement::new(
|
||||
local_name!("caption"),
|
||||
let caption = Element::create(
|
||||
QualName::new(None, ns!(html), local_name!("caption")),
|
||||
None,
|
||||
&self.owner_document(),
|
||||
ElementCreator::ScriptCreated,
|
||||
CustomElementCreationMode::Asynchronous,
|
||||
None,
|
||||
can_gc,
|
||||
);
|
||||
let caption = DomRoot::downcast::<HTMLTableCaptionElement>(caption).unwrap();
|
||||
|
||||
self.SetCaption(Some(&caption))
|
||||
.expect("Generated caption is invalid");
|
||||
caption
|
||||
|
@ -329,13 +345,16 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
|
|||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-table-createtbody
|
||||
fn CreateTBody(&self, can_gc: CanGc) -> DomRoot<HTMLTableSectionElement> {
|
||||
let tbody = HTMLTableSectionElement::new(
|
||||
local_name!("tbody"),
|
||||
let tbody = Element::create(
|
||||
QualName::new(None, ns!(html), local_name!("tbody")),
|
||||
None,
|
||||
&self.owner_document(),
|
||||
ElementCreator::ScriptCreated,
|
||||
CustomElementCreationMode::Asynchronous,
|
||||
None,
|
||||
can_gc,
|
||||
);
|
||||
let tbody = DomRoot::downcast::<HTMLTableSectionElement>(tbody).unwrap();
|
||||
let node = self.upcast::<Node>();
|
||||
let last_tbody = node
|
||||
.rev_children()
|
||||
|
@ -357,13 +376,16 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
|
|||
return Err(Error::IndexSize);
|
||||
}
|
||||
|
||||
let new_row = HTMLTableRowElement::new(
|
||||
local_name!("tr"),
|
||||
let new_row = Element::create(
|
||||
QualName::new(None, ns!(html), local_name!("tr")),
|
||||
None,
|
||||
&self.owner_document(),
|
||||
ElementCreator::ScriptCreated,
|
||||
CustomElementCreationMode::Asynchronous,
|
||||
None,
|
||||
can_gc,
|
||||
);
|
||||
let new_row = DomRoot::downcast::<HTMLTableRowElement>(new_row).unwrap();
|
||||
let node = self.upcast::<Node>();
|
||||
|
||||
if number_of_row_elements == 0 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue