Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove ProgressSender::Listener.

Browse source
This commit is contained in:
Ms2ger 2016-10-11 18:12:01 +02:00
parent 8a6016013e
commit fe3d512ea4
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/net/resource_thread.rs
View file

@ -24,8 +24,8 @@ use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper_serde::Serde; use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender}; use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender};
use mime_classifier::{ApacheBugFlag, MimeClassifier, NoSniffFlag}; use mime_classifier::{ApacheBugFlag, MimeClassifier, NoSniffFlag};
use net_traits::{AsyncResponseTarget, CoreResourceThread, Metadata, ProgressMsg, ResponseAction}; use net_traits::{CookieSource, CoreResourceThread, Metadata, ProgressMsg};
use net_traits::{CookieSource, CoreResourceMsg, FetchResponseMsg, FetchTaskTarget, LoadConsumer}; use net_traits::{CoreResourceMsg, FetchResponseMsg, FetchTaskTarget, LoadConsumer};
use net_traits::{CustomResponseMediator, LoadData, LoadResponse, NetworkError, ResourceId}; use net_traits::{CustomResponseMediator, LoadData, LoadResponse, NetworkError, ResourceId};
use net_traits::{ResourceThreads, WebSocketCommunicate, WebSocketConnectData}; use net_traits::{ResourceThreads, WebSocketCommunicate, WebSocketConnectData};
use net_traits::LoadContext; use net_traits::LoadContext;
@ -57,7 +57,6 @@ const TFD_PROVIDER: &'static TFDProvider = &TFDProvider;
pub enum ProgressSender { pub enum ProgressSender {
Channel(IpcSender<ProgressMsg>), Channel(IpcSender<ProgressMsg>),
Listener(AsyncResponseTarget),
} }
#[derive(Clone)] #[derive(Clone)]
@ -73,14 +72,6 @@ impl ProgressSender {
pub fn send(&self, msg: ProgressMsg) -> Result<(), ()> { pub fn send(&self, msg: ProgressMsg) -> Result<(), ()> {
match *self { match *self {
ProgressSender::Channel(ref c) => c.send(msg).map_err(|_| ()), ProgressSender::Channel(ref c) => c.send(msg).map_err(|_| ()),
ProgressSender::Listener(ref b) => {
let action = match msg {
ProgressMsg::Payload(buf) => ResponseAction::DataAvailable(buf),
ProgressMsg::Done(status) => ResponseAction::ResponseComplete(status),
};
b.invoke_with_listener(action);
Ok(())
}
} }
} }
} }