Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: c2a7cd6845a87503de3b9a3064d8905d1001f415
https://github.com/WebKit/WebKit/commit/c2a7cd6845a87503de3b9a3064d8905d1001f415
Author: AndrewJMart <[email protected]>
Date: 2026-08-31 (Mon, 31 Aug 2026)
Changed paths:
A LayoutTests/fast/css/size-shorthand-serialization-expected.txt
A LayoutTests/fast/css/size-shorthand-serialization.html
M
LayoutTests/imported/w3c/web-platform-tests/css/css-nesting/nested-declarations-cssom.html
M
LayoutTests/imported/w3c/web-platform-tests/css/css-page/parsing/size-invalid-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-page/parsing/size-invalid.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-invalid-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-invalid.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-shorthand-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-shorthand.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-valid-expected.txt
A
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-valid.html
M
LayoutTests/imported/w3c/web-platform-tests/css/cssom/page-descriptors-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/cssom/page-descriptors.html
M Source/WebCore/css/CSSPageDescriptors.cpp
M Source/WebCore/css/CSSProperties.json
M Source/WebCore/css/PropertySetCSSDescriptors.cpp
M Source/WebCore/css/PropertySetCSSDescriptors.h
M Source/WebCore/css/ShorthandSerializer.cpp
M Source/WebCore/css/StyleProperties.cpp
M Source/WebCore/css/parser/CSSPropertyParser.cpp
M Source/WebCore/style/StyleBuilder.cpp
M Source/WebCore/style/StyleExtractor.cpp
Log Message:
-----------
[css-sizing] Add a `size` shorthand for `width`/`height`
rdar://146887800
https://bugs.webkit.org/show_bug.cgi?id=289633
Reviewed by Darin Adler.
Added a size shorthand to CSSProperties.json with Width and Height shorthands.
width and height do not collapse into size. This preserves compatibility with
older versions of webkit.
The @page size descriptor was renamed INTERNALLY to page-size (still serialized
as size). This was done to avoid colliding with the new size property.
Tests are imported from web-platform-tests and are being upstreamed in
https://github.com/web-platform-tests/wpt/pull/61613.
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/ShorthandSerializer.cpp:
(WebCore::ShorthandSerializer::serialize):
* Source/WebCore/css/parser/CSSPropertyParser.cpp:
(WebCore::consumePageDescriptor):
* Source/WebCore/css/CSSPageDescriptors.cpp:
(WebCore::CSSPageDescriptors::size const):
(WebCore::CSSPageDescriptors::setSize):
* Source/WebCore/css/StyleProperties.cpp:
(WebCore::StyleProperties::PropertyReference::cssName const):
(WebCore::StyleProperties::asTextInternal const):
(WebCore::canUseShorthandForLonghand):
* Source/WebCore/style/StyleBuilder.cpp:
(WebCore::Style::Builder::applyProperty):
*
LayoutTests/imported/w3c/web-platform-tests/css/css-nesting/nested-declarations-cssom.html:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-page/parsing/size-invalid-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-page/parsing/size-invalid.html:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-invalid-expected.txt:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-invalid.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-shorthand-expected.txt:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-shorthand.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-valid-expected.txt:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/parsing/size-valid.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/cssom/page-descriptors-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/cssom/page-descriptors.html:
* Source/WebCore/css/PropertySetCSSDescriptors.cpp:
(WebCore::PropertySetCSSDescriptors::resolvePropertyName const):
(WebCore::PropertySetCSSDescriptors::getPropertyCSSValue):
(WebCore::PropertySetCSSDescriptors::getPropertyValue):
(WebCore::PropertySetCSSDescriptors::getPropertyPriority):
(WebCore::PropertySetCSSDescriptors::getPropertyShorthand):
(WebCore::PropertySetCSSDescriptors::isPropertyImplicit):
(WebCore::PropertySetCSSDescriptors::setProperty):
(WebCore::PropertySetCSSDescriptors::removeProperty):
* Source/WebCore/css/PropertySetCSSDescriptors.h:
* Source/WebCore/style/StyleExtractor.cpp:
(WebCore::Style::isLayoutDependent):
* LayoutTests/fast/css/size-shorthand-serialization-expected.txt: Added.
* LayoutTests/fast/css/size-shorthand-serialization.html: Added.
Canonical link: https://commits.webkit.org/320162@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
