diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-12-16 16:41:33 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-12-16 16:41:33 +0100 |
| commit | ac95d12037411678ab70a0fe24eeabd08800f4f4 (patch) | |
| tree | 6c714fc1a523dcf05ed4e4cfe72de38685fbec1c | |
| parent | 746b262ff4e23db11586f74ef1a03e98cb12bb52 (diff) | |
| download | servo-ac95d12037411678ab70a0fe24eeabd08800f4f4.tar.gz servo-ac95d12037411678ab70a0fe24eeabd08800f4f4.zip | |
Remove some manual deref() / deref_mut() calls.
| -rw-r--r-- | components/layout/flow_ref.rs | 2 | ||||
| -rw-r--r-- | components/layout/layout_task.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs index eb2b4e03c8d..e46c42d4844 100644 --- a/components/layout/flow_ref.rs +++ b/components/layout/flow_ref.rs @@ -55,7 +55,7 @@ impl Drop for FlowRef { if self.object.vtable.is_null() { 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 } let flow_ref: FlowRef = mem::replace(self, FlowRef { diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index d187aa1a37f..8203eb9b6a3 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -626,7 +626,7 @@ impl LayoutTask { layout_root: &mut FlowRef, shared_layout_ctx: &mut SharedLayoutContext, 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, Some((&data.url, if data.iframe { TimeIFrame } else { TimeRootWindow }, @@ -634,13 +634,13 @@ impl LayoutTask { self.time_profiler_chan.clone(), || { 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); - 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, 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(); match rw_data.parallel_traversal { @@ -684,7 +684,7 @@ impl LayoutTask { } 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) }; let mut display_list = box DisplayList::new(); |