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

Revert "compositor: Create a single cross-process compositor API (#33619)" (#33645)

Browse source 
This reverts commit f2f5614ad6.

This is causing intermittent crashes: https://github.com/servo/servo/actions/runs/11167043809/job/31044255019

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2024-10-04 11:08:19 +02:00 • committed by GitHub
parent 826e31eaa5
commit 48f8ff6236
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 799 additions and 545 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ports/servoshell/desktop/headed_window.rs
View file

@ -536,10 +536,10 @@ impl WindowMethods for Window {
EmbedderCoordinates {
viewport,
framebuffer: viewport.size(),
window_rect: DeviceIntRect::from_origin_and_size(window_origin, window_size),
screen_size: screen,
window: (window_size, window_origin),
screen,
// FIXME: Winit doesn't have API for available size. Fallback to screen size
available_screen_size: screen,
screen_avail: screen,
hidpi_factor: self.hidpi_factor(),
}
}

6
ports/servoshell/desktop/headless_window.rs
View file

@ -167,9 +167,9 @@ impl WindowMethods for Window {
EmbedderCoordinates {
viewport,
framebuffer: size,
window_rect: DeviceIntRect::from_origin_and_size(Point2D::zero(), size),
screen_size: size,
available_screen_size: size,
window: (size, Point2D::zero()),
screen: size,
screen_avail: size,
hidpi_factor: dpr,
}
}

7
ports/servoshell/egl/servo_glue.rs
View file

@ -25,7 +25,6 @@ use servo::script_traits::{
};
use servo::servo_url::ServoUrl;
use servo::style_traits::DevicePixel;
use servo::webrender_api::units::DeviceIntRect;
use servo::webrender_api::ScrollLocation;
use servo::webrender_traits::RenderingContext;
use servo::{gl, Servo, TopLevelBrowsingContextId};
@ -694,9 +693,9 @@ impl WindowMethods for ServoWindowCallbacks {
EmbedderCoordinates {
viewport: coords.viewport.to_box2d(),
framebuffer: coords.framebuffer,
window_rect: DeviceIntRect::from_origin_and_size(Point2D::zero(), coords.viewport.size),
screen_size: coords.viewport.size,
available_screen_size: coords.viewport.size,
window: (coords.viewport.size, Point2D::new(0, 0)),
screen: coords.viewport.size,
screen_avail: coords.viewport.size,
hidpi_factor: Scale::new(self.density),
}
}