Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: f028d47877de5efb726d36856638e43c429625cf
https://github.com/WebKit/WebKit/commit/f028d47877de5efb726d36856638e43c429625cf
Author: Brent Fulgham <[email protected]>
Date: 2025-10-22 (Wed, 22 Oct 2025)
Changed paths:
M LayoutTests/TestExpectations
A
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/margin-expected.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/margin.html
A
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/reference/margin-ref.html
M
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/svg-computed-style-expected.txt
M
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/svg-computed-style.html
M Source/WebCore/Sources.txt
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/dom/Document.cpp
M Source/WebCore/layout/Verification.cpp
M Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp
M Source/WebCore/layout/formattingContexts/FormattingGeometry.h
M Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp
M Source/WebCore/layout/formattingContexts/grid/GridLayout.cpp
M Source/WebCore/layout/formattingContexts/grid/GridLayout.h
M Source/WebCore/layout/integration/LayoutIntegrationBoxGeometryUpdater.cpp
M Source/WebCore/page/PrintContext.cpp
M Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
M Source/WebCore/rendering/PositionedLayoutConstraints.h
M Source/WebCore/rendering/RenderBlock.cpp
M Source/WebCore/rendering/RenderBlockFlow.cpp
M Source/WebCore/rendering/RenderBox.cpp
M Source/WebCore/rendering/RenderBoxInlines.h
M Source/WebCore/rendering/RenderBoxModelObject.cpp
M Source/WebCore/rendering/RenderBoxModelObject.h
M Source/WebCore/rendering/RenderBoxModelObjectInlines.h
M Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
M Source/WebCore/rendering/RenderFlexibleBox.cpp
M Source/WebCore/rendering/RenderInline.cpp
M Source/WebCore/rendering/RenderListMarker.cpp
M Source/WebCore/rendering/RenderReplaced.cpp
M Source/WebCore/rendering/RenderScrollbarPart.cpp
M Source/WebCore/rendering/RenderTable.cpp
M Source/WebCore/rendering/RenderTextInlines.h
M Source/WebCore/style/StyleExtractorCustom.h
A Source/WebCore/style/values/box/StyleMargin.cpp
M Source/WebCore/style/values/box/StyleMargin.h
Log Message:
-----------
[CSS Zoom] Apply zoom factor to margin
https://bugs.webkit.org/show_bug.cgi?id=301024
rdar://162907254
Reviewed by Vitor Roriz.
Adapt margin logic to the new CSS Zoom architecture.
Tests:
imported/w3c/web-platform-tests/css/css-viewport/zoom/list-style-image.html
imported/w3c/web-platform-tests/css/css-viewport/zoom/margin.html
imported/w3c/web-platform-tests/css/css-viewport/zoom/svg-computed-style.html
* LayoutTests/TestExpectations
*
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/margin-expected.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/margin.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/reference/margin-ref.html:
Added.
*
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/svg-computed-style-expected.txt:
*
LayoutTests/imported/w3c/web-platform-tests/css/css-viewport/zoom/svg-computed-style.html:
* Source/WebCore/dom/Document.cpp:
(WebCore::Document::pageSizeAndMarginsInPixels):
* Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp:
(WebCore::Layout::FormattingGeometry::computedHorizontalMargin const):
(WebCore::Layout::FormattingGeometry::computedVerticalMargin const):
* Source/WebCore/layout/formattingContexts/FormattingGeometry.h:
(WebCore::Layout::FormattingGeometry::computedValue const):
(WebCore::Layout::FormattingGeometry::fixedValue const):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp:
* Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp:
(WebCore::Layout::BlockFormattingGeometry::intrinsicWidthConstraints const):
* Source/WebCore/layout/formattingContexts/grid/GridLayout.cpp:
(WebCore::Layout::GridLayout::layout):
(WebCore::Layout::GridLayout::computeInlineMargins):
(WebCore::Layout::GridLayout::computeBlockMargins):
* Source/WebCore/layout/formattingContexts/grid/GridLayout.h:
* Source/WebCore/layout/integration/LayoutIntegrationBoxGeometryUpdater.cpp:
(WebCore::LayoutIntegration::usedValueOrZero):
(WebCore::LayoutIntegration::BoxGeometryUpdater::horizontalLogicalMargin):
(WebCore::LayoutIntegration::BoxGeometryUpdater::verticalLogicalMargin):
* Source/WebCore/layout/Verification.cpp:
(WebCore::Layout::outputMismatchingBlockBoxInformationIfNeeded):
* Source/WebCore/page/PrintContext.cpp:
(WebCore::PrintContext::computedPageMargin):
(WebCore::PrintContext::pageProperty):
* Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp:
(WebCore::GridTrackSizingAlgorithm::setup):
* Source/WebCore/rendering/PositionedLayoutConstraints.h:
(WebCore::PositionedLayoutConstraints::marginBeforeValue const):
(WebCore::PositionedLayoutConstraints::marginAfterValue const):
* Source/WebCore/rendering/RenderBlock.cpp:
(WebCore::RenderBlock::marginIntrinsicLogicalWidthForChild const):
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths const):
(WebCore::RenderBlock::computePreferredWidthsForExcludedChildren const):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::getBorderPaddingMargin):
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalWidth const):
(WebCore::RenderBox::fillAvailableMeasure const):
(WebCore::RenderBox::computeInlineDirectionMargins const):
(WebCore::RenderBox::constrainBlockMarginInAvailableSpaceOrTrim const):
* Source/WebCore/rendering/RenderBoxInlines.h:
(WebCore::RenderBox::marginBoxRect const):
* Source/WebCore/rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::computeStickyPositionConstraints const):
* Source/WebCore/rendering/RenderBoxModelObject.h:
* Source/WebCore/rendering/RenderBoxModelObjectInlines.h:
(WebCore::RenderBoxModelObject::resolveLengthPercentageUsingContainerLogicalWidth
const):
* Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::marginWidthForChild):
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::computeFlexItemMarginValue):
* Source/WebCore/rendering/RenderInline.cpp:
(WebCore::computeMargin):
(WebCore::RenderInline::marginLeft const):
(WebCore::RenderInline::marginRight const):
(WebCore::RenderInline::marginTop const):
(WebCore::RenderInline::marginBottom const):
(WebCore::RenderInline::marginStart const):
(WebCore::RenderInline::marginEnd const):
(WebCore::RenderInline::marginBefore const):
(WebCore::RenderInline::marginAfter const):
* Source/WebCore/rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::layout):
* Source/WebCore/rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::paint):
* Source/WebCore/rendering/RenderScrollbarPart.cpp:
(WebCore::RenderScrollbarPart::computeScrollbarWidth):
(WebCore::RenderScrollbarPart::computeScrollbarHeight):
* Source/WebCore/rendering/RenderTable.cpp:
(WebCore::RenderTable::updateLogicalWidth):
* Source/WebCore/rendering/RenderTextInlines.h:
(WebCore::RenderText::marginLeft const):
(WebCore::RenderText::marginRight const):
* Source/WebCore/style/StyleExtractorCustom.h:
(WebCore::Style::ExtractorCustom::extractMarginRight):
(WebCore::Style::ExtractorCustom::extractMarginRightSerialization):
* Source/WebCore/style/values/box/StyleMargin.cpp: Added.
* Source/WebCore/style/values/box/StyleMargin.h:
Canonical link: https://commits.webkit.org/301965@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
