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

Remove some manual deref() / deref_mut() calls.

Browse source
This commit is contained in:
Ms2ger 2014-12-16 16:41:33 +01:00
parent 746b262ff4
commit ac95d12037
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/flow_ref.rs
View file

@ -55,7 +55,7 @@ impl Drop for FlowRef {
if self.object.vtable.is_null() { if self.object.vtable.is_null() {
return return
} }
if flow::base(self.deref()).ref_count().fetch_sub(1, SeqCst) > 1 { if flow::base(&**self).ref_count().fetch_sub(1, SeqCst) > 1 {
return return
} }
let flow_ref: FlowRef = mem::replace(self, FlowRef { let flow_ref: FlowRef = mem::replace(self, FlowRef {

10
components/layout/layout_task.rs
View file

@ -626,7 +626,7 @@ impl LayoutTask {
layout_root: &mut FlowRef, layout_root: &mut FlowRef,
shared_layout_ctx: &mut SharedLayoutContext, shared_layout_ctx: &mut SharedLayoutContext,
rw_data: &mut RWGuard<'a>) { rw_data: &mut RWGuard<'a>) {
let writing_mode = flow::base(layout_root.deref()).writing_mode; let writing_mode = flow::base(&**layout_root).writing_mode;
profile(time::LayoutDispListBuildCategory, profile(time::LayoutDispListBuildCategory,
Some((&data.url, Some((&data.url,
if data.iframe { TimeIFrame } else { TimeRootWindow }, if data.iframe { TimeIFrame } else { TimeRootWindow },
@ -634,13 +634,13 @@ impl LayoutTask {
self.time_profiler_chan.clone(), self.time_profiler_chan.clone(),
|| { || {
shared_layout_ctx.dirty = shared_layout_ctx.dirty =
flow::base(layout_root.deref()).position.to_physical(writing_mode, flow::base(&**layout_root).position.to_physical(writing_mode,
rw_data.screen_size); rw_data.screen_size);
flow::mut_base(layout_root.deref_mut()).stacking_relative_position = flow::mut_base(&mut **layout_root).stacking_relative_position =
LogicalPoint::zero(writing_mode).to_physical(writing_mode, LogicalPoint::zero(writing_mode).to_physical(writing_mode,
rw_data.screen_size); rw_data.screen_size);
flow::mut_base(layout_root.deref_mut()).clip_rect = data.page_clip_rect; flow::mut_base(&mut **layout_root).clip_rect = data.page_clip_rect;
let rw_data = rw_data.deref_mut(); let rw_data = rw_data.deref_mut();
match rw_data.parallel_traversal { match rw_data.parallel_traversal {
@ -684,7 +684,7 @@ impl LayoutTask {
} }
let root_size = { let root_size = {
let root_flow = flow::base(layout_root.deref()); let root_flow = flow::base(&**layout_root);
root_flow.position.size.to_physical(root_flow.writing_mode) root_flow.position.size.to_physical(root_flow.writing_mode)
}; };
let mut display_list = box DisplayList::new(); let mut display_list = box DisplayList::new();