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

Auto merge of #11042 - fabricedesre:compositing-warning, r=metajack

Browse source 
Fix a build warning in compositor.rs

Stops the compiler complaining about `root_pipeline` being an unused variable.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11042)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-06 08:10:23 -07:00
commit 29ed650160
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/compositing/compositor.rs
View file

@ -1350,10 +1350,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
Some(root_pipeline_id) => root_pipeline_id, Some(root_pipeline_id) => root_pipeline_id,
None => return, None => return,
}; };
let root_pipeline = match self.pipeline(root_pipeline_id) { if self.pipeline(root_pipeline_id).is_none() {
Some(root_pipeline) => root_pipeline, return;
None => return, }
};
let (translated_point, translated_pipeline_id) = let (translated_point, translated_pipeline_id) =
webrender_api.translate_point_to_layer_space(&point.to_untyped()); webrender_api.translate_point_to_layer_space(&point.to_untyped());
@ -1395,10 +1394,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
Some(root_pipeline_id) => root_pipeline_id, Some(root_pipeline_id) => root_pipeline_id,
None => return, None => return,
}; };
let root_pipeline = match self.pipeline(root_pipeline_id) { if self.pipeline(root_pipeline_id).is_none() {
Some(root_pipeline) => root_pipeline, return;
None => return, }
};
let (translated_point, translated_pipeline_id) = let (translated_point, translated_pipeline_id) =
webrender_api.translate_point_to_layer_space(&cursor.to_untyped()); webrender_api.translate_point_to_layer_space(&cursor.to_untyped());