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

Auto merge of #8529 - Ms2ger:unused-lifetime, r=eefriedman

Browse source 
Remove unused lifetime parameters from LayoutTask methods.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8529)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-15 01:32:35 +05:30
commit 33c97b2ebb
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/layout/layout_task.rs
View file

@ -972,11 +972,11 @@ impl LayoutTask {
} }
} }
fn compute_abs_pos_and_build_display_list<'a>(&'a mut self, fn compute_abs_pos_and_build_display_list(&mut self,
data: &Reflow, data: &Reflow,
layout_root: &mut FlowRef, layout_root: &mut FlowRef,
shared_layout_context: &mut SharedLayoutContext, shared_layout_context: &mut SharedLayoutContext,
rw_data: &mut LayoutTaskData) { rw_data: &mut LayoutTaskData) {
let writing_mode = flow::base(&**layout_root).writing_mode; let writing_mode = flow::base(&**layout_root).writing_mode;
let (metadata, sender) = (self.profiler_metadata(), self.time_profiler_chan.clone()); let (metadata, sender) = (self.profiler_metadata(), self.time_profiler_chan.clone());
profile(time::ProfilerCategory::LayoutDispListBuild, profile(time::ProfilerCategory::LayoutDispListBuild,
@ -1345,10 +1345,10 @@ impl LayoutTask {
&mut layout_context); &mut layout_context);
} }
fn perform_post_style_recalc_layout_passes<'a>(&'a mut self, fn perform_post_style_recalc_layout_passes(&mut self,
data: &Reflow, data: &Reflow,
rw_data: &mut LayoutTaskData, rw_data: &mut LayoutTaskData,
layout_context: &mut SharedLayoutContext) { layout_context: &mut SharedLayoutContext) {
if let Some(mut root_flow) = self.root_flow.clone() { if let Some(mut root_flow) = self.root_flow.clone() {
// Kick off animations if any were triggered, expire completed ones. // Kick off animations if any were triggered, expire completed ones.
animation::update_animation_state(&self.constellation_chan, animation::update_animation_state(&self.constellation_chan,
@ -1404,10 +1404,10 @@ impl LayoutTask {
} }
} }
fn perform_post_main_layout_passes<'a>(&'a mut self, fn perform_post_main_layout_passes(&mut self,
data: &Reflow, data: &Reflow,
rw_data: &mut LayoutTaskData, rw_data: &mut LayoutTaskData,
layout_context: &mut SharedLayoutContext) { layout_context: &mut SharedLayoutContext) {
// Build the display list if necessary, and send it to the painter. // Build the display list if necessary, and send it to the painter.
if let Some(mut root_flow) = self.root_flow.clone() { if let Some(mut root_flow) = self.root_flow.clone() {
self.compute_abs_pos_and_build_display_list(data, self.compute_abs_pos_and_build_display_list(data,