corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #14201 - Reorganise ServoParser (from nox:write); r=SimonSapin

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d22adfd42c870c75b6a8247f3e9d7b362ffbe18
This commit is contained in:
Anthony Ramine
2016-11-14 10:22:25 -06:00
parent b5c242484b
commit c60c0fb4e9
8 changed files with 291 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
servo/components/script/script_thread.rs
View File

@@ -51,8 +51,6 @@ use dom::node::{Node, NodeDamage, window_from_node};
use dom::serviceworker::TrustedServiceWorkerAddress;
use dom::serviceworkerregistration::ServiceWorkerRegistration;
use dom::servoparser::{ParserContext, ServoParser};
use dom::servoparser::html::{ParseContext, parse_html};
use dom::servoparser::xml::{self, parse_xml};
use dom::transitionevent::TransitionEvent;
use dom::uievent::UIEvent;
use dom::window::{ReflowReason, Window};
@@ -1779,15 +1777,17 @@ impl ScriptThread {
};
if is_xml {
parse_xml(&document,
parse_input,
final_url,
xml::ParseContext::Owner(Some(incomplete.pipeline_id)));
ServoParser::parse_xml_document(
&document,
parse_input,
final_url,
Some(incomplete.pipeline_id));
} else {
parse_html(&document,
parse_input,
final_url,
ParseContext::Owner(Some(incomplete.pipeline_id)));
ServoParser::parse_html_document(
&document,
parse_input,
final_url,
Some(incomplete.pipeline_id));
}
if incomplete.is_frozen {