Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
feat(emulation): apply native screen geometry and resolution
ldm0284667a01af4
diff --git a/Cargo.lock b/Cargo.lockindex dec7d789c..1d42ad064 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2718,6 +2718,7 @@ version = "0.1.0"dependencies = ["bitflags","http-auth",+ "moli-browser-profile","moli-cookie-jar","moli-dom","moli-fetch",diff --git a/moli-page-types/Cargo.toml b/moli-page-types/Cargo.tomlindex 34113d356..03070faf5 100644--- a/moli-page-types/Cargo.toml+++ b/moli-page-types/Cargo.toml@@ -9,6 +9,7 @@ test-support = [][dependencies]bitflags = "2.11.0"+moli-browser-profile = { path = "../moli-browser-profile" }moli-cookie-jar = { path = "../moli-cookie-jar" }moli-dom = { path = "../moli-dom" }moli-fetch = { path = "../moli-fetch" }diff --git a/moli-page-types/src/lib.rs b/moli-page-types/src/lib.rsindex f122932a5..c50decb86 100644--- a/moli-page-types/src/lib.rs+++ b/moli-page-types/src/lib.rs@@ -3134,6 +3134,45 @@ pub struct ViewportSurface {pub screen_height: u32,pub screen_avail_width: u32,pub screen_avail_height: u32,+ pub window_x: i32,+ pub window_y: i32,+ pub screen_orientation: ScreenOrientation,+}++#[derive(Debug, Clone, Copy, PartialEq, Eq)]+pub struct ScreenOrientation {+ pub kind: &'static str,+ pub angle: u16,+}++impl Default for ScreenOrientation {+ fn default() -> Self {+ let profile = moli_browser_profile::DEFAULT_WINDOW_SURFACE_PROFILE;+ Self {+ kind: profile.orientation_type,+ angle: profile.orientation_angle as u16,+ }+ }+}++impl Default for ViewportSurface {+ fn default() -> Self {+ let profile = moli_browser_profile::DEFAULT_WINDOW_SURFACE_PROFILE;+ Self {+ inner_width: profile.inner_width as u32,+ inner_height: profile.inner_height as u32,+ outer_width: profile.inner_width as u32,+ outer_height: profile.inner_height as u32,+ device_pixel_ratio: profile.device_pixel_ratio,+ screen_width: profile.screen_width as u32,+ screen_height: profile.screen_height as u32,+ screen_avail_width: profile.screen_avail_width as u32,+ screen_avail_height: profile.screen_avail_height as u32,+ window_x: 0,+ window_y: 0,+ screen_orientation: Default::default(),+ }+ }}#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]diff --git a/moli-protocol/src/conn/browser_context/target_session_owner.rs b/moli-protocol/src/conn/browser_context/target_session_owner.rsindex 412894229..a18375812 100644--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs@@ -317,7 +317,7 @@ impl TargetNavigationLoadInputs {emulated_media: (&page_state.effective_emulation_state.emulated_media).into(),viewport_surface: emulated_device_metrics.as_ref()- .map(|metrics| metrics.viewport_surface().to_page_viewport_surface()),+ .map(|metrics| metrics.viewport_surface()),document_activity,network_offline: page_state.network_policy.network_offline()|| effective_network_conditions@@ -356,7 +356,7 @@ impl TargetNavigationLoadInputs {inputs.viewport_surface = browser_context.default_emulated_device_metrics.as_ref()- .map(|metrics| metrics.viewport_surface().to_page_viewport_surface());+ .map(|metrics| metrics.viewport_surface());inputs.document_activity = browser_context.active_document_activity();inputs.network_offline = browser_context.effective_active_network_offline();inputsdiff --git a/moli-protocol/src/conn/page_state/surfaces.rs b/moli-protocol/src/conn/page_state/surfaces.rsindex 46f9c1317..b5ee02ebf 100644--- a/moli-protocol/src/conn/page_state/surfaces.rs+++ b/moli-protocol/src/conn/page_state/surfaces.rs@@ -393,7 +393,10 @@ impl BrowserContext {pub(crate) fn viewport_surface(&self) -> EmulatedViewportSurface {let metrics = self.effective_active_emulated_device_metrics();- EmulatedViewportSurface::from_metrics(metrics.as_ref())+ (metrics.as_ref()).map_or_else(+ EmulatedViewportSurface::default,+ crate::conn::EmulatedDeviceMetrics::viewport_surface,+ )}pub fn max_touch_points(&self) -> u32 {diff --git a/moli-protocol/src/conn/state/emulation.rs b/moli-protocol/src/conn/state/emulation.rsindex 95dcd7047..3760f71fd 100644--- a/moli-protocol/src/conn/state/emulation.rs+++ b/moli-protocol/src/conn/state/emulation.rs@@ -11,6 +11,9 @@ pub struct EmulatedDeviceMetrics {pub screen_width: u32,pub screen_height: u32,pub screen_avail_height: u32,+ pub window_x: i32,+ pub window_y: i32,+ pub screen_orientation: moli_page_types::ScreenOrientation,}#[derive(Debug, Clone, Copy, PartialEq, Eq)]@@ -28,55 +31,7 @@ impl EmulatedNetworkConditions {}}-#[derive(Debug, Clone, PartialEq)]-pub(crate) struct EmulatedViewportSurface {- pub inner_width: u32,- pub inner_height: u32,- pub outer_width: u32,- pub outer_height: u32,- pub device_pixel_ratio: f64,- pub screen_width: u32,- pub screen_height: u32,- pub screen_avail_width: u32,- pub screen_avail_height: u32,-}--impl Default for EmulatedViewportSurface {- fn default() -> Self {- let profile = moli_browser_profile::DEFAULT_WINDOW_SURFACE_PROFILE;- Self {- inner_width: profile.inner_width as u32,- inner_height: profile.inner_height as u32,- outer_width: profile.inner_width as u32,- outer_height: profile.inner_height as u32,- device_pixel_ratio: profile.device_pixel_ratio,- screen_width: profile.screen_width as u32,- screen_height: profile.screen_height as u32,- screen_avail_width: profile.screen_avail_width as u32,- screen_avail_height: profile.screen_avail_height as u32,- }- }-}--impl EmulatedViewportSurface {- pub(crate) fn from_metrics(metrics: Option<&EmulatedDeviceMetrics>) -> Self {- metrics.map_or_else(Self::default, EmulatedDeviceMetrics::viewport_surface)- }-- pub(crate) fn to_page_viewport_surface(&self) -> moli_core::page::ViewportSurface {- moli_core::page::ViewportSurface {- inner_width: self.inner_width,- inner_height: self.inner_height,- outer_width: self.outer_width,- outer_height: self.outer_height,- device_pixel_ratio: self.device_pixel_ratio,- screen_width: self.screen_width,- screen_height: self.screen_height,- screen_avail_width: self.screen_avail_width,- screen_avail_height: self.screen_avail_height,- }- }-}+pub(crate) type EmulatedViewportSurface = moli_page_types::ViewportSurface;impl EmulatedDeviceMetrics {pub(crate) fn screen_avail_height(&self) -> u32 {@@ -102,6 +57,9 @@ impl EmulatedDeviceMetrics {screen_height: self.screen_height,screen_avail_width: self.screen_width,screen_avail_height: self.screen_avail_height(),+ window_x: self.window_x,+ window_y: self.window_y,+ screen_orientation: self.screen_orientation,}}}@@ -276,6 +234,10 @@ mod tests {screen_width: 800,screen_height: 600,screen_avail_height: 600,++ window_x: 0,+ window_y: 0,+ screen_orientation: Default::default(),};assert_eq!(metrics.device_pixel_ratio(), 2.0);diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rsindex 4b36a0c12..4a6605f7f 100644--- a/moli-protocol/src/domains/emulation.rs+++ b/moli-protocol/src/domains/emulation.rs@@ -1046,7 +1046,7 @@ fn start_apply_device_metrics(else {return Ok(None);};- let viewport_surface = Some(metrics.viewport_surface().to_page_viewport_surface());+ let viewport_surface = Some(metrics.viewport_surface());let pending_viewport = page.start_set_viewport_surface(viewport_surface).map_err(|error| DevToolsError::new(DevToolsErrorKind::Internal, error.to_string()))?;@@ -1072,7 +1072,10 @@ fn set_viewport_metrics_from_current(current_metrics: Option<&EmulatedDeviceMetrics>,command: &DevToolsSetViewportCommand,) -> Result<EmulatedDeviceMetrics, DevToolsError> {- let current = EmulatedViewportSurface::from_metrics(current_metrics);+ let current = (current_metrics).map_or_else(+ EmulatedViewportSurface::default,+ crate::conn::EmulatedDeviceMetrics::viewport_surface,+ );let default = EmulatedViewportSurface::default();let (width, height) = match command.viewport {DevToolsViewportSetting::Unchanged => (current.inner_width, current.inner_height),@@ -1103,6 +1106,9 @@ fn set_viewport_metrics_from_current(// Preserve the existing WebDriver/BiDi headless work area. CDP device// emulation supplies its own available screen dimensions instead.screen_avail_height: command.screen_height.unwrap_or(height).min(1040),+ window_x: current.window_x,+ window_y: current.window_y,+ screen_orientation: current.screen_orientation,})}@@ -2242,7 +2248,7 @@ fn start_browser_context_default_device_metrics_page_commands(metrics: &EmulatedDeviceMetrics,) -> Result<Vec<PendingEmulationPageCommand>, DevToolsError> {let browser_context_id = browser_context.id.clone();- let viewport_surface = Some(metrics.viewport_surface().to_page_viewport_surface());+ let viewport_surface = Some(metrics.viewport_surface());let mut pending = Vec::new();for target in browser_context.page_targets.iter_mut() {if targetdiff --git a/moli-protocol/src/domains/emulation/device.rs b/moli-protocol/src/domains/emulation/device.rsindex d03144ce7..e7a630fc0 100644--- a/moli-protocol/src/domains/emulation/device.rs+++ b/moli-protocol/src/domains/emulation/device.rs@@ -21,6 +21,37 @@ pub(super) fn metrics_from_cdp(let height = size(params.height)?;let screen_width = size(params.screen_width.unwrap_or(0))?;let screen_height = size(params.screen_height.unwrap_or(0))?;+ for (position, limit) in [+ (params.position_x.unwrap_or(0), screen_width),+ (params.position_y.unwrap_or(0), screen_height),+ ] {+ if position < 0 || position > i64::from(limit) {+ return Err(invalid());+ }+ }+ let (window_x, window_y) = match (params.position_x, params.position_y) {+ (Some(x), Some(y)) => (x as i32, y as i32),+ _ if params.mobile => (0, 0),+ _ => (base.window_x, base.window_y),+ };+ let screen_orientation = if let Some(orientation) = params.screen_orientation {+ let kind = match orientation.r#type.as_ref() {+ "portraitPrimary" => "portrait-primary",+ "portraitSecondary" => "portrait-secondary",+ "landscapePrimary" => "landscape-primary",+ "landscapeSecondary" => "landscape-secondary",+ _ => return Err(invalid()),+ };+ if !(0..360).contains(&orientation.angle) {+ return Err(invalid());+ }+ moli_page_types::ScreenOrientation {+ kind,+ angle: orientation.angle as u16,+ }+ } else {+ base.screen_orientation+ };let scale = params.scale.unwrap_or(1.0);if !params.device_scale_factor.is_finite()|| params.device_scale_factor < 0.0@@ -76,5 +107,8 @@ pub(super) fn metrics_from_cdp(screen_width,screen_height,screen_avail_height: screen_height,+ window_x,+ window_y,+ screen_orientation,})}diff --git a/moli-protocol/src/domains/emulation/tests.rs b/moli-protocol/src/domains/emulation/tests.rsindex 1d8c3a815..9ac36bcc0 100644--- a/moli-protocol/src/domains/emulation/tests.rs+++ b/moli-protocol/src/domains/emulation/tests.rs@@ -19,6 +19,7 @@ use tokio::{time::{Duration, timeout},};+mod device_geometry;mod native_navigator;async fn evaluate(ctx: &mut TestContext, expression: &str) -> serde_json::Value {diff --git a/moli-protocol/src/domains/emulation/tests/device_geometry.rs b/moli-protocol/src/domains/emulation/tests/device_geometry.rsnew file mode 100644index 000000000..b686b3673--- /dev/null+++ b/moli-protocol/src/domains/emulation/tests/device_geometry.rs@@ -0,0 +1,192 @@+use super::*;++fn metrics(extra: serde_json::Value) -> serde_json::Value {+ let mut params = json!({+ "width": 200,+ "height": 100,+ "deviceScaleFactor": 1,+ "mobile": false,+ "screenWidth": 900,+ "screenHeight": 800+ });+ params+ .as_object_mut()+ .unwrap()+ .extend(extra.as_object().unwrap().clone());+ params+}++async fn set_metrics(ctx: &mut TestContext, extra: serde_json::Value) {+ expect_session_command_result(+ ctx,+ 88400,+ "SID-1",+ "Emulation.setDeviceMetricsOverride",+ metrics(extra),+ )+ .await;+}++#[tokio::test(flavor = "multi_thread")]+async fn screen_orientation_and_position_update_held_objects_and_clear() {+ let mut ctx = TestContext::new();+ load_session_page_for_pending_emulation_test(&mut ctx).await;+ set_metrics(&mut ctx, json!({})).await;+ ctx.install_navigation_fixture_for_session_owner(+ "data:text/html,<iframe></iframe>",+ Some("SID-1"),+ )+ .await;+ evaluate(&mut ctx, r#"+ globalThis.heldOrientation = screen.orientation;+ globalThis.orientationCount = 0;+ globalThis.resizeCount = 0;+ heldOrientation.addEventListener('change', () => orientationCount++);+ addEventListener('resize', () => resizeCount++);+ globalThis.armOrientation = () => {+ globalThis.orientationChanged = new Promise(resolve => heldOrientation.addEventListener('change', e => resolve([+ e.isTrusted, e.target === heldOrientation, screen.orientation === heldOrientation,+ heldOrientation.type, heldOrientation.angle, screenX, screenY,+ frames[0].screen.orientation.type, frames[0].screenX+ ]), {once:true}));+ };+ armOrientation(); undefined+ "#).await;+ let override_params = json!({+ "positionX": 20,+ "positionY": 30,+ "screenOrientation": {"type": "portraitPrimary", "angle": 45}+ });+ set_metrics(&mut ctx, override_params.clone()).await;+ assert_eq!(+ evaluate(&mut ctx, "orientationChanged").await,+ json!([+ true,+ true,+ true,+ "portrait-primary",+ 45,+ 20,+ 30,+ "portrait-primary",+ 20+ ])+ );+ assert_eq!(+ evaluate(+ &mut ctx,+ r#"[+ screenLeft, screenTop, innerWidth, innerHeight,+ matchMedia('(orientation:landscape)').matches, resizeCount+ ]"#+ )+ .await,+ json!([20, 30, 200, 100, true, 0])+ );+ set_metrics(&mut ctx, override_params).await;+ assert_eq!(+ evaluate(+ &mut ctx,+ "new Promise(requestAnimationFrame).then(() => orientationCount)"+ )+ .await,+ json!(1)+ );+ for invalid in [+ json!({"positionX": -1}),+ json!({"positionX": 901}),+ json!({"screenOrientation": {"type": "portraitPrimary", "angle": 360}}),+ json!({"screenOrientation": {"type": "portraitPrimary", "angle": -1}}),+ ] {+ ctx.process_async(json!({+ "id": 88401,+ "sessionId": "SID-1",+ "method": "Emulation.setDeviceMetricsOverride",+ "params": metrics(invalid)+ }))+ .await;+ assert_eq!(ctx.take_response_by_id(88401)["error"]["code"], -32602);+ }+ assert_eq!(+ evaluate(&mut ctx, "[heldOrientation.angle,screenX,screenY]").await,+ json!([45, 20, 30])+ );+ evaluate(&mut ctx, "armOrientation(); undefined").await;+ expect_session_command_result(+ &mut ctx,+ 88402,+ "SID-1",+ "Emulation.clearDeviceMetricsOverride",+ json!({}),+ )+ .await;+ assert_eq!(+ evaluate(&mut ctx, "orientationChanged").await,+ json!([+ true,+ true,+ true,+ "landscape-primary",+ 0,+ 0,+ 0,+ "landscape-primary",+ 0+ ])+ );+}++#[tokio::test(flavor = "multi_thread")]+async fn device_pixel_ratio_updates_css_and_existing_media_queries_without_resizing() {+ let mut ctx = TestContext::new();+ load_session_page_for_pending_emulation_test(&mut ctx).await;+ set_metrics(&mut ctx, json!({})).await;+ ctx.install_navigation_fixture_for_session_owner(+ "data:text/html,<style>body{color:red}@media(min-resolution:2dppx){body{color:green}}</style><body><iframe></iframe>",+ Some("SID-1"),+ ).await;+ evaluate(+ &mut ctx,+ r#"+ globalThis.heldStyle = getComputedStyle(document.body);+ globalThis.query = matchMedia('(resolution:2dppx)');+ globalThis.childQuery = frames[0].matchMedia('(resolution:2dppx)');+ globalThis.resizeCount = 0;+ addEventListener('resize', () => resizeCount++);+ visualViewport.addEventListener('resize', () => resizeCount++);+ globalThis.armMedia = () => {+ globalThis.mediaChanged = Promise.all([query, childQuery].map(q =>+ new Promise(resolve => q.addEventListener('change', e =>+ resolve([e.matches, e.isTrusted]), {once: true}))));+ };+ undefined+ "#,+ )+ .await;+ for (ratio, matches, color) in [+ (2, true, "rgb(0, 128, 0)"),+ (0, false, "rgb(255, 0, 0)"),+ (2, true, "rgb(0, 128, 0)"),+ (3, false, "rgb(0, 128, 0)"),+ ] {+ evaluate(&mut ctx, "armMedia(); undefined").await;+ set_metrics(&mut ctx, json!({"deviceScaleFactor": ratio})).await;+ assert_eq!(+ evaluate(&mut ctx, "mediaChanged").await,+ json!([[matches, true], [matches, true]])+ );+ let expected_ratio = if ratio == 0 { 1 } else { ratio };+ assert_eq!(+ evaluate(+ &mut ctx,+ r#"[+ devicePixelRatio, frames[0].devicePixelRatio, heldStyle.color,+ matchMedia('(device-width:900px)').matches,+ frames[0].matchMedia('(device-width:900px)').matches, resizeCount+ ]"#+ )+ .await,+ json!([expected_ratio, expected_ratio, color, true, true, 0])+ );+ }+}diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rsindex a1316d7c5..c8aaf4912 100644--- a/moli-protocol/src/domains/page.rs+++ b/moli-protocol/src/domains/page.rs@@ -1767,7 +1767,6 @@ pub struct PendingPageScreencastCapture {session_id: Option<String>,generation: i32,owner_scope: CommandOwnerScope,- viewport: EmulatedViewportSurface,pending: PendingPageCommand,}@@ -1775,7 +1774,6 @@ pub struct CompletedPageScreencastCapture {session_id: Option<String>,generation: i32,owner_scope: CommandOwnerScope,- viewport: EmulatedViewportSurface,completed: Result<Box<CompletedPageCommand>, String>,}@@ -1795,7 +1793,6 @@ impl PendingPageScreencastCapture {session_id: self.session_id,generation: self.generation,owner_scope: self.owner_scope,- viewport: self.viewport,completed: self.pending.wait()@@ -1939,7 +1936,6 @@ impl CdpConnection {else {return PageScreencastCaptureStart::Stale;};- let viewport = current_viewport_surface_for_owner(self, &owner_scope);let request = RendererCaptureScreencastFrameRequest {base_background_color: self.default_background_color_for_owner(&owner_scope),format: match config.format() {@@ -1974,7 +1970,6 @@ impl CdpConnection {session_id,generation,owner_scope,- viewport,pending,})}@@ -1987,7 +1982,6 @@ impl CdpConnection {session_id,generation,owner_scope,- viewport,completed,} = completed;let session_id_ref = session_id.as_deref();@@ -2056,8 +2050,8 @@ impl CdpConnection {let metadata = crate::conn::PageScreencastFrameMetadata {offset_top: 0.0,page_scale_factor: 1.0,- device_width: f64::from(viewport.inner_width),- device_height: f64::from(viewport.inner_height),+ device_width: f64::from(frame.viewport_size.0),+ device_height: f64::from(frame.viewport_size.1),scroll_offset_x: 0.0,scroll_offset_y: 0.0,timestamp: SystemTime::now()@@ -5809,9 +5803,12 @@ fn current_viewport_surface(conn: &CdpConnection,session_id: Option<&str>,) -> EmulatedViewportSurface {- EmulatedViewportSurface::from_metrics(- conn.target_session_owner_emulated_device_metrics(session_id)- .as_ref(),+ (conn+ .target_session_owner_emulated_device_metrics(session_id)+ .as_ref())+ .map_or_else(+ EmulatedViewportSurface::default,+ crate::conn::EmulatedDeviceMetrics::viewport_surface,)}@@ -5819,9 +5816,12 @@ fn current_viewport_surface_for_owner(conn: &CdpConnection,owner: &CommandOwnerScope,) -> EmulatedViewportSurface {- EmulatedViewportSurface::from_metrics(- conn.target_session_owner_emulated_device_metrics_for_owner(owner)- .as_ref(),+ (conn+ .target_session_owner_emulated_device_metrics_for_owner(owner)+ .as_ref())+ .map_or_else(+ EmulatedViewportSurface::default,+ crate::conn::EmulatedDeviceMetrics::viewport_surface,)}diff --git a/moli-protocol/src/domains/page/tests/capture.rs b/moli-protocol/src/domains/page/tests/capture.rsindex cae379a29..87f629413 100644--- a/moli-protocol/src/domains/page/tests/capture.rs+++ b/moli-protocol/src/domains/page/tests/capture.rs@@ -663,6 +663,10 @@ async fn capture_screenshot_targets_loaded_background_owner_without_activation()screen_width: 320,screen_height: 240,screen_avail_height: 240,++ window_x: 0,+ window_y: 0,+ screen_orientation: Default::default(),});ctx.process_async(json!({@@ -716,6 +720,10 @@ async fn capture_screenshot_targets_inactive_loaded_owner_without_activation() {screen_width: 500,screen_height: 300,screen_avail_height: 300,++ window_x: 0,+ window_y: 0,+ screen_orientation: Default::default(),});inactive.replace_loaded_page(Some(page));ctx.conndiff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rsindex 40a708b18..74ca8de5c 100644--- a/moli-renderer-v8/src/context_bootstrap.rs+++ b/moli-renderer-v8/src/context_bootstrap.rs@@ -334,7 +334,8 @@ pub(crate) use self::navigator_runtime::{bind_window_navigator_identity_seed, set_window_navigator_identity,};pub(crate) use self::navigator_runtime::{- dispatch_window_visual_viewport_resize, notify_geolocation_override_changed,+ dispatch_screen_orientation_change, dispatch_window_visual_viewport_resize,+ notify_geolocation_override_changed,};pub(crate) use self::notification_runtime::{build_notification_object_from_snapshot, notification_get_options_tag,diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime.rsindex 2ba7b704e..b9a934d64 100644--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime.rs+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime.rs@@ -41,4 +41,5 @@ pub(super) use self::window_state::{build_window_navigator_for_receiver, install_navigator_runtime_state,};+pub(crate) use self::screen::dispatch_screen_orientation_change;pub(crate) use self::visual_viewport::dispatch_window_visual_viewport_resize;diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rsindex d142c4900..c640f4664 100644--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs@@ -1,6 +1,6 @@use super::super::media_queries::{- mark_simple_event_target_slot, simple_event_target_add_event_listener_callback,- simple_event_target_dispatch_event_callback,+ dispatch_simple_event_target_event, mark_simple_event_target_slot,+ simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,simple_event_target_remove_event_listener_callback,};use super::super::*;@@ -457,6 +457,39 @@ fn build_screen_orientation_in_current_realm<'s>(Ok(orientation)}+pub(crate) fn dispatch_screen_orientation_change<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ window: v8::Local<'s, v8::Object>,+) -> bool {+ let Some(screen) = get_private_value(scope, window, WINDOW_SCREEN_SLOT)+ .and_then(|value| v8::Local::<v8::Object>::try_from(value).ok())+ else {+ return false;+ };+ let Some(orientation) = get_private_value(scope, screen, SCREEN_ORIENTATION_SLOT)+ .and_then(|value| v8::Local::<v8::Object>::try_from(value).ok())+ else {+ return false;+ };+ let Ok(event) = crate::host::create_host_event(+ scope,+ "change",+ orientation.into(),+ orientation.into(),+ false,+ false,+ ) else {+ return false;+ };+ dispatch_simple_event_target_event(+ scope,+ orientation,+ SCREEN_ORIENTATION_EVENT_LISTENERS_SLOT,+ "change",+ event,+ )+}+fn screen_orientation_attribute_getter_callback<'s>(scope: &mut v8::PinScope<'s, '_>,args: v8::FunctionCallbackArguments<'s>,@@ -475,6 +508,20 @@ fn screen_orientation_attribute_getter_callback<'s>(rv.set_undefined();return;};+ if screen_owner_realm_is_current(scope, args.this())+ && let Some(host) = context_host_ptr_from_global_bridge(scope)+ {+ let orientation = unsafe { &*host }+ .viewport_surface()+ .unwrap_or_default()+ .screen_orientation;+ if slot == SCREEN_ORIENTATION_TYPE_SLOT {+ rv.set(v8str(scope, orientation.kind).into());+ } else {+ rv.set_uint32(u32::from(orientation.angle));+ }+ return;+ }rv.set(get_private_value(scope, args.this(), slot).unwrap_or_else(|| v8::undefined(scope).into()),);diff --git a/moli-renderer-v8/src/context_bootstrap/runtime_state.rs b/moli-renderer-v8/src/context_bootstrap/runtime_state.rsindex 16bd6b2e7..88d622f6f 100644--- a/moli-renderer-v8/src/context_bootstrap/runtime_state.rs+++ b/moli-renderer-v8/src/context_bootstrap/runtime_state.rs@@ -344,28 +344,32 @@ struct WindowAdditionalReplaceableAccessorsDeclaration<'scope> {scroll_x: (),#[webapi(accessor_property = "screenLeft",- getter = window_zero_replaceable_getter,+ getter = window_screen_position_getter,+ data = self.screen_left_name,setter = window_surface_replaceable_setter,setter_data = self.screen_left_name)]screen_left: (),#[webapi(accessor_property = "screenTop",- getter = window_zero_replaceable_getter,+ getter = window_screen_position_getter,+ data = self.screen_top_name,setter = window_surface_replaceable_setter,setter_data = self.screen_top_name)]screen_top: (),#[webapi(accessor_property = "screenX",- getter = window_zero_replaceable_getter,+ getter = window_screen_position_getter,+ data = self.screen_x_name,setter = window_surface_replaceable_setter,setter_data = self.screen_x_name)]screen_x: (),#[webapi(accessor_property = "screenY",- getter = window_zero_replaceable_getter,+ getter = window_screen_position_getter,+ data = self.screen_y_name,setter = window_surface_replaceable_setter,setter_data = self.screen_y_name)]@@ -644,12 +648,31 @@ fn window_scroll_x_replaceable_getter<'s>(rv.set(v8::Number::new(scope, value).into());}-fn window_zero_replaceable_getter<'s>(+fn window_screen_position_getter<'s>(scope: &mut v8::PinScope<'s, '_>,- _args: v8::FunctionCallbackArguments<'s>,+ args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'s, v8::Value>,) {- rv.set(v8::Integer::new(scope, 0).into());+ let Some(name) = callback_data_item(+ scope,+ &args,+ WINDOW_SURFACE_REPLACEABLE_NAMES,+ "Window positions",+ ) else {+ return;+ };+ let receiver = callback_this_object(scope, &args);+ let position = super::window_accessors::window_host_ptr(scope, receiver)+ .and_then(|host| unsafe { &*host }.viewport_surface())+ .map(|surface| {+ if matches!(name, "screenX" | "screenLeft") {+ surface.window_x+ } else {+ surface.window_y+ }+ })+ .unwrap_or(0);+ rv.set_int32(position);}fn define_legacy_unforgeable_window_property<'s>(diff --git a/moli-renderer-v8/src/layout_renderer/style_resolver.rs b/moli-renderer-v8/src/layout_renderer/style_resolver.rsindex 350ff44af..4c14be7dc 100644--- a/moli-renderer-v8/src/layout_renderer/style_resolver.rs+++ b/moli-renderer-v8/src/layout_renderer/style_resolver.rs@@ -98,6 +98,7 @@ fn layout_style_viewport(runtime: &JsContextHost, viewport: LayoutViewport) -> SSome(f64::from(viewport.css_height)),).with_screen_size(screen.screen_width, screen.screen_height)+ .with_device_pixel_ratio(screen.device_pixel_ratio)}impl LayoutStyleResolver<DomHandle> for NativeLayoutStyleResolver<'_> {diff --git a/moli-renderer-v8/src/native_bridge/context_host/rendering_updates.rs b/moli-renderer-v8/src/native_bridge/context_host/rendering_updates.rsindex d8f010926..69a1fcf23 100644--- a/moli-renderer-v8/src/native_bridge/context_host/rendering_updates.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/rendering_updates.rs@@ -20,6 +20,7 @@ pub(super) enum PendingRenderingUpdatePayload {pub(super) struct PendingEnvironmentChange {pub(super) previous_viewport: crate::style_engine::StyleViewport,pub(super) previous_activity: moli_page_types::DocumentActivity,+ pub(super) previous_orientation: moli_page_types::ScreenOrientation,}#[derive(Clone, Copy, Debug, Eq, PartialEq)]@@ -160,6 +161,10 @@ impl JsContextHost {PendingRenderingUpdatePayload::EnvironmentChange(PendingEnvironmentChange {previous_viewport,previous_activity: self.document_activity(),+ previous_orientation: self+ .viewport_surface()+ .unwrap_or_default()+ .screen_orientation,}),);}@@ -382,6 +387,23 @@ impl JsContextHost {return dispatched;}+ if change.previous_orientation+ != self+ .viewport_surface()+ .unwrap_or_default()+ .screen_orientation+ {+ dispatched |= crate::context_bootstrap::dispatch_screen_orientation_change(+ context_scope,+ global,+ );+ if !self.window_document_owner_is_current_for_dispatch_scope(+ target.owner(),+ target.dispatch_scope(),+ ) {+ return dispatched;+ }+ }if change.previous_activity != current_activity {if change.previous_activity.visible != current_activity.visible&& let Ok(document) = crate::host::event_target_value(diff --git a/moli-renderer-v8/src/native_bridge/element/styles.rs b/moli-renderer-v8/src/native_bridge/element/styles.rsindex 7f4e2132c..452a76270 100644--- a/moli-renderer-v8/src/native_bridge/element/styles.rs+++ b/moli-renderer-v8/src/native_bridge/element/styles.rs@@ -58,6 +58,7 @@ pub(crate) const STYLE_DECLARATION_VIEWPORT_WIDTH_SLOT: &str ="__moliStyleDeclarationViewportWidth";pub(crate) const STYLE_DECLARATION_VIEWPORT_HEIGHT_SLOT: &str ="__moliStyleDeclarationViewportHeight";+const STYLE_DECLARATION_DEVICE_PIXEL_RATIO_SLOT: &str = "__moliStyleDeclarationDevicePixelRatio";pub(crate) const STYLE_DECLARATION_SCREEN_WIDTH_SLOT: &str = "__moliStyleDeclarationScreenWidth";pub(crate) const STYLE_DECLARATION_SCREEN_HEIGHT_SLOT: &str = "__moliStyleDeclarationScreenHeight";pub(crate) const STYLE_DECLARATION_FORCED_EMPTY_COMPUTED_SLOT: &str =@@ -274,6 +275,16 @@ fn cache_frame_viewport<'s>(STYLE_DECLARATION_SCREEN_HEIGHT_SLOT,screen_height,);+ let ratio = viewport+ .and_then(|viewport| viewport.device_pixel_ratio)+ .map(|ratio| v8::Number::new(scope, ratio).into())+ .unwrap_or_else(|| v8::undefined(scope).into());+ set_private_value(+ scope,+ style,+ STYLE_DECLARATION_DEVICE_PIXEL_RATIO_SLOT,+ ratio,+ );}fn style_object_pseudo_element<'s>(@@ -337,6 +348,11 @@ fn style_object_viewport<'s>(style_object_screen_width(scope, style),style_object_screen_height(scope, style),)+ .with_device_pixel_ratio(+ get_private_value(scope, style, STYLE_DECLARATION_DEVICE_PIXEL_RATIO_SLOT)+ .and_then(|value| value.number_value(scope))+ .filter(|value| value.is_finite() && *value > 0.0),+ )}fn style_object_computation_context<'s>(@@ -754,7 +770,8 @@ fn iframe_handle_viewport_with_depth(Some(f64::from(viewport.css_width)),Some(f64::from(viewport.css_height)),)- .with_screen_size(parent_viewport.screen_width, parent_viewport.screen_height),+ .with_screen_size(parent_viewport.screen_width, parent_viewport.screen_height)+ .with_device_pixel_ratio(parent_viewport.device_pixel_ratio),);}Some(@@ -802,6 +819,7 @@ fn iframe_handle_viewport_with_depth());StyleViewport::new(width, height).with_screen_size(parent_viewport.screen_width, parent_viewport.screen_height)+ .with_device_pixel_ratio(parent_viewport.device_pixel_ratio)}),)}diff --git a/moli-renderer-v8/src/runtime/page_screenshot.rs b/moli-renderer-v8/src/runtime/page_screenshot.rsindex 87b29ea3f..9b72f2c5f 100644--- a/moli-renderer-v8/src/runtime/page_screenshot.rs+++ b/moli-renderer-v8/src/runtime/page_screenshot.rs@@ -298,6 +298,7 @@ impl PageVm {visual_state_for_captured_screencast_frame(visual_state_before, visual_state_after);Ok(RendererCaptureScreencastFrameReply::Captured(RendererCapturedScreencastFrame {+ viewport_size: (surface.inner_width, surface.inner_height),image,visual_state,},@@ -511,5 +512,7 @@ fn default_viewport_surface() -> crate::protocol_types::ViewportSurface {screen_height: dimension(DEFAULT_WINDOW_SURFACE_PROFILE.screen_height),screen_avail_width: dimension(DEFAULT_WINDOW_SURFACE_PROFILE.screen_avail_width),screen_avail_height: dimension(DEFAULT_WINDOW_SURFACE_PROFILE.screen_avail_height),++ ..Default::default()}}diff --git a/moli-renderer-v8/src/runtime/page_surface.rs b/moli-renderer-v8/src/runtime/page_surface.rsindex 6607c68c6..760ab1588 100644--- a/moli-renderer-v8/src/runtime/page_surface.rs+++ b/moli-renderer-v8/src/runtime/page_surface.rs@@ -6085,6 +6085,8 @@ pub enum RendererCaptureScreenshotReply {#[derive(Clone, Debug, PartialEq, Eq)]pub struct RendererCapturedScreencastFrame {+ /// Native viewport dimensions before the encoded frame is fitted to limits.+ pub viewport_size: (u32, u32),pub image: RendererCapturedScreenshot,pub visual_state: RendererVisualStateToken,}diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/lifecycle.rs b/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/lifecycle.rsindex 80e7f2ab4..1263915d7 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/lifecycle.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/lifecycle.rs@@ -15,6 +15,8 @@ fn set_viewport(page: &mut PageVm, width: u32, height: u32) -> anyhow::Result<()screen_height: height,screen_avail_width: width,screen_avail_height: height,++ ..Default::default()}))?;Ok(())}diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rs b/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rsindex 15dadc51d..89b55d80b 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rs@@ -532,7 +532,9 @@ async fn screencast_visual_token_tracks_canvas_and_scroll_while_screenshot_staysscreen_height: 30,screen_avail_width: 40,screen_avail_height: 30,- }))?;++..Default::default()+}))?;page_vm.vm_mut().eval(r#"document.documentElement.style.cssText = 'margin:0;background:white';@@ -1020,7 +1022,9 @@ async fn positioned_layout_matches_chromium_auto_margin_and_relative_inset_rulesscreen_height: 620,screen_avail_width: 1440,screen_avail_height: 620,- }))?;++..Default::default()+}))?;page_vm.vm_mut().eval(r#"document.head.innerHTML = `<style>@@ -1108,7 +1112,9 @@ async fn containment_matches_chromium_containing_block_eligibility_and_paint_cliscreen_height: 600,screen_avail_width: 800,screen_avail_height: 600,- }))?;++..Default::default()+}))?;page_vm.vm_mut().eval(r#"document.head.innerHTML = `<style>@@ -1455,7 +1461,9 @@ async fn fixed_flex_auto_margin_consumes_free_space_once() {screen_height: 900,screen_avail_width: 1440,screen_avail_height: 900,- }))?;++..Default::default()+}))?;page_vm.vm_mut().eval(r#"document.head.innerHTML = `<style>diff --git a/moli-renderer-v8/src/runtime/tests.rs b/moli-renderer-v8/src/runtime/tests.rsindex 00451d35e..a44abfe1a 100644--- a/moli-renderer-v8/src/runtime/tests.rs+++ b/moli-renderer-v8/src/runtime/tests.rs@@ -379,6 +379,8 @@ async fn capture_screenshot_uses_current_root_computed_background_and_viewport()screen_height: 3,screen_avail_width: 4,screen_avail_height: 3,++ ..Default::default()};let (reply, _) = page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport)))@@ -454,6 +456,8 @@ async fn capture_screenshot_paints_downloaded_raster_image_pixels() {screen_height: 10,screen_avail_width: 20,screen_avail_height: 10,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -532,6 +536,8 @@ async fn screenshot_and_screencast_paint_downloaded_svg_vectors() {screen_height: 10,screen_avail_width: 20,screen_avail_height: 10,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -629,6 +635,8 @@ async fn capture_screenshot_consumes_the_shadow_flat_tree_without_light_dom_leakscreen_height: 60,screen_avail_width: 40,screen_avail_height: 60,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -670,6 +678,8 @@ async fn capture_screenshot_encodes_jpeg_and_limits_device_dimensions() {screen_height: 3,screen_avail_width: 4,screen_avail_height: 3,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -731,6 +741,8 @@ async fn print_capture_uses_print_media_controls_backgrounds_and_restores_screenscreen_height: 20,screen_avail_width: 20,screen_avail_height: 20,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -819,6 +831,8 @@ async fn capture_screenshot_clip_and_full_document_keep_the_live_layout_viewportscreen_height: 20,screen_avail_width: 20,screen_avail_height: 20,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -895,6 +909,8 @@ async fn bounded_viewport_clip_keeps_root_controls_while_page_clip_omits_them()screen_height: 100,screen_avail_width: 100,screen_avail_height: 100,++ ..Default::default()};page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport))).await@@ -1020,6 +1036,8 @@ async fn capture_screenshot_lays_out_real_flex_mixed_flow_and_pseudo() {screen_height: 600,screen_avail_width: 800,screen_avail_height: 600,++ ..Default::default()};let (reply, _) = page.run_async_command(RendererPageCommand::SetViewportSurface(Some(viewport)))@@ -11984,6 +12002,8 @@ addEventListener("wheel", event => {screen_height: 200,screen_avail_width: 200,screen_avail_height: 200,++ ..Default::default()},))).await@@ -12107,6 +12127,8 @@ addEventListener("wheel", event => {screen_height: 20,screen_avail_width: 20,screen_avail_height: 20,++ ..Default::default()},))).awaitdiff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/media.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/media.rsindex eac4772c3..85bc93f91 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/media.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/media.rs@@ -2950,6 +2950,8 @@ fn viewport_surface_800_600_on_1920_1080_screen() -> crate::protocol_types::Viewscreen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()}}diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rsindex 3c3f6ddfb..eaa8a64f1 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs@@ -4282,6 +4282,8 @@ fn window_and_visual_viewport_follow_renderer_viewport_surface_changes() {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()};vm.set_viewport_surface(Some(surface(800, 600)))diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rsindex 66338d132..8ff2b9c1f 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs@@ -443,6 +443,8 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordinascreen_height: 800,screen_avail_width: 1200,screen_avail_height: 800,++ ..Default::default()})).expect("iframe input viewport should update");vm.force_fresh_layout_reads_for_test();@@ -612,6 +614,8 @@ fn iframe_input_reuses_one_top_level_snapshot_without_parent_child_ping_pong() {screen_height: 600,screen_avail_width: 800,screen_avail_height: 600,++ ..Default::default()})).expect("iframe input snapshot viewport should update");vm.eval(@@ -688,6 +692,8 @@ fn iframe_wheel_batch_reuses_one_composite_snapshot_for_every_scroll_step() {screen_height: 600,screen_avail_width: 800,screen_avail_height: 600,++ ..Default::default()})).expect("iframe wheel snapshot viewport should update");vm.eval(@@ -773,6 +779,8 @@ fn focusing_visible_child_target_does_not_scroll_partially_hidden_transformed_ifscreen_height: 600,screen_avail_width: 800,screen_avail_height: 600,++ ..Default::default()})).expect("iframe focus viewport should update");vm.force_fresh_layout_reads_for_test();@@ -885,6 +893,8 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coordscreen_height: 600,screen_avail_width: 800,screen_avail_height: 600,++ ..Default::default()})).expect("nested iframe viewport should update");vm.force_fresh_layout_reads_for_test();@@ -1294,6 +1304,8 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {screen_height: 600,screen_avail_width: 800,screen_avail_height: 600,++ ..Default::default()})).expect("viewport overflow surface should update");vm.eval(@@ -2030,6 +2042,8 @@ fn root_classic_scrollbars_stay_viewport_fixed_and_drive_window_scroll() {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()})).expect("root scrollbar viewport surface should update");vm.eval(@@ -2137,6 +2151,8 @@ fn closed_absolute_popover_does_not_expand_root_scrollable_overflow() {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()})).expect("popover overflow viewport surface should update");vm.eval(@@ -2200,6 +2216,8 @@ fn root_scrollbar_gutters_size_the_initial_containing_block_once() {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()})).expect("root gutter viewport surface should update");vm.eval(diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rsindex a8b36a579..e2bd648b3 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs@@ -4653,6 +4653,8 @@ fn computed_horizontal_margin_reads_preserve_retained_style_viewport_context() {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()})).expect("viewport surface should update");let document = vm.document_handle_for_test();@@ -4948,6 +4950,8 @@ fn held_main_document_computed_styles_follow_repeated_viewport_surface_changes()screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()};vm.set_viewport_surface(Some(surface(1000, 800))).expect("initial viewport surface should update");diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom.rsindex 9a372ac77..5c996fc9f 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom.rs@@ -5140,6 +5140,8 @@ fn css_media_rules_and_stylesheet_media_use_renderer_viewport_surface() {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()})).expect("viewport surface should update");diff --git a/moli-renderer-v8/src/script_vm/tests/rendering_update.rs b/moli-renderer-v8/src/script_vm/tests/rendering_update.rsindex b67b4b247..6755f70c9 100644--- a/moli-renderer-v8/src/script_vm/tests/rendering_update.rs+++ b/moli-renderer-v8/src/script_vm/tests/rendering_update.rs@@ -353,6 +353,8 @@ fn emulation_viewport(width: u32) -> crate::protocol_types::ViewportSurface {screen_height: 1080,screen_avail_width: 1920,screen_avail_height: 1040,++ ..Default::default()}}diff --git a/moli-renderer-v8/src/style_engine/media_list.rs b/moli-renderer-v8/src/style_engine/media_list.rsindex 7613e794e..bfed903e0 100644--- a/moli-renderer-v8/src/style_engine/media_list.rs+++ b/moli-renderer-v8/src/style_engine/media_list.rs@@ -129,12 +129,13 @@ fn media_query_device(let viewport_height = viewport.height.unwrap_or(DEFAULT_VIEWPORT_HEIGHT as f64) as f32;let screen_width = viewport.screen_width.unwrap_or(viewport_width as f64) as f32;let screen_height = viewport.screen_height.unwrap_or(viewport_height as f64) as f32;+ let ratio = viewport.device_pixel_ratio.unwrap_or(1.0) as f32;let mut device = Device::new(environment.stylo_media_type(),QuirksMode::NoQuirks,Size2D::<f32, CSSPixel>::new(viewport_width, viewport_height),- Size2D::<f32, DevicePixel>::new(screen_width, screen_height),- Scale::<f32, CSSPixel, DevicePixel>::new(1.0),+ Size2D::<f32, DevicePixel>::new(screen_width * ratio, screen_height * ratio),+ Scale::<f32, CSSPixel, DevicePixel>::new(ratio),Box::new(MediaQueryFontMetricsProvider),initial_style,environment.stylo_prefers_color_scheme(),diff --git a/moli-renderer-v8/src/style_engine/retained.rs b/moli-renderer-v8/src/style_engine/retained.rsindex 6f2155057..51fd1b51c 100644--- a/moli-renderer-v8/src/style_engine/retained.rs+++ b/moli-renderer-v8/src/style_engine/retained.rs@@ -22,8 +22,7 @@ use super::{state::RetainedStyleSystem,stylesheet::{append_stylesheet_to_stylist, install_active_stylesheet, install_active_stylesheets,- moli_ua_stylesheet_base_url, new_style_device_with_viewport_bits,- new_stylist_with_viewport_bits,+ moli_ua_stylesheet_base_url, new_style_device_with_viewport, new_stylist_with_viewport,},stylesheet_resources::StylesheetResourceManifest,ua::HTML_STYLESHEET as MOLI_UA_STYLESHEET,@@ -90,14 +89,8 @@ pub(super) fn build_retained_style_system(retained_source_records: &[RetainedStylesheetSourceRecord<'_>],author_styles_disabled: bool,) -> RetainedStyleSystem {- let mut stylist = new_stylist_with_viewport_bits(- key.viewport_width_bits,- key.viewport_height_bits,- key.screen_width_bits,- key.screen_height_bits,- key.environment,- key.quirks_mode,- );+ let mut stylist =+ new_stylist_with_viewport(key.style_viewport(), key.environment, key.quirks_mode);stylist.set_author_styles_enabled(if author_styles_disabled {AuthorStylesEnabled::No} else {@@ -384,17 +377,12 @@ fn update_document_scope(let device_changed = viewport_size_changed|| retained.key.screen_width_bits != key.screen_width_bits|| retained.key.screen_height_bits != key.screen_height_bits+ || retained.key.device_pixel_ratio_bits != key.device_pixel_ratio_bits|| retained.key.environment != key.environment;let mut device_affected_origins = OriginSet::empty();if device_changed {- let device = new_style_device_with_viewport_bits(- key.viewport_width_bits,- key.viewport_height_bits,- key.screen_width_bits,- key.screen_height_bits,- key.environment,- key.quirks_mode,- );+ let device =+ new_style_device_with_viewport(key.style_viewport(), key.environment, key.quirks_mode);let guard = shared_lock.read();let guards = StylesheetGuards::same(&guard);device_affected_origins = retained.stylist.set_device(device, &guards);diff --git a/moli-renderer-v8/src/style_engine/state.rs b/moli-renderer-v8/src/style_engine/state.rsindex f995202dd..6bb6016f8 100644--- a/moli-renderer-v8/src/style_engine/state.rs+++ b/moli-renderer-v8/src/style_engine/state.rs@@ -472,6 +472,7 @@ mod observation_invariant_tests {viewport_height_bits: 600.0_f32.to_bits(),screen_width_bits: 800.0_f32.to_bits(),screen_height_bits: 600.0_f32.to_bits(),+ device_pixel_ratio_bits: 1.0_f32.to_bits(),environment: StyloStyleEnvironment::default(),quirks_mode: QuirksMode::NoQuirks,tree_scope_versions: None,diff --git a/moli-renderer-v8/src/style_engine/stylesheet.rs b/moli-renderer-v8/src/style_engine/stylesheet.rsindex 96864d5a2..aa403d188 100644--- a/moli-renderer-v8/src/style_engine/stylesheet.rs+++ b/moli-renderer-v8/src/style_engine/stylesheet.rs@@ -134,11 +134,8 @@ pub(in crate::style_engine) fn style_source_metadata_for_stylesheet() -> StyleSourceMetadata {let guard = stylesheet.shared_lock.read();let quirks_mode = stylesheet.contents.read_with(&guard).quirks_mode;- let stylist = new_stylist_with_viewport_bits(- DEFAULT_VIEWPORT_WIDTH.to_bits(),- DEFAULT_VIEWPORT_HEIGHT.to_bits(),- DEFAULT_VIEWPORT_WIDTH.to_bits(),- DEFAULT_VIEWPORT_HEIGHT.to_bits(),+ let stylist = new_stylist_with_viewport(+ StyleViewport::default(),StyloStyleEnvironment::default(),quirks_mode,);@@ -196,18 +193,7 @@ pub(crate) fn native_font_face_projection_for_stylesheet() -> NativeStylesheetFontFaceProjection {let guard = stylesheet.shared_lock.read();let quirks_mode = stylesheet.contents.read_with(&guard).quirks_mode;- let viewport_width = viewport.width.unwrap_or(DEFAULT_VIEWPORT_WIDTH as f64) as f32;- let viewport_height = viewport.height.unwrap_or(DEFAULT_VIEWPORT_HEIGHT as f64) as f32;- let screen_width = viewport.screen_width.unwrap_or(f64::from(viewport_width)) as f32;- let screen_height = viewport.screen_height.unwrap_or(f64::from(viewport_height)) as f32;- let stylist = new_stylist_with_viewport_bits(- viewport_width.to_bits(),- viewport_height.to_bits(),- screen_width.to_bits(),- screen_height.to_bits(),- environment,- quirks_mode,- );+ let stylist = new_stylist_with_viewport(viewport, environment, quirks_mode);let mut projection = NativeStylesheetFontFaceProjection::default();let contents = stylesheet.contents(&guard);@@ -349,11 +335,8 @@ fn style_source_metadata_for_css_text_with_origin("",)));let guard = shared_lock.read();- let stylist = new_stylist_with_viewport_bits(- DEFAULT_VIEWPORT_WIDTH.to_bits(),- DEFAULT_VIEWPORT_HEIGHT.to_bits(),- DEFAULT_VIEWPORT_WIDTH.to_bits(),- DEFAULT_VIEWPORT_HEIGHT.to_bits(),+ let stylist = new_stylist_with_viewport(+ StyleViewport::default(),StyloStyleEnvironment::default(),QuirksMode::NoQuirks,);@@ -379,46 +362,36 @@ fn style_source_metadata_from_cascade_data(cascade_data: &CascadeData) -> StyleS}}-pub(super) fn new_stylist_with_viewport_bits(- viewport_width_bits: u32,- viewport_height_bits: u32,- screen_width_bits: u32,- screen_height_bits: u32,+pub(super) fn new_stylist_with_viewport(+ viewport: StyleViewport,environment: StyloStyleEnvironment,quirks_mode: QuirksMode,) -> Stylist {Stylist::new(- new_style_device_with_viewport_bits(- viewport_width_bits,- viewport_height_bits,- screen_width_bits,- screen_height_bits,- environment,- quirks_mode,- ),+ new_style_device_with_viewport(viewport, environment, quirks_mode),quirks_mode,)}-pub(super) fn new_style_device_with_viewport_bits(- viewport_width_bits: u32,- viewport_height_bits: u32,- screen_width_bits: u32,- screen_height_bits: u32,+pub(super) fn new_style_device_with_viewport(+ viewport: StyleViewport,environment: StyloStyleEnvironment,quirks_mode: QuirksMode,) -> Device {- let width = f32::from_bits(viewport_width_bits);- let height = f32::from_bits(viewport_height_bits);- let screen_width = f32::from_bits(screen_width_bits);- let screen_height = f32::from_bits(screen_height_bits);+ let width = viewport.width.unwrap_or(f64::from(DEFAULT_VIEWPORT_WIDTH)) as f32;+ let height = viewport+ .height+ .unwrap_or(f64::from(DEFAULT_VIEWPORT_HEIGHT)) as f32;+ let ratio = viewport.device_pixel_ratio.unwrap_or(1.0) as f32;+ let screen_width = viewport.screen_width.unwrap_or(f64::from(width)) as f32;+ let screen_height = viewport.screen_height.unwrap_or(f64::from(height)) as f32;let initial_style = ComputedValues::initial_values_with_font_override(Font::initial_values());let mut device = Device::new(environment.stylo_media_type(),quirks_mode,Size2D::<f32, CSSPixel>::new(width, height),- Size2D::<f32, DevicePixel>::new(screen_width, screen_height),- Scale::<f32, CSSPixel, DevicePixel>::new(1.0),+ Size2D::<f32, DevicePixel>::new(screen_width * ratio, screen_height * ratio),+ Scale::<f32, CSSPixel, DevicePixel>::new(ratio),Box::new(HeadlessFontMetricsProvider),initial_style,environment.stylo_prefers_color_scheme(),diff --git a/moli-renderer-v8/src/style_engine/world_environment.rs b/moli-renderer-v8/src/style_engine/world_environment.rsindex 24f4e8795..58069dc8b 100644--- a/moli-renderer-v8/src/style_engine/world_environment.rs+++ b/moli-renderer-v8/src/style_engine/world_environment.rs@@ -39,6 +39,7 @@ pub(crate) struct StyleViewport {pub(crate) height: Option<f64>,pub(crate) screen_width: Option<f64>,pub(crate) screen_height: Option<f64>,+ pub(crate) device_pixel_ratio: Option<f64>,}impl StyleViewport {@@ -48,6 +49,7 @@ impl StyleViewport {height,screen_width: None,screen_height: None,+ device_pixel_ratio: None,}}@@ -57,6 +59,7 @@ impl StyleViewport {height: None,screen_width: None,screen_height: None,+ device_pixel_ratio: None,}}@@ -72,6 +75,13 @@ impl StyleViewport {}}+ pub(crate) const fn with_device_pixel_ratio(self, device_pixel_ratio: Option<f64>) -> Self {+ Self {+ device_pixel_ratio,+ ..self+ }+ }+pub(crate) fn from_viewport_surface(surface: crate::protocol_types::ViewportSurface) -> Self {Self::new(Some(f64::from(surface.inner_width)),@@ -81,6 +91,7 @@ impl StyleViewport {Some(f64::from(surface.screen_width)),Some(f64::from(surface.screen_height)),)+ .with_device_pixel_ratio(Some(surface.device_pixel_ratio))}}diff --git a/moli-renderer-v8/src/style_engine/world_key.rs b/moli-renderer-v8/src/style_engine/world_key.rsindex 0ea3a1f8f..4a507b2a8 100644--- a/moli-renderer-v8/src/style_engine/world_key.rs+++ b/moli-renderer-v8/src/style_engine/world_key.rs@@ -21,6 +21,7 @@ pub(super) struct StyleWorldKey {pub(super) viewport_height_bits: u32,pub(super) screen_width_bits: u32,pub(super) screen_height_bits: u32,+ pub(super) device_pixel_ratio_bits: u32,pub(super) environment: StyloStyleEnvironment,pub(super) quirks_mode: QuirksMode,pub(super) tree_scope_versions: Option<StyleTreeScopeVersions>,@@ -77,12 +78,27 @@ impl StyleWorldKey {viewport.screen_height,f32::from_bits(viewport_height_bits),),+ device_pixel_ratio_bits: style_dimension_bits(viewport.device_pixel_ratio, 1.0),environment: inputs.environment,quirks_mode: inputs.quirks_mode,tree_scope_versions,}}+ pub(super) fn style_viewport(&self) -> StyleViewport {+ StyleViewport::new(+ Some(f64::from(f32::from_bits(self.viewport_width_bits))),+ Some(f64::from(f32::from_bits(self.viewport_height_bits))),+ )+ .with_screen_size(+ Some(f64::from(f32::from_bits(self.screen_width_bits))),+ Some(f64::from(f32::from_bits(self.screen_height_bits))),+ )+ .with_device_pixel_ratio(Some(f64::from(f32::from_bits(+ self.device_pixel_ratio_bits,+ ))))+ }+pub(super) fn updated_for_observation(&self, environment: &StyleWorldEnvironment) -> Self {let mut next = self.clone();let viewport_width_bits =@@ -99,6 +115,8 @@ impl StyleWorldKey {environment.viewport.screen_height,f32::from_bits(viewport_height_bits),);+ next.device_pixel_ratio_bits =+ style_dimension_bits(environment.viewport.device_pixel_ratio, 1.0);next.environment = environment.media;next.quirks_mode = environment.quirks_mode;next.tree_scope_versions = Some(environment.tree_scope_versions);@@ -114,7 +132,8 @@ impl StyleWorldKey {previous_viewport_height_bits: self.viewport_height_bits,next_viewport_height_bits: next.viewport_height_bits,screen_changed: self.screen_width_bits != next.screen_width_bits- || self.screen_height_bits != next.screen_height_bits,+ || self.screen_height_bits != next.screen_height_bits+ || self.device_pixel_ratio_bits != next.device_pixel_ratio_bits,previous_screen_width_bits: self.screen_width_bits,next_screen_width_bits: next.screen_width_bits,previous_screen_height_bits: self.screen_height_bits,@@ -145,6 +164,8 @@ impl StyleWorldKey {viewport.screen_height,f32::from_bits(viewport_height_bits),)+ && self.device_pixel_ratio_bits+ == style_dimension_bits(viewport.device_pixel_ratio, 1.0)&& self.environment == environment&& self.quirks_mode == quirks_mode&& self.tree_scope_versions == Some(tree_scope_versions)@@ -170,6 +191,8 @@ impl StyleWorldKey {viewport.screen_height,f32::from_bits(viewport_height_bits),)+ || self.device_pixel_ratio_bits+ != style_dimension_bits(viewport.device_pixel_ratio, 1.0)|| self.environment != environment}}