aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/layout_task.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-15 01:32:35 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-15 01:32:35 +0530
commit33c97b2ebbd7b77177b3e3874dc91dc487e64bad (patch)
tree48ec23b824e7f17f9046d0e3c5a9a88a0e94caed /components/layout/layout_task.rs
parent8f2a3a64f141f175e417e240766f9d7f06be0482 (diff)
parent15245b31ae2c101057b15a1a82d5882b1bbdd4b3 (diff)
downloadservo-33c97b2ebbd7b77177b3e3874dc91dc487e64bad.tar.gz
servo-33c97b2ebbd7b77177b3e3874dc91dc487e64bad.zip
Auto merge of #8529 - Ms2ger:unused-lifetime, r=eefriedman
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 -->
Diffstat (limited to 'components/layout/layout_task.rs')
-rw-r--r--components/layout/layout_task.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index f391d8bc547..f4e304aca5d 100644
--- a/components/layout/layout_task.rs
+++ b/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,