Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: ec8a41f79f5b4bcbb801f3abb5f2f814db410d61
https://github.com/WebKit/WebKit/commit/ec8a41f79f5b4bcbb801f3abb5f2f814db410d61
Author: Elika Etemad <[email protected]>
Date: 2025-11-07 (Fri, 07 Nov 2025)
Changed paths:
M LayoutTests/TestExpectations
M
LayoutTests/imported/w3c/web-platform-tests/css/css-display/parsing/tentative/display-computed-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-display/parsing/tentative/display-valid-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/alignment/column-justify-items-end-justify-self-start-001.html
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-automatic-minimum-for-auto-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-fit-content-percentage-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-minimum-contribution-with-percentages-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-minimum-size-grid-items-002-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-minimum-size-grid-items-003-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-automatic-minimum-for-auto-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-minimum-contribution-with-percentages-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-minimum-size-grid-items-002-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-minimum-size-grid-items-003-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-008-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-009-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-010-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-011-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-012-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-019-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-020-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-024-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-025-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-015-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-016-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-020-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-021-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-015-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-016-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-020-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-021-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-007-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-008-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-010-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-011-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-017-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-018-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-022-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-023-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/dynamic-grid-track-direction-expected.txt
M LayoutTests/platform/gtk/TestExpectations
A
LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-009-expected.txt
M Source/WebCore/accessibility/AccessibilityNodeObject.cpp
M Source/WebCore/css/CSSPrimitiveValueMappings.h
M Source/WebCore/css/CSSProperties.json
M Source/WebCore/css/CSSValueKeywords.in
M Source/WebCore/css/parser/CSSPropertyParserConsumer+Display.cpp
M Source/WebCore/css/parser/CSSPropertyParserConsumer+Grid.cpp
M Source/WebCore/html/HTMLButtonElement.cpp
M Source/WebCore/layout/integration/grid/LayoutIntegrationGridCoverage.cpp
M Source/WebCore/layout/layouttree/LayoutBox.cpp
M Source/WebCore/layout/layouttree/LayoutBox.h
M Source/WebCore/rendering/RenderElement.cpp
M Source/WebCore/rendering/RenderGrid.cpp
M Source/WebCore/rendering/style/RenderStyleConstants.cpp
M Source/WebCore/rendering/style/RenderStyleConstants.h
M Source/WebCore/rendering/style/RenderStyleInlines.h
M Source/WebCore/style/StyleAdjuster.cpp
M Source/WebCore/style/StyleExtractorCustom.h
M Source/WebCore/style/values/grid/StyleGridTemplateList.cpp
M Source/WebCore/style/values/grid/StyleGridTemplateList.h
Log Message:
-----------
Support 'display: masonry' so we can run WPT tests [css-grid-3]
https://bugs.webkit.org/show_bug.cgi?id=301907
rdar://163985106
Reviewed by Brandon Stewart, Tim Nguyen, and Simon Fraser.
The CSSWG resolved to use 'display' for switching into masonry-style layout,
but hasn't decided on a keyword yet. However all the WPTs are using
'display: masonry', which means we need to support this syntax if we want
to run the WPTs. We will update to the final keyword later.
This patch removes 'masonry' from the 'grid-template' properties,
adds support for 'masonry' and 'inline-masonry' to the 'display' property,
and re-uses the 'grid-auto-flow' property for orientation control.
* LayoutTests/TestExpectations:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-display/parsing/tentative/display-computed-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-display/parsing/tentative/display-valid-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-automatic-minimum-for-auto-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-fit-content-percentage-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-minimum-contribution-with-percentages-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-minimum-size-grid-items-002-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/column-minimum-size-grid-items-003-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-automatic-minimum-for-auto-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-minimum-contribution-with-percentages-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-minimum-size-grid-items-002-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/items/row-minimum-size-grid-items-003-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-008-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-009-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-010-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-011-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-012-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-019-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-020-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-024-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/column-auto-repeat-025-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-015-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-016-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-020-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-021-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-015-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-016-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-020-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-021-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-007-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-008-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-010-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-011-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-017-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-018-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-022-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-023-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/dynamic-grid-track-direction-expected.txt:
*
LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-009-expected.txt:
Added.
Rebaseline tests.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/alignment/column-justify-items-end-justify-self-start-001.html:
* LayoutTests/platform/gtk/TestExpectations:
Linux-specific failures.
* Source/WebCore/accessibility/AccessibilityNodeObject.cpp:
(WebCore::displayTypeNeedsSpace):
* Source/WebCore/css/CSSPrimitiveValueMappings.h:
(WebCore::toCSSValueID):
(WebCore::fromCSSValueID):
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/CSSValueKeywords.in:
* Source/WebCore/css/parser/CSSPropertyParserConsumer+Display.cpp:
(WebCore::CSSPropertyParserHelpers::consumeDisplay):
* Source/WebCore/css/parser/CSSPropertyParserConsumer+Grid.cpp:
(WebCore::CSSPropertyParserHelpers::consumeGridTrackList):
(WebCore::CSSPropertyParserHelpers::consumeGridTemplatesRowsOrColumns):
* Source/WebCore/html/HTMLButtonElement.cpp:
(WebCore::HTMLButtonElement::createElementRenderer):
* Source/WebCore/layout/integration/grid/LayoutIntegrationGridCoverage.cpp:
(WebCore::LayoutIntegration::gridLayoutAvoidanceReason):
* Source/WebCore/layout/layouttree/LayoutBox.cpp:
(WebCore::Layout::Box::isBlockLevelBox const):
(WebCore::Layout::Box::isInlineLevelBox const):
* Source/WebCore/layout/layouttree/LayoutBox.h:
(WebCore::Layout::Box::isGridBox const):
* Source/WebCore/rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
* Source/WebCore/rendering/RenderGrid.cpp:
(WebCore::RenderGrid::isMasonry const):
* Source/WebCore/rendering/style/RenderStyleConstants.cpp:
(WebCore::operator<<):
* Source/WebCore/rendering/style/RenderStyleConstants.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
(WebCore::RenderStyle::isDisplayBlockType):
(WebCore::RenderStyle::isDisplayInlineType):
* Source/WebCore/style/StyleAdjuster.cpp:
(WebCore::Style::equivalentBlockDisplay):
(WebCore::Style::equivalentInlineDisplay):
(WebCore::Style::shouldInheritTextDecorationsInEffect):
* Source/WebCore/style/StyleExtractorCustom.h:
(WebCore::Style::extractGridTemplateValue):
* Source/WebCore/style/values/grid/StyleGridTemplateList.cpp:
(WebCore::Style::CSSValueConversion<GridTemplateList>::operator):
(WebCore::Style::Blending<GridTemplateList>::canBlend):
(WebCore::Style::Blending<GridTemplateList>::blend):
(WebCore::Style::operator<<):
* Source/WebCore/style/values/grid/StyleGridTemplateList.h:
Canonical link: https://commits.webkit.org/302746@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
