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

Don’t mark flow_ref::deref_mut as unsafe.

Browse source 
See discussion in https://github.com/servo/servo/pull/7237
This commit is contained in:
Simon Sapin 2015-08-18 19:37:15 +02:00
parent 649250130b
commit 21d69314d4
10 changed files with 53 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/layout/layout_task.rs
View file

@ -781,7 +781,7 @@ impl LayoutTask {
_ => return None,
};
unsafe { flow_ref::deref_mut(&mut flow) }.mark_as_root();
flow_ref::deref_mut(&mut flow).mark_as_root();
Some(flow)
}
@ -999,11 +999,11 @@ impl LayoutTask {
self.profiler_metadata(),
self.time_profiler_chan.clone(),
|| {
flow::mut_base(unsafe { flow_ref::deref_mut(layout_root) }).stacking_relative_position =
flow::mut_base(flow_ref::deref_mut(layout_root)).stacking_relative_position =
LogicalPoint::zero(writing_mode).to_physical(writing_mode,
rw_data.screen_size);
flow::mut_base(unsafe { flow_ref::deref_mut(layout_root) }).clip =
flow::mut_base(flow_ref::deref_mut(layout_root)).clip =
ClippingRegion::from_rect(&data.page_clip_rect);
match (&mut rw_data.parallel_traversal, opts::get().parallel_display_list_building) {
@ -1024,13 +1024,13 @@ impl LayoutTask {
debug!("Done building display list.");
let root_background_color = get_root_flow_background_color(
unsafe { flow_ref::deref_mut(layout_root) });
flow_ref::deref_mut(layout_root));
let root_size = {
let root_flow = flow::base(&**layout_root);
root_flow.position.size.to_physical(root_flow.writing_mode)
};
let mut display_list = box DisplayList::new();
flow::mut_base(unsafe { flow_ref::deref_mut(layout_root) })
flow::mut_base(flow_ref::deref_mut(layout_root))
.display_list_building_result
.add_to(&mut *display_list);
let paint_layer = PaintLayer::new(layout_root.layer_id(0),
@ -1130,7 +1130,7 @@ impl LayoutTask {
}
if needs_reflow {
if let Some(mut flow) = self.try_get_layout_root(*node) {
LayoutTask::reflow_all_nodes(unsafe { flow_ref::deref_mut(&mut flow) });
LayoutTask::reflow_all_nodes(flow_ref::deref_mut(&mut flow));
}
}
@ -1291,7 +1291,7 @@ impl LayoutTask {
self.profiler_metadata(),
self.time_profiler_chan.clone(),
|| {
animation::recalc_style_for_animations(unsafe { flow_ref::deref_mut(&mut root_flow) },
animation::recalc_style_for_animations(flow_ref::deref_mut(&mut root_flow),
animations)
});
}
@ -1311,10 +1311,10 @@ impl LayoutTask {
self.profiler_metadata(),
self.time_profiler_chan.clone(),
|| {
if opts::get().nonincremental_layout || unsafe { flow_ref::deref_mut(&mut root_flow) }
if opts::get().nonincremental_layout || flow_ref::deref_mut(&mut root_flow)
.compute_layout_damage()
.contains(REFLOW_ENTIRE_DOCUMENT) {
unsafe { flow_ref::deref_mut(&mut root_flow) }.reflow_entire_document()
flow_ref::deref_mut(&mut root_flow).reflow_entire_document()
}
});