Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 855df4cd3b72f66c3cf2110b9f12817d7e289de6
https://github.com/WebKit/WebKit/commit/855df4cd3b72f66c3cf2110b9f12817d7e289de6
Author: Alan Baradlay <[email protected]>
Date: 2026-09-24 (Thu, 24 Sep 2026)
Changed paths:
M Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp
M Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h
M Source/WebCore/layout/integration/flex/FlexIntegrationUtils.cpp
M Source/WebCore/layout/integration/flex/FlexIntegrationUtils.h
Log Message:
-----------
[cleanup] ScopedFlexBasisAsFlexItemMainSize should not decide whether the
flex basis replaces the main size
https://bugs.webkit.org/show_bug.cgi?id=325049
<rdar://problem/188222719>
Reviewed by Simon Fraser.
ScopedFlexBasisAsFlexItemMainSize returned early from its constructor when the
flex basis was auto,
so creating the scope did not always mean the flex basis replaced the main size.
The auto check now lives in flexBaseSizeForFlexItem, which only creates the
scope when the flex basis is not auto.
No change in behavior.
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:
(WebCore::FlexFormattingContext::flexBaseSizeForFlexItem):
(WebCore::FlexFormattingContext::computeFlexBaseSize):
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h:
* Source/WebCore/layout/integration/flex/FlexIntegrationUtils.cpp:
(WebCore::LayoutIntegration::ScopedFlexBasisAsFlexItemMainSize::ScopedFlexBasisAsFlexItemMainSize):
(WebCore::LayoutIntegration::ScopedFlexBasisAsFlexItemMainSize::~ScopedFlexBasisAsFlexItemMainSize):
Always installs and clears the flex basis it is given.
* Source/WebCore/layout/integration/flex/FlexIntegrationUtils.h:
Canonical link: https://commits.webkit.org/321790@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
