Skip to content
Permalink
Browse files

A few fixes to the compositor for WebRender

  • Loading branch information...
pcwalton authored and jdm committed Jun 5, 2019
1 parent 2f9c9ce commit ae420485404c72c7cbc0cd0bd1b05bf599c4898d
Showing with 5 additions and 4 deletions.
  1. +3 −2 components/compositing/compositor.rs
  2. +2 −2 components/compositing/windowing.rs
@@ -43,7 +43,8 @@ use style_traits::viewport::ViewportConstraints;
use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor};
use time::{now, precise_time_ns, precise_time_s};
use webrender_api::{self, HitTestFlags, HitTestResult, ScrollLocation};
use webrender_api::units::{DeviceIntPoint, DevicePoint, FramebufferIntSize, LayoutVector2D};
use webrender_api::units::{DeviceIntPoint, DeviceIntSize, DevicePoint};
use webrender_api::units::{FramebufferIntSize, LayoutVector2D};
use webvr_traits::WebVRMainThreadHeartbeat;

#[derive(Debug, PartialEq)]
@@ -1280,7 +1281,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
|| {
debug!("compositor: compositing");

let size = FramebufferIntSize::from_untyped(
let size = DeviceIntSize::from_untyped(
&self.embedder_coordinates.framebuffer.to_untyped(),
);

@@ -197,10 +197,10 @@ pub struct EmbedderCoordinates {
}

impl EmbedderCoordinates {
pub fn get_flipped_viewport(&self) -> FramebufferIntRect {
pub fn get_flipped_viewport(&self) -> DeviceIntRect {
let fb_height = self.framebuffer.height;
let mut view = self.viewport.clone();
view.origin.y = fb_height - view.origin.y - view.size.height;
FramebufferIntRect::from_untyped(&view.to_untyped())
DeviceIntRect::from_untyped(&view.to_untyped())
}
}

0 comments on commit ae42048

Please sign in to comment.
You can’t perform that action at this time.