diff --git a/servo/components/net/storage_thread.rs b/servo/components/net/storage_thread.rs index 49c65c96e199..bd48993e4505 100644 --- a/servo/components/net/storage_thread.rs +++ b/servo/components/net/storage_thread.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; -use net_traits::storage_thread::{StorageThread, StorageThreadMsg, StorageType}; +use net_traits::storage_thread::{StorageThreadMsg, StorageType}; use resource_thread; use std::borrow::ToOwned; use std::collections::BTreeMap; @@ -18,9 +18,9 @@ pub trait StorageThreadFactory { fn new() -> Self; } -impl StorageThreadFactory for StorageThread { - /// Create a StorageThread - fn new() -> StorageThread { +impl StorageThreadFactory for IpcSender { + /// Create a storage thread + fn new() -> IpcSender { let (chan, port) = ipc::channel().unwrap(); spawn_named("StorageManager".to_owned(), move || { StorageManager::new(port).start(); diff --git a/servo/components/net_traits/lib.rs b/servo/components/net_traits/lib.rs index 94b43b656942..c940f3b0f68f 100644 --- a/servo/components/net_traits/lib.rs +++ b/servo/components/net_traits/lib.rs @@ -38,7 +38,7 @@ use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use std::io::Error as IOError; use std::sync::mpsc::Sender; use std::thread; -use storage_thread::{StorageThread, StorageThreadMsg}; +use storage_thread::StorageThreadMsg; use url::Url; use websocket::header; @@ -199,11 +199,11 @@ pub trait IpcSend where T: serde::Serialize + serde::Deserialize { #[derive(Clone, Serialize, Deserialize)] pub struct ResourceThreads { core_thread: CoreResourceThread, - storage_thread: StorageThread, + storage_thread: IpcSender, } impl ResourceThreads { - pub fn new(c: CoreResourceThread, s: StorageThread) -> ResourceThreads { + pub fn new(c: CoreResourceThread, s: IpcSender) -> ResourceThreads { ResourceThreads { core_thread: c, storage_thread: s, diff --git a/servo/components/net_traits/storage_thread.rs b/servo/components/net_traits/storage_thread.rs index f544c50a059c..1f343ee201dd 100644 --- a/servo/components/net_traits/storage_thread.rs +++ b/servo/components/net_traits/storage_thread.rs @@ -38,8 +38,3 @@ pub enum StorageThreadMsg { /// shut down this thread Exit } - -/// Handle to a storage thread -pub type StorageThread = IpcSender; - - diff --git a/servo/components/script/dom/storage.rs b/servo/components/script/dom/storage.rs index c3004a1031a6..a71881fccd66 100644 --- a/servo/components/script/dom/storage.rs +++ b/servo/components/script/dom/storage.rs @@ -14,9 +14,9 @@ use dom::browsingcontext::IterableContext; use dom::event::{Event, EventBubbles, EventCancelable}; use dom::storageevent::StorageEvent; use dom::urlhelper::UrlHelper; -use ipc_channel::ipc; +use ipc_channel::ipc::{self, IpcSender}; use net_traits::IpcSend; -use net_traits::storage_thread::{StorageThread, StorageThreadMsg, StorageType}; +use net_traits::storage_thread::{StorageThreadMsg, StorageType}; use script_thread::{MainThreadRunnable, ScriptThread}; use task_source::dom_manipulation::DOMManipulationTask; use url::Url; @@ -46,7 +46,7 @@ impl Storage { global_ref.get_url() } - fn get_storage_thread(&self) -> StorageThread { + fn get_storage_thread(&self) -> IpcSender { let global_root = self.global(); let global_ref = global_root.r(); global_ref.as_window().resource_threads().sender()