Move image cache implementation to the net crate

servo · Mar 27, 2017 · 166c4e8 · 166c4e8
1 parent 72d7ee6
commit 166c4e8
Show file tree

Hide file tree

Showing 11 changed files with 580 additions and 534 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
@@ -24,6 +24,7 @@ ipc-channel = "0.7"
 layout_traits = {path = "../layout_traits"}
 log = "0.3.5"
 msg = {path = "../msg"}
+net = {path = "../net"}
 net_traits = {path = "../net_traits"}
 offscreen_gl_context = "0.8"
 profile_traits = {path = "../profile_traits"}

diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs
@@ -24,6 +24,7 @@ extern crate layout_traits;
 #[macro_use]
 extern crate log;
 extern crate msg;
+extern crate net;
 extern crate net_traits;
 extern crate offscreen_gl_context;
 extern crate profile_traits;

diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs
@@ -16,6 +16,7 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use layout_traits::LayoutThreadFactory;
 use msg::constellation_msg::{FrameId, FrameType, PipelineId, PipelineNamespaceId};
+use net::image_cache::ImageCacheImpl;
 use net_traits::{IpcSend, ResourceThreads};
 use net_traits::image_cache::ImageCache;
 use profile_traits::mem as profile_mem;
@@ -34,6 +35,7 @@ use std::env;
 use std::ffi::OsStr;
 use std::process;
 use std::rc::Rc;
+use std::sync::Arc;
 use std::sync::mpsc::Sender;
 use style_traits::CSSPixel;
 use webrender_traits;
@@ -472,7 +474,7 @@ impl UnprivilegedPipelineContent {
         where LTF: LayoutThreadFactory<Message=Message>,
               STF: ScriptThreadFactory<Message=Message>
     {
-        let image_cache = ImageCache::new(self.webrender_api_sender.create_api());
+        let image_cache = Arc::new(ImageCacheImpl::new(self.webrender_api_sender.create_api()));
         let layout_pair = STF::create(InitialScriptState {
             id: self.id,
             frame_id: self.frame_id,

diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs
@@ -48,4 +48,4 @@ pub trait LayoutThreadFactory {
               content_process_shutdown_chan: Option<IpcSender<()>>,
               webrender_api_sender: webrender_traits::RenderApiSender,
               layout_threads: usize);
-}
+    }