aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/document_loader.rs
diff options
context:
space:
mode:
authorKeith Yeung <kungfukeith11@gmail.com>2017-10-11 22:32:48 -0700
committerKeith Yeung <kungfukeith11@gmail.com>2017-10-24 20:54:19 -0700
commit99f9696a24ece562f74831dbde957af1149eb9eb (patch)
tree2b497025152d2946b539ae0088f5635443a88296 /components/script/document_loader.rs
parenta65253a11aea13bb7cf26aabdcbac41c02d36f68 (diff)
downloadservo-99f9696a24ece562f74831dbde957af1149eb9eb.tar.gz
servo-99f9696a24ece562f74831dbde957af1149eb9eb.zip
Merge functionality of WebsocketConnect into Fetch
Diffstat (limited to 'components/script/document_loader.rs')
-rw-r--r--components/script/document_loader.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs
index a50cea265fd..6102736c04e 100644
--- a/components/script/document_loader.rs
+++ b/components/script/document_loader.rs
@@ -9,7 +9,8 @@
use dom::bindings::root::Dom;
use dom::document::Document;
use ipc_channel::ipc::IpcSender;
-use net_traits::{CoreResourceMsg, FetchResponseMsg, ResourceThreads, IpcSend};
+use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseMsg};
+use net_traits::{ResourceThreads, IpcSend};
use net_traits::request::RequestInit;
use servo_url::ServoUrl;
use std::thread;
@@ -124,7 +125,8 @@ impl DocumentLoader {
pub fn fetch_async_background(&self,
request: RequestInit,
fetch_target: IpcSender<FetchResponseMsg>) {
- self.resource_threads.sender().send(CoreResourceMsg::Fetch(request, fetch_target)).unwrap();
+ self.resource_threads.sender().send(
+ CoreResourceMsg::Fetch(request, FetchChannels::ResponseMsg(fetch_target))).unwrap();
}
/// Mark an in-progress network request complete.