From 31da37fa6c134d586240bc4d025451570a825fd4 Mon Sep 17 00:00:00 2001 From: Gregory Terzian Date: Sun, 22 Jul 2018 19:25:27 +0800 Subject: [PATCH] stopping tokenizer if parser is aborted --- components/script/dom/servoparser/mod.rs | 3 +++ .../navigating-across-documents/010.html.ini | 3 ++- .../opening-the-input-stream/aborted-parser.window.js.ini | 7 +------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs index 23a128af2cf..cc1da9b6c77 100644 --- a/components/script/dom/servoparser/mod.rs +++ b/components/script/dom/servoparser/mod.rs @@ -482,6 +482,9 @@ impl ServoParser { self.suspended.set(true); return; } + if self.aborted.get() { + return; + } } } diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/010.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/010.html.ini index 4dc31aa432a..cf12f241471 100644 --- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/010.html.ini +++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/010.html.ini @@ -1,3 +1,4 @@ [010.html] type: testharness - expected: TIMEOUT + [Link with onclick form submit to javascript url with delayed document.write and href navigation ] + expected: FAIL diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js.ini index 61cd7b4d408..97ff398498d 100644 --- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js.ini +++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js.ini @@ -1,8 +1,3 @@ [aborted-parser.window.html] - expected: TIMEOUT [document.open() after parser is aborted] - expected: TIMEOUT - - [async document.open() after parser is aborted] - expected: TIMEOUT - + expected: FAIL