From 6abb8942960a55d41062b2a3e587f568233921f9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 15 Nov 2015 01:03:35 +0501 Subject: [PATCH] servo: Merge #8529 - Remove unused lifetime parameters from LayoutTask methods (from Ms2ger:unused-lifetime); r=eefriedman Source-Repo: https://github.com/servo/servo Source-Revision: 33c97b2ebbd7b77177b3e3874dc91dc487e64bad --- servo/components/layout/layout_task.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/servo/components/layout/layout_task.rs b/servo/components/layout/layout_task.rs index f391d8bc5478..f4e304aca5d1 100644 --- a/servo/components/layout/layout_task.rs +++ b/servo/components/layout/layout_task.rs @@ -972,11 +972,11 @@ impl LayoutTask { } } - fn compute_abs_pos_and_build_display_list<'a>(&'a mut self, - data: &Reflow, - layout_root: &mut FlowRef, - shared_layout_context: &mut SharedLayoutContext, - rw_data: &mut LayoutTaskData) { + fn compute_abs_pos_and_build_display_list(&mut self, + data: &Reflow, + layout_root: &mut FlowRef, + shared_layout_context: &mut SharedLayoutContext, + rw_data: &mut LayoutTaskData) { let writing_mode = flow::base(&**layout_root).writing_mode; let (metadata, sender) = (self.profiler_metadata(), self.time_profiler_chan.clone()); profile(time::ProfilerCategory::LayoutDispListBuild, @@ -1345,10 +1345,10 @@ impl LayoutTask { &mut layout_context); } - fn perform_post_style_recalc_layout_passes<'a>(&'a mut self, - data: &Reflow, - rw_data: &mut LayoutTaskData, - layout_context: &mut SharedLayoutContext) { + fn perform_post_style_recalc_layout_passes(&mut self, + data: &Reflow, + rw_data: &mut LayoutTaskData, + layout_context: &mut SharedLayoutContext) { if let Some(mut root_flow) = self.root_flow.clone() { // Kick off animations if any were triggered, expire completed ones. animation::update_animation_state(&self.constellation_chan, @@ -1404,10 +1404,10 @@ impl LayoutTask { } } - fn perform_post_main_layout_passes<'a>(&'a mut self, - data: &Reflow, - rw_data: &mut LayoutTaskData, - layout_context: &mut SharedLayoutContext) { + fn perform_post_main_layout_passes(&mut self, + data: &Reflow, + rw_data: &mut LayoutTaskData, + layout_context: &mut SharedLayoutContext) { // Build the display list if necessary, and send it to the painter. if let Some(mut root_flow) = self.root_flow.clone() { self.compute_abs_pos_and_build_display_list(data,