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

Wrap SharedLayoutContext::image_cache_sender in a Mutex.

Browse source
This commit is contained in:
Ms2ger 2015-11-06 21:55:47 +01:00
parent 1c11bd09df
commit bcd541c02c
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout/context.rs
View file

@ -25,8 +25,8 @@ use std::cell::{RefCell, RefMut};
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::hash_state::DefaultState; use std::collections::hash_state::DefaultState;
use std::rc::Rc; use std::rc::Rc;
use std::sync::Arc;
use std::sync::mpsc::{Sender, channel}; use std::sync::mpsc::{Sender, channel};
use std::sync::{Arc, Mutex};
use style::selector_matching::Stylist; use style::selector_matching::Stylist;
use url::Url; use url::Url;
use util::mem::HeapSizeOf; use util::mem::HeapSizeOf;
@ -80,7 +80,7 @@ pub struct SharedLayoutContext {
pub image_cache_task: ImageCacheTask, pub image_cache_task: ImageCacheTask,
/// A channel for the image cache to send responses to. /// A channel for the image cache to send responses to.
pub image_cache_sender: ImageCacheChan, pub image_cache_sender: Mutex<ImageCacheChan>,
/// The current viewport size. /// The current viewport size.
pub viewport_size: Size2D<Au>, pub viewport_size: Size2D<Au>,
@ -125,7 +125,6 @@ pub struct SharedLayoutContext {
// FIXME(#6569) This implementations is unsound: // FIXME(#6569) This implementations is unsound:
// XXX UNSOUND!!! for image_cache_task // XXX UNSOUND!!! for image_cache_task
// XXX UNSOUND!!! for image_cache_sender
// XXX UNSOUND!!! for constellation_chan // XXX UNSOUND!!! for constellation_chan
// XXX UNSOUND!!! for font_cache_task // XXX UNSOUND!!! for font_cache_task
// XXX UNSOUND!!! for stylist // XXX UNSOUND!!! for stylist
@ -196,8 +195,8 @@ impl<'a> LayoutContext<'a> {
} }
// Not yet requested, async mode - request image from the cache // Not yet requested, async mode - request image from the cache
(ImageState::NotRequested, false) => { (ImageState::NotRequested, false) => {
self.shared.image_cache_task let sender = self.shared.image_cache_sender.lock().unwrap().clone();
.request_image(url, self.shared.image_cache_sender.clone(), None); self.shared.image_cache_task.request_image(url, sender, None);
None None
} }
// Image has been requested, is still pending. Return no image // Image has been requested, is still pending. Return no image

2
components/layout/layout_task.rs
View file

@ -452,7 +452,7 @@ impl LayoutTask {
-> SharedLayoutContext { -> SharedLayoutContext {
SharedLayoutContext { SharedLayoutContext {
image_cache_task: rw_data.image_cache_task.clone(), image_cache_task: rw_data.image_cache_task.clone(),
image_cache_sender: self.image_cache_sender.clone(), image_cache_sender: Mutex::new(self.image_cache_sender.clone()),
viewport_size: rw_data.viewport_size.clone(), viewport_size: rw_data.viewport_size.clone(),
screen_size_changed: screen_size_changed, screen_size_changed: screen_size_changed,
constellation_chan: rw_data.constellation_chan.clone(), constellation_chan: rw_data.constellation_chan.clone(),