Auto merge of #15532 - servo:webrender, r=nox

Update WR (pixel snapping improvements).

<!-- 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/15532)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-13 14:46:46 -08:00 committed by GitHub
commit d44bf6182f
45 changed files with 31 additions and 153 deletions

View file

@ -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);

View file

@ -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());
}

View file

@ -989,7 +989,7 @@ impl LayoutThread {
viewport_size,
builder,
true);
self.webrender_api.generate_frame();
self.webrender_api.generate_frame(None);
});
}

View file

@ -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!")
};