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

Auto merge of #16612 - glennw:update-wr-groove-ridge-2, r=jdm

Browse source 
Update WR (groove/ridge borders, mix-blend-mode opts)

<!-- 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/16612)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-26 07:56:32 -05:00 • committed by GitHub
commit c1b347794c
5 changed files with 31 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/layout/webrender_helpers.rs
View file

@ -416,7 +416,6 @@ impl WebRenderDisplayItemConverter for DisplayItem {
builder.push_stacking_context(stacking_context.scroll_policy,
stacking_context.bounds.to_rectf(),
stacking_context.z_index,
transform,
webrender_traits::TransformStyle::Flat,
perspective,

7
components/webvr/webvr_thread.rs
View file

@ -12,6 +12,7 @@ use std::collections::{HashMap, HashSet};
use std::sync::mpsc;
use std::sync::mpsc::{Receiver, Sender};
use webrender_traits;
use webrender_traits::DeviceIntSize;
use webvr_traits::{WebVRMsg, WebVRResult};
use webvr_traits::webvr::*;
@ -329,7 +330,7 @@ impl WebVRCompositorHandler {
impl webrender_traits::VRCompositorHandler for WebVRCompositorHandler {
#[allow(unsafe_code)]
fn handle(&mut self, cmd: webrender_traits::VRCompositorCommand, texture_id: Option<u32>) {
fn handle(&mut self, cmd: webrender_traits::VRCompositorCommand, texture: Option<(u32, DeviceIntSize)>) {
match cmd {
webrender_traits::VRCompositorCommand::Create(compositor_id) => {
self.create_compositor(compositor_id);
@ -347,12 +348,12 @@ impl webrender_traits::VRCompositorHandler for WebVRCompositorHandler {
}
webrender_traits::VRCompositorCommand::SubmitFrame(compositor_id, left_bounds, right_bounds) => {
if let Some(compositor) = self.compositors.get(&compositor_id) {
if let Some(texture_id) = texture_id {
if let Some((texture_id, size)) = texture {
let layer = VRLayer {
texture_id: texture_id,
left_bounds: left_bounds,
right_bounds: right_bounds,
texture_size: None
texture_size: Some((size.width as u32, size.height as u32))
};
unsafe {
(*compositor.0).submit_frame(&layer);