mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Remove box from image cache task.
This commit is contained in:
parent
b224c414c2
commit
6f6b149d50
4 changed files with 6 additions and 6 deletions
|
@ -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<Mutex<Box<LocalImageCache>>>,
|
||||
pub image_cache: Arc<Mutex<LocalImageCache>>,
|
||||
|
||||
/// The current screen size.
|
||||
pub screen_size: Size2D<Au>,
|
||||
|
|
|
@ -134,7 +134,7 @@ impl ImageFragmentInfo {
|
|||
/// me.
|
||||
pub fn new(node: &ThreadSafeLayoutNode,
|
||||
image_url: Url,
|
||||
local_image_cache: Arc<Mutex<Box<LocalImageCache>>>)
|
||||
local_image_cache: Arc<Mutex<LocalImageCache>>)
|
||||
-> ImageFragmentInfo {
|
||||
fn convert_length(node: &ThreadSafeLayoutNode, name: &str) -> Option<Au> {
|
||||
let element = node.as_element();
|
||||
|
|
|
@ -85,7 +85,7 @@ pub struct LayoutTask {
|
|||
pub image_cache_task: ImageCacheTask,
|
||||
|
||||
/// The local image cache.
|
||||
pub local_image_cache: Arc<Mutex<Box<LocalImageCache>>>,
|
||||
pub local_image_cache: Arc<Mutex<LocalImageCache>>,
|
||||
|
||||
/// The size of the viewport.
|
||||
pub screen_size: Size2D<Au>,
|
||||
|
@ -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()))
|
||||
|
|
|
@ -22,11 +22,11 @@ pub struct ImageHolder {
|
|||
url: Url,
|
||||
image: Option<Arc<Box<Image>>>,
|
||||
cached_size: Size2D<int>,
|
||||
local_image_cache: Arc<Mutex<Box<LocalImageCache>>>,
|
||||
local_image_cache: Arc<Mutex<LocalImageCache>>,
|
||||
}
|
||||
|
||||
impl ImageHolder {
|
||||
pub fn new(url: Url, local_image_cache: Arc<Mutex<Box<LocalImageCache>>>) -> ImageHolder {
|
||||
pub fn new(url: Url, local_image_cache: Arc<Mutex<LocalImageCache>>) -> ImageHolder {
|
||||
debug!("ImageHolder::new() {}", url.to_str());
|
||||
let holder = ImageHolder {
|
||||
url: url,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue