diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-10 17:07:08 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-11 16:42:01 +0200 |
commit | 4b813e0bdc4c7e908a9ce3f145cf453c4778e2b9 (patch) | |
tree | 7e832207a3a3a3be65fb89d8ab62f80912c09a36 /components/script/script_thread.rs | |
parent | 1405be691776e48836f651c3c616dc12322a0932 (diff) | |
download | servo-4b813e0bdc4c7e908a9ce3f145cf453c4778e2b9.tar.gz servo-4b813e0bdc4c7e908a9ce3f145cf453c4778e2b9.zip |
Merge script::parse and script::dom::servoparser
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index ceb6842a13b..87d4d148253 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -44,7 +44,9 @@ use dom::htmlanchorelement::HTMLAnchorElement; use dom::node::{Node, NodeDamage, window_from_node}; use dom::serviceworker::TrustedServiceWorkerAddress; use dom::serviceworkerregistration::ServiceWorkerRegistration; -use dom::servoparser::ServoParser; +use dom::servoparser::{ParserContext, ServoParser}; +use dom::servoparser::html::{ParseContext, parse_html}; +use dom::servoparser::xml::{self, parse_xml}; use dom::uievent::UIEvent; use dom::window::{ReflowReason, Window}; use dom::worker::TrustedWorkerAddress; @@ -71,9 +73,6 @@ use net_traits::{IpcSend, LoadData as NetLoadData}; use net_traits::bluetooth_thread::BluetoothMethodMsg; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheResult, ImageCacheThread}; use network_listener::NetworkListener; -use parse::ParserContext; -use parse::html::{ParseContext, parse_html}; -use parse::xml::{self, parse_xml}; use profile_traits::mem::{self, OpaqueSender, Report, ReportKind, ReportsChan}; use profile_traits::time::{self, ProfilerCategory, profile}; use script_layout_interface::message::{self, NewLayoutThreadInfo, ReflowQueryType}; |