eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

webdriver: Retrieve viewport size in CSS pixel (#42628)

Browse Source 
According to
[spec](https://w3c.github.io/webdriver/#ref-for-dfn-move-target-out-of-bounds-2:~:text=the%20viewport%20in%20CSS%20pixels),
we are supposed to retrieve viewport size in CSS pixel.

This is a critical step when performing scroll/pointermove, to stop
invalid actions that happen outside viewport.

Testing: Tested with tests in headed mode manually, narrowing
discrepancy between headed/headless mode. Should not have effect on
automated tests in CI.

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye
2026-02-15 15:55:08 +08:00
committed by GitHub
parent 9b6b9ccd2e
commit 16f9f7500e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/shared/embedder/webdriver.rs
View File

@@ -17,11 +17,10 @@ use image::RgbaImage;
use malloc_size_of_derive::MallocSizeOf; use malloc_size_of_derive::MallocSizeOf;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use servo_geometry::DeviceIndependentIntRect; use servo_geometry::{DeviceIndependentIntRect, DeviceIndependentPixel};
use style_traits::CSSPixel; use style_traits::CSSPixel;
use url::Url; use url::Url;
use webdriver::error::ErrorStatus; use webdriver::error::ErrorStatus;
use webrender_api::units::DevicePixel;
use crate::{InputEvent, JSValue, JavaScriptEvaluationError, ScreenshotCaptureError, TraversalId}; use crate::{InputEvent, JSValue, JavaScriptEvaluationError, ScreenshotCaptureError, TraversalId};
@@ -92,7 +91,10 @@ pub enum WebDriverCommandMsg {
/// Get the window rectangle. /// Get the window rectangle.
GetWindowRect(WebViewId, GenericOneshotSender<DeviceIndependentIntRect>), GetWindowRect(WebViewId, GenericOneshotSender<DeviceIndependentIntRect>),
/// Get the viewport size. /// Get the viewport size.
GetViewportSize(WebViewId, GenericOneshotSender<Size2D<u32, DevicePixel>>), GetViewportSize(
WebViewId,
GenericOneshotSender<Size2D<f32, DeviceIndependentPixel>>,
),
/// Load a URL in the top-level browsing context with the given ID. /// Load a URL in the top-level browsing context with the given ID.
LoadUrl(WebViewId, Url, GenericSender<WebDriverLoadStatus>), LoadUrl(WebViewId, Url, GenericSender<WebDriverLoadStatus>),
/// Refresh the top-level browsing context with the given ID. /// Refresh the top-level browsing context with the given ID.

3
ports/servoshell/webdriver.rs
View File

@@ -247,7 +247,8 @@ impl RunningAppState {
}, },
WebDriverCommandMsg::GetViewportSize(webview_id, response_sender) => { WebDriverCommandMsg::GetViewportSize(webview_id, response_sender) => {
let platform_window = self.platform_window_for_webview_id(webview_id); let platform_window = self.platform_window_for_webview_id(webview_id);
let size = platform_window.rendering_context().size2d(); let size = platform_window.rendering_context().size2d().to_f32() /
platform_window.hidpi_scale_factor();
if let Err(error) = response_sender.send(size) { if let Err(error) = response_sender.send(size) {
warn!("Failed to send response of GetViewportSize: {error}"); warn!("Failed to send response of GetViewportSize: {error}");
} }