Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: aa065033bd3172ec763b8f31cd9b677af24b21fa
https://github.com/WebKit/WebKit/commit/aa065033bd3172ec763b8f31cd9b677af24b21fa
Author: Alan Baradlay <[email protected]>
Date: 2026-09-03 (Thu, 03 Sep 2026)
Changed paths:
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-shape-margin-with-margin-ref.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-with-block-start-margin-ref.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-with-margin-ref.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-with-margin-right-float-ref.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-with-margin-ref.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-with-margin-ref.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-shape-margin-with-margin-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-shape-margin-with-margin.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-block-start-margin-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-block-start-margin.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-right-float-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-right-float.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-with-margin-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-with-margin.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-with-margin-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-with-margin.html
M
Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
Log Message:
-----------
`shape-outside` renders incorrectly when the float has margins
https://bugs.webkit.org/show_bug.cgi?id=323064
rdar://186327525
Reviewed by Antti Koivisto.
IFC integration codepath builds that geometry out of
FloatingObject::frameRect(), which is the margin box.
However shape's coordinates are relative to the float's border box.
Any margin on the float is dropped from the shape's position: the line is
constrained as if the
shape sat at the float's margin box origin.
Tests:
imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin.html
imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-with-margin.html
imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-with-margin.html
imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-shape-margin-with-margin.html
imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-right-float.html
imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-block-start-margin.html
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-shape-margin-with-margin-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-with-block-start-margin-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-with-margin-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-with-margin-right-float-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-with-margin-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-with-margin-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-shape-margin-with-margin-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-shape-margin-with-margin.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-block-start-margin-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-block-start-margin.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-right-float-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin-right-float.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-with-margin.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-with-margin-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-with-margin.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-with-margin-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-with-margin.html:
Added.
*
Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp:
(WebCore::LayoutIntegration::populateIFCWithNewlyPlacedFloats):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::preparePlacedFloats):
Canonical link: https://commits.webkit.org/320417@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
