aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-27 04:19:24 -0800
committerGitHub <noreply@github.com>2017-01-27 04:19:24 -0800
commitba7696ebc64c1a73aee1547fcea8b75b2a1eb4b1 (patch)
tree4ae99de08c165068c4b4fe06da1359ae52b250bc /components/script/script_thread.rs
parent10354ea37f76ba216a77230e39e5c2e3164f7111 (diff)
parentd8238646a018579bfeec260abaadf518093c098f (diff)
downloadservo-ba7696ebc64c1a73aee1547fcea8b75b2a1eb4b1.tar.gz
servo-ba7696ebc64c1a73aee1547fcea8b75b2a1eb4b1.zip
Auto merge of #15220 - nox:kill-parser-pipeline, r=SimonSapin,jdm
Kill ServoParser::pipeline <!-- 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/15220) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs12
1 files changed, 2 insertions, 10 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 7af80f5f7fc..9bab1679aa6 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1817,17 +1817,9 @@ impl ScriptThread {
document.set_https_state(metadata.https_state);
if is_html_document == IsHTMLDocument::NonHTMLDocument {
- ServoParser::parse_xml_document(
- &document,
- parse_input,
- final_url,
- Some(incomplete.pipeline_id));
+ ServoParser::parse_xml_document(&document, parse_input, final_url);
} else {
- ServoParser::parse_html_document(
- &document,
- parse_input,
- final_url,
- Some(incomplete.pipeline_id));
+ ServoParser::parse_html_document(&document, parse_input, final_url);
}
if incomplete.is_frozen {