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

Move visible_rects from LayoutTaskData to LayoutTask.

Browse source
This commit is contained in:
Ms2ger 2015-11-06 17:35:39 +01:00
parent e8f31f2ed7
commit ee2b77e8f5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/layout/layout_task.rs
View file

@ -127,10 +127,6 @@ pub struct LayoutTaskData {
/// A counter for epoch messages /// A counter for epoch messages
epoch: Epoch, epoch: Epoch,
/// The position and size of the visible rect for each layer. We do not build display lists
/// for any areas more than `DISPLAY_PORT_SIZE_FACTOR` screens away from this area.
pub visible_rects: Arc<HashMap<LayerId, Rect<Au>, DefaultState<FnvHasher>>>,
} }
/// Information needed by the layout task. /// Information needed by the layout task.
@ -214,6 +210,10 @@ pub struct LayoutTask {
/// The root of the flow tree. /// The root of the flow tree.
root_flow: Option<FlowRef>, root_flow: Option<FlowRef>,
/// The position and size of the visible rect for each layer. We do not build display lists
/// for any areas more than `DISPLAY_PORT_SIZE_FACTOR` screens away from this area.
visible_rects: Arc<HashMap<LayerId, Rect<Au>, DefaultState<FnvHasher>>>,
/// A mutex to allow for fast, read-only RPC of layout's internal data /// A mutex to allow for fast, read-only RPC of layout's internal data
/// structures, while still letting the LayoutTask modify them. /// structures, while still letting the LayoutTask modify them.
/// ///
@ -429,6 +429,7 @@ impl LayoutTask {
new_animations_receiver: new_animations_receiver, new_animations_receiver: new_animations_receiver,
outstanding_web_fonts: outstanding_web_fonts_counter, outstanding_web_fonts: outstanding_web_fonts_counter,
root_flow: None, root_flow: None,
visible_rects: Arc::new(HashMap::with_hash_state(Default::default())),
rw_data: Arc::new(Mutex::new( rw_data: Arc::new(Mutex::new(
LayoutTaskData { LayoutTaskData {
constellation_chan: constellation_chan, constellation_chan: constellation_chan,
@ -441,7 +442,6 @@ impl LayoutTask {
resolved_style_response: None, resolved_style_response: None,
running_animations: Arc::new(HashMap::new()), running_animations: Arc::new(HashMap::new()),
offset_parent_response: OffsetParentResponse::empty(), offset_parent_response: OffsetParentResponse::empty(),
visible_rects: Arc::new(HashMap::with_hash_state(Default::default())),
epoch: Epoch(0), epoch: Epoch(0),
})), })),
} }
@ -476,7 +476,7 @@ impl LayoutTask {
canvas_layers_sender: Mutex::new(self.canvas_layers_sender.clone()), canvas_layers_sender: Mutex::new(self.canvas_layers_sender.clone()),
stylist: StylistWrapper(&*rw_data.stylist), stylist: StylistWrapper(&*rw_data.stylist),
url: (*url).clone(), url: (*url).clone(),
visible_rects: rw_data.visible_rects.clone(), visible_rects: self.visible_rects.clone(),
generation: self.generation, generation: self.generation,
new_animations_sender: Mutex::new(self.new_animations_sender.clone()), new_animations_sender: Mutex::new(self.new_animations_sender.clone()),
goal: goal, goal: goal,
@ -1228,7 +1228,7 @@ impl LayoutTask {
Size2D::new(rw_data.viewport_size.width * DISPLAY_PORT_THRESHOLD_SIZE_FACTOR, Size2D::new(rw_data.viewport_size.width * DISPLAY_PORT_THRESHOLD_SIZE_FACTOR,
rw_data.viewport_size.height * DISPLAY_PORT_THRESHOLD_SIZE_FACTOR); rw_data.viewport_size.height * DISPLAY_PORT_THRESHOLD_SIZE_FACTOR);
for &(ref layer_id, ref new_visible_rect) in &new_visible_rects { for &(ref layer_id, ref new_visible_rect) in &new_visible_rects {
match rw_data.visible_rects.get(layer_id) { match self.visible_rects.get(layer_id) {
None => { None => {
old_visible_rects.insert(*layer_id, *new_visible_rect); old_visible_rects.insert(*layer_id, *new_visible_rect);
} }
@ -1245,7 +1245,7 @@ impl LayoutTask {
if !must_regenerate_display_lists { if !must_regenerate_display_lists {
// Update `visible_rects` in case there are new layers that were discovered. // Update `visible_rects` in case there are new layers that were discovered.
rw_data.visible_rects = Arc::new(old_visible_rects); self.visible_rects = Arc::new(old_visible_rects);
return true return true
} }
@ -1253,7 +1253,7 @@ impl LayoutTask {
for &(ref layer_id, ref new_visible_rect) in &new_visible_rects { for &(ref layer_id, ref new_visible_rect) in &new_visible_rects {
old_visible_rects.insert(*layer_id, *new_visible_rect); old_visible_rects.insert(*layer_id, *new_visible_rect);
} }
rw_data.visible_rects = Arc::new(old_visible_rects); self.visible_rects = Arc::new(old_visible_rects);
// Regenerate the display lists. // Regenerate the display lists.
let reflow_info = Reflow { let reflow_info = Reflow {