Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 07:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use TypeError instead of InvalidState for exception.

Browse source 
Addresses Issue #23202
This commit is contained in:
gatowololo 2019-06-06 16:59:02 -07:00
parent 1e158bbfae
commit 15c06b1b26
5 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bindings/htmlconstructor.rs
View file

@ -182,7 +182,12 @@ where
DomRoot::downcast(element).ok_or(Error::InvalidState) DomRoot::downcast(element).ok_or(Error::InvalidState)
}, },
// Step 10 // Step 10
Some(ConstructionStackEntry::AlreadyConstructedMarker) => Err(Error::InvalidState), Some(ConstructionStackEntry::AlreadyConstructedMarker) => {
let s = "Top of construction stack marked AlreadyConstructed due to \
a custom element constructor constructing itself after super()"
.to_string();
Err(Error::Type(s))
},
} }
} }

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

@ -680,7 +680,9 @@ fn run_upgrade_constructor(
return Err(Error::JSFailed); return Err(Error::JSFailed);
} }
if !same { if !same {
return Err(Error::InvalidState); return Err(Error::Type(
"Returned element is not SameValue as the upgraded element".to_string(),
));
} }
} }
Ok(()) Ok(())

2
components/script/dom/webidls/CustomElementRegistry.webidl
View file

@ -13,7 +13,7 @@ interface CustomElementRegistry {
Promise<void> whenDefined(DOMString name); Promise<void> whenDefined(DOMString name);
}; };
callback CustomElementConstructor = any(); callback CustomElementConstructor = HTMLElement();
dictionary ElementDefinitionOptions { dictionary ElementDefinitionOptions {
DOMString extends; DOMString extends;

10
tests/wpt/metadata/custom-elements/upgrading/Node-cloneNode.html.ini
View file

@ -1,13 +1,3 @@
[Node-cloneNode.html] [Node-cloneNode.html]
[Node.prototype.cloneNode(false) must be able to clone as a customized built-in element when it has an inconsistent "is" attribute] [Node.prototype.cloneNode(false) must be able to clone as a customized built-in element when it has an inconsistent "is" attribute]
expected: FAIL expected: FAIL
[HTMLElement constructor must throw an TypeError when the top of the construction stack is marked AlreadyConstructed due to a custom element constructor constructing itself before super() call]
expected: FAIL
[Upgrading a custom element must throw TypeError when the custom element's constructor returns another element]
expected: FAIL
[HTMLElement constructor must throw an TypeError when the top of the construction stack is marked AlreadyConstructed due to a custom element constructor constructing itself after super() call]
expected: FAIL

16
tests/wpt/metadata/custom-elements/upgrading/upgrading-parser-created-element.html.ini
View file

@ -1,16 +0,0 @@
[upgrading-parser-created-element.html]
[Upgrading a custom element whose constructor returns a Text node must throw]
expected: FAIL
[HTMLElement constructor must throw an TypeError when the top of the construction stack is marked AlreadyConstructed due to a custom element constructor constructing itself after super() call]
expected: FAIL
[Upgrading a custom element whose constructor returns an Element must throw]
expected: FAIL
[Upgrading a custom element must throw an TypeError when the returned element is not SameValue as the upgraded element]
expected: FAIL
[HTMLElement constructor must throw an TypeError when the top of the construction stack is marked AlreadyConstructed due to a custom element constructor constructing itself before super() call]
expected: FAIL