diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/compositing/compositor.rs | 2 | ||||
| -rw-r--r-- | components/layout/webrender_helpers.rs | 6 | ||||
| -rw-r--r-- | components/layout_thread/lib.rs | 2 | ||||
| -rw-r--r-- | components/servo/lib.rs | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index aa8f7d72968..2673af8b439 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -734,7 +734,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let pipeline_id = frame_tree.pipeline.id.to_webrender(); self.webrender_api.set_root_pipeline(pipeline_id); - self.webrender_api.generate_frame(); + self.webrender_api.generate_frame(None); self.create_pipeline_details_for_frame_tree(&frame_tree); diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index 725570640f6..665916594fd 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -184,7 +184,7 @@ impl ToFilterOps for filter::T { Filter::Grayscale(amount) => result.push(webrender_traits::FilterOp::Grayscale(amount)), Filter::HueRotate(angle) => result.push(webrender_traits::FilterOp::HueRotate(angle.0)), Filter::Invert(amount) => result.push(webrender_traits::FilterOp::Invert(amount)), - Filter::Opacity(amount) => result.push(webrender_traits::FilterOp::Opacity(amount)), + Filter::Opacity(amount) => result.push(webrender_traits::FilterOp::Opacity(amount.into())), Filter::Saturate(amount) => result.push(webrender_traits::FilterOp::Saturate(amount)), Filter::Sepia(amount) => result.push(webrender_traits::FilterOp::Sepia(amount)), } @@ -347,8 +347,8 @@ impl WebRenderDisplayItemConverter for DisplayItem { stacking_context.bounds.to_rectf(), clip, stacking_context.z_index, - &LayoutTransform::from_untyped(&stacking_context.transform), - &LayoutTransform::from_untyped(&stacking_context.perspective), + LayoutTransform::from_untyped(&stacking_context.transform).into(), + LayoutTransform::from_untyped(&stacking_context.perspective), stacking_context.blend_mode.to_blend_mode(), stacking_context.filters.to_filter_ops()); } diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 429a5f49fb8..3721cc48d17 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -989,7 +989,7 @@ impl LayoutThread { viewport_size, builder, true); - self.webrender_api.generate_frame(); + self.webrender_api.generate_frame(None); }); } diff --git a/components/servo/lib.rs b/components/servo/lib.rs index bf6a5c66b1d..6e273601926 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -184,6 +184,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static { clear_framebuffer: true, clear_color: webrender_traits::ColorF::new(1.0, 1.0, 1.0, 1.0), render_target_debug: false, + workers: None, }).expect("Unable to initialize webrender!") }; |