layout: Cleanup for replaced elements with widgets #40769

Loirooriol · 2025-11-20T19:58:17Z

This cleans up the changes done in #40578.

In particular, it removes the unnecessary Contents::ReplacedWithWidget since we can handle that with Contents::Replaced. It also removes IndependentFormattingContextContents::ReplacedWithWidget in favor of IndependentFormattingContextContents::Replaced, by adding an optional parameter for the widget.

That ensures that the behavior of replaced elements won't accidentally diverge dependign on whether they have a widget. For example, #40578 forgot to handle ReplacedWithWidget in tentative_block_content_size().

Additionally, this removes the hardcoded especial behavior for <video> that was added in ServoThreadSafeLayoutElement::with_pseudo().

Testing: Adding a reftest
Fixes: #40708
Fixes: #40770

This cleans up the changes done in servo#40578. In particular, it removes the unnecessary `Contents::ReplacedWithWidget` since we can handle that with `Contents::Replaced`. It also removes `IndependentFormattingContextContents::ReplacedWithWidget` in favor of `IndependentFormattingContextContents::Replaced`, by adding an optional parameter for the widget. That ensures that the behavior of replaced elements won't accidentally diverge dependign on whether they have a widget. For example, servo#40578 forgot to handle `ReplacedWithWidget` in `tentative_block_content_size()`. Additionally, this removes the hardcoded especial behavior for `<video>` that was added in `ServoThreadSafeLayoutElement::with_pseudo()`. Signed-off-by: Oriol Brufau <obrufau@igalia.com>

github-actions · 2025-11-20T19:58:33Z

🔨 Triggering try run (#19549643033) for Linux (WPT)

mrobinson

Great cleanup! Thank you.

components/layout/formatting_contexts.rs

github-actions · 2025-11-20T20:27:06Z

Test results for linux-wpt from try job (#19549643033):

Flaky unexpected result (52)

TIMEOUT /FileAPI/url/url-in-tags-revoke.window.html (#19978)
- TIMEOUT [expected PASS] subtest: Fetching a blob URL immediately before revoking it works in <script> tags.
```
Test timed out
```
OK /IndexedDB/idbfactory_open.any.html
- FAIL [expected PASS] subtest: Calling open() with version argument 1.5 should not throw.
```
assert_equals: version expected 1 but got 9007199254740991
```
ERROR [expected OK] /_mozilla/mozilla/img_find_non_sibling_map.html
CRASH [expected PASS] /_mozilla/shadow-dom/move-element-with-ua-shadow-tree-crash.html (#39473)
OK /_mozilla/webxr/create_session.https.html
- FAIL [expected PASS] subtest: create_session
```
can't access property "simulateDeviceConnection", navigator.xr.test is undefined
```

OK /_mozilla/webxr/obtain_frame.https.html

FAIL [expected PASS] subtest: obtain_frame

promise_test: Unhandled rejection with value: object "TypeError: can't access property "simulateDeviceConnection", navigator.xr.test is undefined"

ERROR [expected TIMEOUT] /_mozilla/webxr/sessionavailable.https.html
CRASH [expected OK] /_webgl/conformance/extensions/oes-texture-float-with-image.html
CRASH [expected OK] /_webgl/conformance/ogles/GL/functions/functions_073_to_080.html
CRASH [expected OK] /_webgl/conformance/ogles/GL/functions/functions_105_to_112.html
CRASH [expected OK] /_webgl/conformance/ogles/GL/swizzlers/swizzlers_001_to_008.html
CRASH [expected OK] /_webgl/conformance/ogles/GL/swizzlers/swizzlers_081_to_088.html
CRASH [expected OK] /_webgl/conformance/ogles/GL/swizzlers/swizzlers_113_to_120.html (#23110)
CRASH [expected OK] /_webgl/conformance/textures/image/tex-2d-rgb-rgb-unsigned_byte.html
CRASH [expected OK] /_webgl/conformance/textures/image_bitmap_from_canvas/tex-2d-rgba-rgba-unsigned_byte.html
CRASH [expected OK] /_webgl/conformance/textures/misc/png-image-types.html
CRASH [expected OK] /_webgl/conformance2/extensions/ext-texture-filter-anisotropic.html
CRASH [expected ERROR] /_webgl/conformance2/textures/image/tex-3d-rgb32f-rgb-float.html
OK /content-security-policy/frame-ancestors/frame-ancestors-path-ignored.window.html (#36468)
- FAIL [expected PASS] subtest: A 'frame-ancestors' CSP directive with a URL that includes a path should be ignored.
```
assert_unreached: The IFrame should have been blocked (or cross-origin). It wasn't. Reached unreachable code
```
OK /cookiestore/cookieStore_getAll_set_creation_url.https.any.html (#40695)
- FAIL [expected PASS] subtest: cookieStore.set and cookieStore.getAll use the creation url
```
assert_equals: expected 1 but got 2
```
CRASH [expected OK] /credential-management/idlharness.https.window.html
FAIL [expected PASS] /css/css-backgrounds/background-size-042.html
OK /css/css-cascade/layer-cssom-order-reverse.html (#36094)
- PASS [expected FAIL] subtest: Delete layer invalidates @font-face
OK /css/css-cascade/layer-font-face-override.html (#35935)
- PASS [expected FAIL] subtest: @font-face override update with appended sheet 1
- PASS [expected FAIL] subtest: @font-face override update with appended sheet 2
OK /custom-elements/form-associated/ElementInternals-setFormValue.html (#29174)
- PASS [expected FAIL] subtest: Single value - empty name exists
- PASS [expected FAIL] subtest: Single value - Non-empty name exists
OK /fetch/content-length/api-and-duplicate-headers.any.worker.html (#35197)
- FAIL [expected PASS] subtest: fetch() and duplicate Content-Length/Content-Type headers
```
promise_test: Unhandled rejection with value: object "TypeError: Network error occurred"
```
OK [expected CRASH] /fetch/metadata/generated/element-iframe.https.sub.html (#40341)
OK /html/browsers/browsing-the-web/navigating-across-documents/005.html (#27062)
- FAIL [expected PASS] subtest: Link with onclick navigation and href navigation
```
assert_equals: expected "href" but got "click"
```
OK /html/browsers/browsing-the-web/navigating-across-documents/008.html (#24456)
- PASS [expected FAIL] subtest: Link with onclick form submit to javascript url and href navigation
OK /html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html (#34819)
- PASS [expected FAIL] subtest: link click
TIMEOUT [expected OK] /html/interaction/focus/the-autofocus-attribute/update-the-rendering.html (#24145)
- TIMEOUT [expected FAIL] subtest: "Flush autofocus candidates" should be happen before a scroll event and animation frame callbacks
```
Test timed out
```
OK /html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html (#39694)
- PASS [expected FAIL] subtest: Meta refresh is blocked by the allow-scripts sandbox flag at its creation time, not when refresh comes due
OK /html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html (#39703)
- FAIL [expected PASS] subtest: Meta refresh of the original iframe is not blocked if moved into a sandboxed iframe
```
uncaught exception: Error: assert_unreached: The iframe into which the meta was moved must not refresh Reached unreachable code
```
OK /html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html (#36489)
- PASS [expected FAIL] subtest: Verifies that form submissions scheduled inside javascript: urls take precedence over the javascript: url's return value.
OK /html/semantics/forms/form-submission-0/multipart-formdata.window.html (#28725)
- FAIL [expected PASS] subtest: multipart/form-data: Basic test (formdata event)
```
assert_equals: expected "\r\nContent-Disposition: form-data; name=\"basic\"\r\n\r\ntest\r\n--\r\n" but got ""
```
OK /html/semantics/forms/form-submission-0/text-plain.window.html (#28687)
- FAIL [expected PASS] subtest: text/plain: Basic File test (normal form)
```
assert_equals: expected "basic=file-test.txt\r\n" but got ""
```
- PASS [expected FAIL] subtest: text/plain: 0x00 in name (normal form)
- PASS [expected FAIL] subtest: text/plain: 0x00 in value (normal form)
- PASS [expected FAIL] subtest: text/plain: \r\n in name (normal form)
- PASS [expected FAIL] subtest: text/plain: \r\n in value (formdata event)
- PASS [expected FAIL] subtest: text/plain: double quote in value (formdata event)
OK /html/semantics/forms/form-submission-0/urlencoded2.window.html (#28687)
- FAIL [expected PASS] subtest: application/x-www-form-urlencoded: Basic test (formdata event)
```
assert_equals: expected "basic=test" but got ""
```
- PASS [expected FAIL] subtest: application/x-www-form-urlencoded: \r\n in name (formdata event)
OK [expected CRASH] /html/semantics/forms/the-fieldset-element/disabled-003.html (#31730, #39631)

OK /html/semantics/scripting-1/the-script-element/execution-timing/077.html (#22139)

FAIL [expected PASS] subtest: adding several types of scripts through the DOM and removing some of them confuses scheduler

assert_array_equals: expected property 1 to be "Script #1 ran" but got "Script #3 ran" (expected array ["Script #2 ran", "Script #1 ran", "Script #3 ran", "Script #4 ran"] got ["Script #2 ran", "Script #3 ran", "Script #4 ran", "Script #1 ran"])

OK /navigation-timing/test-navigation-type-reload.html (#33334)
- PASS [expected FAIL] subtest: Reload domContentLoadedEventEnd > Original domContentLoadedEventEnd
- PASS [expected FAIL] subtest: Reload domContentLoadedEventStart > Original domContentLoadedEventStart
- PASS [expected FAIL] subtest: Reload fetchStart > Original fetchStart
CRASH [expected OK] /pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html (#40418)
OK /preload/link-header-preload-delay-onload.html (#39622)
- FAIL [expected PASS] subtest: Makes sure that Link headers preload resources and block window.onload after resource discovery
```
assert_true: expected true got false
```
OK /service-workers/service-worker/fetch-event.https.html (#36234)
- PASS [expected FAIL] subtest: Service Worker falls back to network in fetch event with POST form
CRASH [expected OK] /trusted-types/eval-function-constructor.html
CRASH [expected OK] /trusted-types/set-event-handlers-content-attributes.tentative.html
TIMEOUT [expected OK] /trusted-types/trusted-types-navigation.html?01-05 (#38975)
- TIMEOUT [expected PASS] subtest: Navigate a window via anchor with javascript:-urls in report-only mode.
```
Test timed out
```
- NOTRUN [expected PASS] subtest: Navigate a window via anchor with javascript:-urls w/ default policy in report-only mode.
- NOTRUN [expected PASS] subtest: Navigate a frame via anchor with javascript:-urls in enforcing mode.
OK [expected TIMEOUT] /trusted-types/trusted-types-navigation.html?06-10 (#37920)
- PASS [expected TIMEOUT] subtest: Navigate a frame via anchor with javascript:-urls w/ default policy in report-only mode.
- FAIL [expected NOTRUN] subtest: Navigate a window via anchor with javascript:-urls w/ a default policy throwing an exception in enforcing mode.
```
promise_test: Unhandled rejection with value: "Unexpected message received: \"No securitypolicyviolation reported!\""
```
- FAIL [expected NOTRUN] subtest: Navigate a window via anchor with javascript:-urls w/ a default policy throwing an exception in report-only mode.
```
promise_test: Unhandled rejection with value: "Unexpected message received: \"No securitypolicyviolation reported!\""
```
CRASH [expected OK] /wasm/webapi/esm-integration/wasm-to-wasm-link-error.tentative.html
OK /webdriver/tests/classic/dismiss_alert/dismiss.py (#39098)
- FAIL [expected PASS] subtest: test_dismiss_in_popup_window
```
AssertionError: no such alert (404): No user prompt is currently active.
```
OK [expected ERROR] /webxr/render_state_update.https.html (#27535)
ERROR [expected OK] /workers/baseurl/alpha/import-in-moduleworker.html (#21315)
ERROR [expected OK] /workers/baseurl/alpha/sharedworker-in-worker.html (#21315)

Stable unexpected results that are known to be intermittent (25)

OK /IndexedDB/idbobjectstore_getAll.any.html (#39276)
- PASS [expected FAIL] subtest: Get all values with transaction.commit()
OK /IndexedDB/idbobjectstore_getAll.any.worker.html (#39400)
- PASS [expected FAIL] subtest: Get all values with transaction.commit()
FAIL [expected PASS] /_mozilla/mozilla/sslfail.html (#10760)
TIMEOUT [expected OK] /_mozilla/mozilla/window_resize_event.html (#36741)
- TIMEOUT [expected PASS] subtest: Popup onresize event fires after resizeTo
```
Test timed out
```
OK /css/css-fonts/generic-family-keywords-001.html (#37467)
- FAIL [expected PASS] subtest: @font-face matching for quoted and unquoted generic(khmer-mul)
```
assert_equals: quoted generic(khmer-mul) matches  @font-face rule expected 50 but got 30
```
OK /fetch/metadata/generated/css-font-face.sub.tentative.html (#34624)
- PASS [expected FAIL] subtest: sec-fetch-storage-access - Not sent to non-trustworthy same-site destination
- FAIL [expected PASS] subtest: sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination
```
promise_test: Unhandled rejection with value: object "Error: Failed to query for recorded headers."
```
OK /fetch/metadata/generated/element-img-environment-change.https.sub.html (#30111)
- FAIL [expected PASS] subtest: sec-fetch-site - Cross-Site -> Same-Site, no attributes
```
promise_test: Unhandled rejection with value: object "Error: Failed to query for recorded headers."
```
- PASS [expected FAIL] subtest: sec-fetch-site - Cross-Site -> Cross-Site, no attributes
- FAIL [expected PASS] subtest: sec-fetch-site - Same-Origin -> Same Origin, no attributes
```
promise_test: Unhandled rejection with value: object "Error: Failed to query for recorded headers."
```
- PASS [expected FAIL] subtest: sec-fetch-mode - no attributes
- FAIL [expected PASS] subtest: sec-fetch-mode - attributes: crossorigin
```
promise_test: Unhandled rejection with value: object "Error: Failed to query for recorded headers."
```
- PASS [expected FAIL] subtest: sec-fetch-mode - attributes: crossorigin=anonymous
- FAIL [expected PASS] subtest: sec-fetch-mode - attributes: crossorigin=use-credentials
```
promise_test: Unhandled rejection with value: object "Error: Failed to query for recorded headers."
```
- PASS [expected FAIL] subtest: sec-fetch-dest - no attributes
OK /fetch/metadata/generated/element-img-environment-change.sub.html (#30111)
- PASS [expected FAIL] subtest: sec-fetch-site - Not sent to non-trustworthy cross-site destination, no attributes
- PASS [expected FAIL] subtest: sec-fetch-mode - Not sent to non-trustworthy same-origin destination, no attributes
- PASS [expected FAIL] subtest: sec-fetch-dest - Not sent to non-trustworthy cross-site destination, no attributes
- PASS [expected FAIL] subtest: sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes
- FAIL [expected PASS] subtest: sec-fetch-site - HTTPS downgrade-upgrade, no attributes
```
promise_test: Unhandled rejection with value: object "Error: Failed to query for recorded headers."
```
TIMEOUT [expected CRASH] /fetch/metadata/window-open.https.sub.html (#40339)
OK [expected ERROR] /focus/focus-event-after-switching-iframes.sub.html (#40368)
OK /html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.html (#29056)
- FAIL [expected PASS] subtest: Cross-origin navigation started from unload handler must be ignored
```
promise_test: Unhandled rejection with value: object "SecurityError: The operation is insecure."
```
OK /html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html (#28697)
- PASS [expected FAIL] subtest: aElement.click() before the load event must NOT replace
OK /html/browsers/history/the-history-interface/traverse_the_history_5.html (#21383)
- PASS [expected FAIL] subtest: Multiple history traversals, last would be aborted
ERROR [expected OK] /html/infrastructure/common-dom-interfaces/collections/domstringlist.html (#40665)
OK [expected TIMEOUT] /html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html (#29087)
- FAIL [expected TIMEOUT] subtest: <dialog>-contained autofocus element gets focused when the dialog is shown
```
assert_equals: expected "DIV" but got "BODY"
```
TIMEOUT [expected OK] /html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html (#28259)
- TIMEOUT [expected FAIL] subtest: Autofocus elements in top-level browsing context's documents with empty fragments should work.
```
Test timed out
```
OK [expected ERROR] /html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html (#25046)
OK /html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url.any.worker.html (#33909)
- FAIL [expected PASS] subtest: Revoking a blob URL immediately after calling import will not fail
```
promise_test: Unhandled rejection with value: object "TypeError: Dynamic import failed"
```

OK /html/webappapis/user-prompts/print-during-unload.html (#35944)

FAIL [expected PASS] subtest: print() during unload

assert_array_equals: expected property 1 to be "destination" but got "error: window.print is not a function" (expected array ["start", "destination"] got ["start", "error: window.print is not a function"])

OK /preload/prefetch-document.html (#37210)
- FAIL [expected PASS] subtest: different-site document prefetch with 'as=document' should not be consumed
```
assert_equals: expected 2 but got 1
```
OK /preload/preload-error.sub.html (#37177)
- PASS [expected FAIL] subtest: 404 (fetch): main
OK /reporting/same-origin-same-site-credentials.https.sub.html (#40479)
- FAIL [expected PASS] subtest: Reporting endpoints received credentials.
```
assert_equals: No additional cookies were received expected 4 but got 5
```
ERROR [expected OK] /resource-timing/cors-preflight.any.html (#28694)
OK /trusted-types/trusted-types-navigation.html?26-30 (#38807)
- PASS [expected FAIL] subtest: Navigate a window via form-submission with javascript:-urls in report-only mode.
- PASS [expected FAIL] subtest: Navigate a frame via form-submission with javascript:-urls in enforcing mode.
OK [expected TIMEOUT] /webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.html (#29053)
- PASS [expected TIMEOUT] subtest: StorageKey: test 3P about:blank window opened from a 3P iframe

github-actions · 2025-11-20T20:27:16Z

✨ Try run (#19549643033) succeeded.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

servo-wpt-sync · 2025-11-20T20:50:31Z

🤖 Opened new upstream WPT pull request (web-platform-tests/wpt#56153) with upstreamable changes.

servo-wpt-sync · 2025-11-20T20:51:18Z

✍ Updated existing upstream WPT pull request (web-platform-tests/wpt#56153) title and body.

Loirooriol added A-content/script Related to the script thread A-layout/2020 https://github.com/servo/servo/wiki/Layout-2020 T-linux-wpt Do a try run of the WPT labels Nov 20, 2025

github-actions bot removed the T-linux-wpt Do a try run of the WPT label Nov 20, 2025

Loirooriol mentioned this pull request Nov 20, 2025

Check for more replaced element types in ServoThreadSafeLayoutElement::with_pseudo #40708

Closed

mrobinson approved these changes Nov 20, 2025

View reviewed changes

components/layout/formatting_contexts.rs Outdated Show resolved Hide resolved

Add test and nit

fc56342

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

Loirooriol marked this pull request as ready for review November 20, 2025 20:48

Loirooriol requested a review from gterzian as a code owner November 20, 2025 20:48

servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Nov 20, 2025

Loirooriol enabled auto-merge November 20, 2025 20:49

servo-wpt-sync mentioned this pull request Nov 20, 2025

layout: Cleanup for replaced elements with widgets web-platform-tests/wpt#56153

Merged

Loirooriol added this pull request to the merge queue Nov 20, 2025

servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 20, 2025

Loirooriol mentioned this pull request Nov 20, 2025

layout: Check replaced element types in ServoThreadSafeLayoutElement::with_pseudo #40723

Closed

Merged via the queue into servo:main with commit 8b5333b Nov 20, 2025
36 checks passed

Loirooriol deleted the video_widget-fixups branch November 20, 2025 21:44

servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 20, 2025

rayguo17 mentioned this pull request Dec 19, 2025

Media Element with control widget size fix. #40694

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

layout: Cleanup for replaced elements with widgets #40769

layout: Cleanup for replaced elements with widgets #40769

Uh oh!

Loirooriol commented Nov 20, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Nov 20, 2025

Uh oh!

mrobinson left a comment

Uh oh!

Uh oh!

github-actions bot commented Nov 20, 2025

Uh oh!

github-actions bot commented Nov 20, 2025

Uh oh!

servo-wpt-sync commented Nov 20, 2025

Uh oh!

servo-wpt-sync commented Nov 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

layout: Cleanup for replaced elements with widgets #40769

layout: Cleanup for replaced elements with widgets #40769

Uh oh!

Conversation

Loirooriol commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Nov 20, 2025

Uh oh!

mrobinson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Nov 20, 2025

Uh oh!

github-actions bot commented Nov 20, 2025

Uh oh!

servo-wpt-sync commented Nov 20, 2025

Uh oh!

servo-wpt-sync commented Nov 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Loirooriol commented Nov 20, 2025 •

edited

Loading