Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Prevent infinite recursion when upgrading custom elements

Browse source
This commit is contained in:
Patrick Shaughnessy 2020-01-22 18:44:33 -05:00
parent 24674687ac
commit 10869f66b5
3 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/customelementregistry.rs
View file

@ -586,13 +586,17 @@ impl CustomElementDefinition {
/// <https://html.spec.whatwg.org/multipage/#concept-upgrade-an-element>
#[allow(unsafe_code)]
pub fn upgrade_element(definition: Rc<CustomElementDefinition>, element: &Element) {
// Steps 1-2
// Step 1
let state = element.get_custom_element_state();
if state == CustomElementState::Custom || state == CustomElementState::Failed {
if state != CustomElementState::Undefined && state != CustomElementState::Uncustomized {
return;
}
// Step 3 happens later to save having to undo it in an exception
// Step 2
element.set_custom_element_definition(Rc::clone(&definition));
// Step 3
element.set_custom_element_state(CustomElementState::Failed);
// Step 4
for attr in element.attrs().iter() {
@ -630,14 +634,12 @@ pub fn upgrade_element(definition: Rc<CustomElementDefinition>, element: &Elemen
// Step 8 exception handling
if let Err(error) = result {
// Step 8.exception.1
element.set_custom_element_state(CustomElementState::Failed);
element.clear_custom_element_definition();
// Step 8.exception.2 isn't needed since step 3 hasn't happened yet
// Step 8.exception.3
// Step 8.exception.2
element.clear_reaction_queue();
// Step 8.exception.4
// Step 8.exception.3
let global = GlobalScope::current().expect("No current global");
let cx = global.get_cx();
unsafe {
@ -651,11 +653,7 @@ pub fn upgrade_element(definition: Rc<CustomElementDefinition>, element: &Elemen
// TODO Step 9: "If element is a form-associated custom element..."
// Step 10
element.set_custom_element_state(CustomElementState::Custom);
// Step 3
element.set_custom_element_definition(definition);
}
/// <https://html.spec.whatwg.org/multipage/#concept-upgrade-an-element>

4
components/script/dom/element.rs
View file

@ -342,6 +342,10 @@ impl Element {
self.rare_data().as_ref()?.custom_element_definition.clone()
}
pub fn clear_custom_element_definition(&self) {
self.ensure_rare_data().custom_element_definition = None;
}
pub fn push_callback_reaction(&self, function: Rc<Function>, args: Box<[Heap<JSVal>]>) {
self.ensure_rare_data()
.custom_element_reaction_queue

7
tests/wpt/metadata/custom-elements/upgrading.html.ini
View file

@ -4,10 +4,3 @@
[If definition's disable shadow is true and element's shadow root is non-null, then throw a "NotSupportedError" DOMException.]
expected: FAIL
[Infinite constructor recursion with upgrade(this) should not be possible]
expected: FAIL
[Infinite constructor recursion with appendChild should not be possible]
expected: FAIL