diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-27 22:36:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 22:36:53 -0500 |
| commit | a0c502261dc2bd710e31dcbbbd2d81d2a2c53724 (patch) | |
| tree | 4cd3c80d8934084c5f43298dbab083cf95ad64e0 | |
| parent | fc0915b218215f9f3cec7ff4462c4f2b95381cf3 (diff) | |
| parent | a2921732bb092e9e71e2588ad2526dc98fe518a2 (diff) | |
| download | servo-a0c502261dc2bd710e31dcbbbd2d81d2a2c53724.tar.gz servo-a0c502261dc2bd710e31dcbbbd2d81d2a2c53724.zip | |
Auto merge of #12615 - nox:die-opts-die, r=Ms2ger
Remove use of opts::use_webrender in layout_thread
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12615)
<!-- Reviewable:end -->
| -rw-r--r-- | components/layout_thread/lib.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 31432d896bf..403f30a96f5 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -969,7 +969,7 @@ impl LayoutThread { self.epoch.next(); - if opts::get().use_webrender { + if let Some(ref mut webrender_api) = self.webrender_api { // TODO: Avoid the temporary conversion and build webrender sc/dl directly! let Epoch(epoch_number) = self.epoch; let epoch = webrender_traits::Epoch(epoch_number); @@ -979,7 +979,7 @@ impl LayoutThread { let mut frame_builder = WebRenderFrameBuilder::new(pipeline_id); let root_scroll_layer_id = frame_builder.next_scroll_layer_id(); let sc_id = rw_data.display_list.as_ref().unwrap().convert_to_webrender( - &mut self.webrender_api.as_mut().unwrap(), + webrender_api, pipeline_id, epoch, Some(root_scroll_layer_id), @@ -995,16 +995,15 @@ impl LayoutThread { let viewport_size = Size2D::new(self.viewport_size.width.to_f32_px(), self.viewport_size.height.to_f32_px()); - let api = self.webrender_api.as_ref().unwrap(); - api.set_root_stacking_context(sc_id, - root_background_color, - epoch, - pipeline_id, - viewport_size, - frame_builder.stacking_contexts, - frame_builder.display_lists, - frame_builder.auxiliary_lists_builder - .finalize()); + webrender_api.set_root_stacking_context( + sc_id, + root_background_color, + epoch, + pipeline_id, + viewport_size, + frame_builder.stacking_contexts, + frame_builder.display_lists, + frame_builder.auxiliary_lists_builder.finalize()); } else { self.paint_chan .send(LayoutToPaintMsg::PaintInit(self.epoch, display_list)) |