diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2017-01-14 16:16:10 +0100 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-01-14 16:16:53 +0100 |
commit | 9c87cb7e261bd1e00b66d0f15b28421223bd6093 (patch) | |
tree | ff29cf3f265ff331233c4af279cfa0e5bf5e0cb2 | |
parent | c2d2c38b0f329fb2e7d0d975780f5a09a2870607 (diff) | |
download | servo-9c87cb7e261bd1e00b66d0f15b28421223bd6093.tar.gz servo-9c87cb7e261bd1e00b66d0f15b28421223bd6093.zip |
Kill beforescriptexecute and afterscriptexecute (fixes #12446)
-rw-r--r-- | components/atoms/static_atoms.txt | 2 | ||||
-rw-r--r-- | components/script/dom/htmlscriptelement.rs | 20 | ||||
-rw-r--r-- | tests/wpt/metadata/html/semantics/scripting-1/the-script-element/historical.html.ini | 14 |
3 files changed, 0 insertions, 36 deletions
diff --git a/components/atoms/static_atoms.txt b/components/atoms/static_atoms.txt index c2a4ea84ec2..8e28f90e04e 100644 --- a/components/atoms/static_atoms.txt +++ b/components/atoms/static_atoms.txt @@ -54,8 +54,6 @@ click keydown keypress abort -beforescriptexecute -afterscriptexecute invalid change open diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 75d2a0070f2..d80ab78c9f7 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -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, diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/historical.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/historical.html.ini deleted file mode 100644 index be3a51aa29f..00000000000 --- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/historical.html.ini +++ /dev/null @@ -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 - |