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

A few fixes to the compositor for WebRender

Browse source
This commit is contained in:
Patrick Walton 2019-06-04 22:24:36 -07:00 • committed by Josh Matthews
parent 2f9c9cefdb
commit ae42048540
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/compositing/compositor.rs
View file

@ -43,7 +43,8 @@ use style_traits::viewport::ViewportConstraints;
use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor}; use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor};
use time::{now, precise_time_ns, precise_time_s}; use time::{now, precise_time_ns, precise_time_s};
use webrender_api::{self, HitTestFlags, HitTestResult, ScrollLocation}; 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; use webvr_traits::WebVRMainThreadHeartbeat;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
@ -1280,7 +1281,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
|| { || {
debug!("compositor: compositing"); debug!("compositor: compositing");
let size = FramebufferIntSize::from_untyped( let size = DeviceIntSize::from_untyped(
&self.embedder_coordinates.framebuffer.to_untyped(), &self.embedder_coordinates.framebuffer.to_untyped(),
); );

4
components/compositing/windowing.rs
View file

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