diff --git a/src/components/main/layout/context.rs b/src/components/main/layout/context.rs index bcb89fe5a88..6d0391aaa85 100644 --- a/src/components/main/layout/context.rs +++ b/src/components/main/layout/context.rs @@ -55,7 +55,7 @@ local_data_key!(style_sharing_candidate_cache: *mut StyleSharingCandidateCache) #[deriving(Clone)] pub struct LayoutContext { /// The local image cache. - pub image_cache: Arc>>, + pub image_cache: Arc>, /// The current screen size. pub screen_size: Size2D, diff --git a/src/components/main/layout/fragment.rs b/src/components/main/layout/fragment.rs index a6865ef759c..3ee3f7586c9 100644 --- a/src/components/main/layout/fragment.rs +++ b/src/components/main/layout/fragment.rs @@ -134,7 +134,7 @@ impl ImageFragmentInfo { /// me. pub fn new(node: &ThreadSafeLayoutNode, image_url: Url, - local_image_cache: Arc>>) + local_image_cache: Arc>) -> ImageFragmentInfo { fn convert_length(node: &ThreadSafeLayoutNode, name: &str) -> Option { let element = node.as_element(); diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs index a486499556d..1bd7b939108 100644 --- a/src/components/main/layout/layout_task.rs +++ b/src/components/main/layout/layout_task.rs @@ -85,7 +85,7 @@ pub struct LayoutTask { pub image_cache_task: ImageCacheTask, /// The local image cache. - pub local_image_cache: Arc>>, + pub local_image_cache: Arc>, /// The size of the viewport. pub screen_size: Size2D, @@ -312,7 +312,7 @@ impl LayoutTask { opts: &Opts, profiler_chan: ProfilerChan) -> LayoutTask { - let local_image_cache = Arc::new(Mutex::new(box LocalImageCache(image_cache_task.clone()))); + let local_image_cache = Arc::new(Mutex::new(LocalImageCache(image_cache_task.clone()))); let screen_size = Size2D(Au(0), Au(0)); let parallel_traversal = if opts.layout_threads != 1 { Some(WorkQueue::new("LayoutWorker", opts.layout_threads, ptr::mut_null())) diff --git a/src/components/net/image/holder.rs b/src/components/net/image/holder.rs index 671dbb4368c..c739229e9a5 100644 --- a/src/components/net/image/holder.rs +++ b/src/components/net/image/holder.rs @@ -22,11 +22,11 @@ pub struct ImageHolder { url: Url, image: Option>>, cached_size: Size2D, - local_image_cache: Arc>>, + local_image_cache: Arc>, } impl ImageHolder { - pub fn new(url: Url, local_image_cache: Arc>>) -> ImageHolder { + pub fn new(url: Url, local_image_cache: Arc>) -> ImageHolder { debug!("ImageHolder::new() {}", url.to_str()); let holder = ImageHolder { url: url,