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

Auto merge of #15024 - nox:load-fixes, r=jdm

Browse source 
Kill beforescriptexecute and afterscriptexecute (fixes #12446)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15024)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-14 07:17:40 -08:00 • committed by GitHub
commit ed7c34a79a
3 changed files with 0 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/atoms/static_atoms.txt
View file

@ -54,8 +54,6 @@ click
keydown
keypress
abort
beforescriptexecute
afterscriptexecute
invalid
change
open

20
components/script/dom/htmlscriptelement.rs
View file

@ -481,11 +481,6 @@ impl HTMLScriptElement {
Ok(script) => script,
};
// TODO(#12446): beforescriptexecute.
if self.dispatch_before_script_execute_event() == EventStatus::Canceled {
return;
}
// Step 3.
let neutralized_doc = if script.external {
debug!("loading external script, url = {}", script.url);
@ -517,9 +512,6 @@ impl HTMLScriptElement {
doc.decr_ignore_destructive_writes_counter();
}
// TODO(#12446): afterscriptexecute.
self.dispatch_after_script_execute_event();
// Step 8.
if script.external {
self.dispatch_load_event();
@ -531,18 +523,6 @@ impl HTMLScriptElement {
window.dom_manipulation_task_source().queue_simple_event(self.upcast(), atom!("error"), &window);
}
pub fn dispatch_before_script_execute_event(&self) -> EventStatus {
self.dispatch_event(atom!("beforescriptexecute"),
EventBubbles::Bubbles,
EventCancelable::Cancelable)
}
pub fn dispatch_after_script_execute_event(&self) {
self.dispatch_event(atom!("afterscriptexecute"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable);
}
pub fn dispatch_load_event(&self) {
self.dispatch_event(atom!("load"),
EventBubbles::DoesNotBubble,

14
tests/wpt/metadata/html/semantics/scripting-1/the-script-element/historical.html.ini
View file

@ -1,14 +0,0 @@
[historical.html]
type: testharness
[onbeforescriptexecute content attribute should not be supported]
expected: FAIL
[onafterscriptexecute content attribute should not be supported]
expected: FAIL
[beforescriptexecute event should not be supported]
expected: FAIL
[afterscriptexecute event should not be supported]
expected: FAIL