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

servoshell: Fix screen_geometry for headed_window (#37934)

Browse source 
This function is used to compute `screenLeft`, `screenTop`, `screenY`,
`screenX`. Previously, it wrongly computes viewport position instead of
window position, which didn't match
f7c86c4393/components/shared/embedder/lib.rs (L717-L720)

Testing: More webdriver test would pass once #37893 is merged.
Fixes: the position part of #37824.

---------

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-07-09 02:51:14 +08:00 • committed by GitHub
parent 68ec88465e
commit ec6ac0fced
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,14 +438,13 @@ impl WindowPortsMethods for Window {
// Offset the WebView origin by the toolbar so that it reflects the actual viewport and // Offset the WebView origin by the toolbar so that it reflects the actual viewport and
// not the window origin. // not the window origin.
let window_origin = self.winit_window.inner_position().unwrap_or_default(); let window_origin = self.winit_window.outer_position().unwrap_or_default();
let window_origin = winit_position_to_euclid_point(window_origin).to_f32(); let offset = winit_position_to_euclid_point(window_origin);
let offset = window_origin + toolbar_size;
ScreenGeometry { ScreenGeometry {
size: screen_size.to_i32(), size: screen_size.to_i32(),
available_size: available_screen_size.to_i32(), available_size: available_screen_size.to_i32(),
offset: offset.to_i32(), offset,
} }
} }

18
tests/wpt/meta/webdriver/tests/classic/set_window_rect/set.py.ini vendored
View file

@ -26,18 +26,6 @@
[test_negative_x_y] [test_negative_x_y]
expected: FAIL expected: FAIL
[test_set_to_screen_size]
expected: FAIL
[test_width_height_floats]
expected: FAIL
[test_height_as_current]
expected: FAIL
[test_width_as_current]
expected: FAIL
[test_no_change[rect12\]] [test_no_change[rect12\]]
expected: FAIL expected: FAIL
@ -55,9 +43,3 @@
[test_no_change[rect19\]] [test_no_change[rect19\]]
expected: FAIL expected: FAIL
[test_set_larger_than_screen_size]
expected: FAIL
[test_height_width_as_current]
expected: FAIL

4
tests/wpt/meta/webdriver/tests/classic/switch_to_window/switch.py.ini vendored
View file

@ -1,8 +1,4 @@
[switch.py] [switch.py]
expected: TIMEOUT
[test_no_top_browsing_context]
expected: FAIL
[test_finds_exising_user_prompt_after_tab_switch[alert\]] [test_finds_exising_user_prompt_after_tab_switch[alert\]]
expected: FAIL expected: FAIL