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

Remove use of opts::use_webrender in layout_thread

Browse source 
If we have a webrender_api value, this means we should use webrender.
This commit is contained in:
Anthony Ramine 2016-07-27 14:37:26 +02:00
parent d8991496c6
commit a2921732bb
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/layout_thread/lib.rs
View file

@ -969,7 +969,7 @@ impl LayoutThread {
self.epoch.next(); 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! // TODO: Avoid the temporary conversion and build webrender sc/dl directly!
let Epoch(epoch_number) = self.epoch; let Epoch(epoch_number) = self.epoch;
let epoch = webrender_traits::Epoch(epoch_number); let epoch = webrender_traits::Epoch(epoch_number);
@ -979,7 +979,7 @@ impl LayoutThread {
let mut frame_builder = WebRenderFrameBuilder::new(pipeline_id); let mut frame_builder = WebRenderFrameBuilder::new(pipeline_id);
let root_scroll_layer_id = frame_builder.next_scroll_layer_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( let sc_id = rw_data.display_list.as_ref().unwrap().convert_to_webrender(
&mut self.webrender_api.as_mut().unwrap(), webrender_api,
pipeline_id, pipeline_id,
epoch, epoch,
Some(root_scroll_layer_id), Some(root_scroll_layer_id),
@ -995,16 +995,15 @@ impl LayoutThread {
let viewport_size = Size2D::new(self.viewport_size.width.to_f32_px(), let viewport_size = Size2D::new(self.viewport_size.width.to_f32_px(),
self.viewport_size.height.to_f32_px()); self.viewport_size.height.to_f32_px());
let api = self.webrender_api.as_ref().unwrap(); webrender_api.set_root_stacking_context(
api.set_root_stacking_context(sc_id, sc_id,
root_background_color, root_background_color,
epoch, epoch,
pipeline_id, pipeline_id,
viewport_size, viewport_size,
frame_builder.stacking_contexts, frame_builder.stacking_contexts,
frame_builder.display_lists, frame_builder.display_lists,
frame_builder.auxiliary_lists_builder frame_builder.auxiliary_lists_builder.finalize());
.finalize());
} else { } else {
self.paint_chan self.paint_chan
.send(LayoutToPaintMsg::PaintInit(self.epoch, display_list)) .send(LayoutToPaintMsg::PaintInit(self.epoch, display_list))