Implement align-content on block containers #21522

fantasai · 2023-12-08T19:38:55Z

`4c9ed16`

Implement align-content on block containers
https://bugs.webkit.org/show_bug.cgi?id=266085
rdar://114740670

Reviewed by Alan Baradlay.

Implements 'align-content' on block containers by shifting the contents
of RenderBlockFlow if there is extra space after sizing. See
  https://www.w3.org/TR/css-align/#distribution-block

Alignment is not supported if the box is fragmented.

To support this, adds methods for shifting content in the block axis to:
- FloatingObjects
- legacy RenderLineBoxList
- modern LineLayout

Also implements the requirement that non-normal 'align-content' values
establish a new formatting context.

* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-001-expected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-001-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-001.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-002.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-003.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-004.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-005.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-006.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-007.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-008.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-009.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-010.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-011.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010-expected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020-aligned-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020-expected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020-unaligned-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-010-expected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-010-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-010.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-020-expected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-020-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-020.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-overflow-000-expected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-overflow-000-ref.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-overflow-000.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-simple-height-change.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-table-cell.html: Added.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::shiftLinesBy): Implement shifting line boxes and their contents.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h: Add API to shift line boxes and their contents.
* Source/WebCore/rendering/FloatingObjects.cpp:
(WebCore::FloatingObjects::shiftFloatsBy): Implement shifting floats while avoiding side-effects.
* Source/WebCore/rendering/FloatingObjects.h: Add APIs for shifting all floats by a fixed amount.
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutBlock): Shift for align-content, trigger abspos reflow if shifted.
(WebCore::RenderBlockFlow::shiftForAlignContent): Implement method to shift content per align-content.
* Source/WebCore/rendering/RenderBlockFlow.h: Add shiftForAlignContent()
* Source/WebCore/rendering/RenderElement.cpp:
(WebCore::RenderElement::createsNewFormattingContext const): Establish new formatting context.
* Source/WebCore/rendering/RenderLineBoxList.cpp:
(WebCore::RenderLineBoxList::shiftLinesBy): Implement method to shift lines by delta.
* Source/WebCore/rendering/RenderLineBoxList.h: Add API to shift lines by delta.
* Source/WebCore/rendering/style/StyleContentAlignmentData.cpp:
(WebCore::StyleContentAlignmentData::isStartward const): Add convenience method for 'start'-equivalent values.
(WebCore::StyleContentAlignmentData::isEndward const): Add convenience method for 'end'-equivalent values.
(WebCore::StyleContentAlignmentData::isCentered const): Add convenience method for 'center'-equivalent values.
* Source/WebCore/rendering/style/StyleContentAlignmentData.h:
(WebCore::StyleContentAlignmentData::isNormal const): Add convenience method to correctly check for 'normal'.

Canonical link: https://commits.webkit.org/271818@main

a6c133a

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	~~🧪 mac-wk2~~	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	✅ 🛠 watch		✅ 🧪 jsc-armv7-tests
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-12-08T19:46:43Z

EWS run on previous version of this PR (hash f2375d1)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	⏳ 🛠 mac	⏳ 🛠 wpe	⏳ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	⏳ 🧪 ios-wk2	⏳ 🧪 api-mac	⏳ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	⏳ 🧪 mac-wk1	⏳ 🛠 gtk
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	⏳ 🧪 mac-wk2	⏳ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	⏳ 🧪 api-gtk
	⏳ 🛠 tv-sim	⏳ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	⏳ 🛠 watch		✅ 🧪 jsc-armv7-tests
	⏳ 🛠 watch-sim

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

nt1m · 2023-12-08T19:57:36Z

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

+    for (auto& object : m_boxTree.renderers()) {
+        Layout::Box& layoutBox = *object->layoutBox();
+        if (layoutBox.isOutOfFlowPositioned() && layoutBox.style().hasStaticBlockPosition(isHorizontalWritingMode)) {
+            RenderBox& renderer = downcast<RenderBox>(m_boxTree.rendererForLayoutBox(layoutBox));


Suggested change

RenderBox& renderer = downcast<RenderBox>(m_boxTree.rendererForLayoutBox(layoutBox));

auto& renderer = downcast<RenderBox>(m_boxTree.rendererForLayoutBox(layoutBox));

Is this downcast guaranteed to succeed? Are we guaranteed to get a RenderBox here?
Also this might need smart pointers

I'm not super familiar with the layout integration layer myself, but I copied the logic from here: https://searchfox.org/wubkat/source/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp#417

for (auto& renderObject : m_boxTree.renderers()) { auto& layoutBox = *renderObject->layoutBox(); if (!layoutBox.isFloatingPositioned() && !layoutBox.isOutOfFlowPositioned()) continue; if (layoutBox.isLineBreakBox()) continue; auto& renderer = downcast<RenderBox>(m_boxTree.rendererForLayoutBox(layoutBox));

If that's working off of valid assumptions, then my understanding is that this will work, too.

Source/WebCore/rendering/FloatingObjects.cpp

Source/WebCore/rendering/LegacyInlineBox.cpp

Source/WebCore/rendering/LegacyInlineFlowBox.cpp

Source/WebCore/rendering/RenderBlockFlow.cpp

Source/WebCore/rendering/RenderLineBoxList.cpp

webkit-early-warning-system · 2023-12-08T20:11:42Z

EWS run on previous version of this PR (hash 77f159f)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	❌ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	❌ 🧪 mac-wk1	❌ 🛠 gtk
✅ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk2~~	❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	~~🛠 tv~~	~~🧪 mac-AS-debug-wk2~~	❌ 🧪 api-gtk
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	✅ 🛠 watch		✅ 🧪 jsc-armv7-tests
	~~🛠 watch-sim~~

fantasai · 2023-12-08T20:23:29Z

I kinda prefer to not use auto since it makes the code easier to read (especially for newcomers) when the types are made explicit. I can change it if it's required, though.

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

Source/WebCore/rendering/FloatingObjects.cpp

Source/WebCore/rendering/FloatingObjects.h

Source/WebCore/rendering/LegacyInlineFlowBox.cpp

Source/WebCore/rendering/RenderBlockFlow.cpp

Source/WebCore/rendering/RenderLineBoxList.cpp

Source/WebCore/rendering/style/StyleContentAlignmentData.h

smfr · 2023-12-08T20:40:14Z

Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml

@@ -197,6 +197,20 @@ AggressiveTileRetentionEnabled:
    WebCore:
      default: false

+AlignContentOnBlocksEnabled:
+  type: bool
+  status: stable


Are we really at stable yet? I would start with testable or preview

We can always switch it off later if it's a problem, but Greg asked me to land this today if possible, even if it wasn't perfect.

Source/WebCore/rendering/RenderBlockFlow.h

smfr · 2023-12-08T20:51:33Z

Source/WebCore/rendering/style/StyleContentAlignmentData.cpp

@@ -35,4 +35,57 @@ TextStream& operator<<(TextStream& ts, const StyleContentAlignmentData& o)
    return ts << o.position() << " " << o.distribution() << " " << o.overflow();
 }

+bool StyleContentAlignmentData::isStartward(bool isRTL, bool isFlexReverse) const


I don't like isStartward, but I'm not sure what this is trying to compute so can't suggest a better name.

it's representing all the values that would be equivalent to start, so, mapping to start (vs end vs center) per flex-direction / direction / fallback alignment.

How does something like isEquivalentToContentPositionStart sound?

Well... It's a little odd for e.g. ContentDistribution::SpaceBetween, for example, or ContentPosition::Baseline. They're not equivalent to start, but they fall back to it.

Source/WebCore/rendering/style/StyleContentAlignmentData.cpp

alanbaradlay · 2023-12-09T00:17:48Z

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

+            ASSERT(renderer->layer());
+            CheckedRef layer = *renderer->layer();
+            layer->setStaticBlockPosition(layer->staticBlockPosition() + blockShift);
+            renderer->setChildNeedsLayout(MarkOnlyThis);


what guarantees that we end up running layout on this renderer?

Nothing inherent to the line layout object, but my logic goes:

for everything that we're a containing block for, we're running positioned box layout after the align-content shifting

for everything that our ancestors are a containing block for, they need to wait until we're done with layout to be able to place static positioned boxes that are our descendants anyway, so they need to be running positioned box layout after we're done here anyway

It's not foolproof logic, and there's possibly something I missed here, but I think that should capture most of it...

alanbaradlay · 2023-12-09T00:20:06Z

Source/WebCore/rendering/FloatingObjects.cpp

+    LayoutUnit shiftY = (m_horizontalWritingMode) ? blockShift : 0_lu;
+
+    for (auto& floater : m_set) {
+        floater->m_frameRect.move(shiftX, shiftY);


I'd rather use public API (which could do both of these)

The reason I didn't go that route was that I didn't want anyone else trying to modify e.g. an individual FloatObject directly, because that could break some invariants in the FloatObjects tracking logic.

Since we're shifting every Float together by the same delta simultaneously, we're not breaking that logic. But if some external caller tried to that, things would likely break. Note that there are setX() and setY() methods on the FloatObject, but I'm specifically bypassing their checks here. I don't want anyone other than this method to be able to do that, though, because this method guarantees they're all moved together.

Source/WebCore/rendering/RenderBlockFlow.cpp

webkit-early-warning-system · 2023-12-09T02:25:33Z

EWS run on previous version of this PR (hash 522100b)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	~~🛠 wpe~~	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🧪 api-mac	~~🧪 api-wpe~~
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	❌ 🛠 gtk
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	✅ 🛠 watch		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch-sim

nt1m

There are a few more places we could infer types.

Source/WebCore/rendering/RenderLineBoxList.cpp

Source/WebCore/rendering/RenderBlockFlow.cpp

nt1m · 2023-12-09T05:21:58Z

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

+    }
+
+    for (auto& object : m_boxTree.renderers()) {
+        Layout::Box& layoutBox = *object->layoutBox();


Suggested change

Layout::Box& layoutBox = *object->layoutBox();

auto& layoutBox = *object->layoutBox();

The variable name is pretty self explanatory -> auto

I wish it was, but everything here is representing a layout box. In fact, because this is peeling its way through the integration layers, it's all representing the same layout box, they're all just different types representing the same layout box. Tbh, the fact "layoutBox" is referencing the type Layout::Box was totally lost on me when I was reading this code (because everything here uses auto). It's only self-explanatory when you're an expert in this codebase.

Source/WebCore/rendering/LegacyInlineBox.cpp

Source/WebCore/rendering/LegacyInlineFlowBox.cpp

Source/WebCore/rendering/RenderBlockFlow.cpp

Source/WebCore/rendering/FloatingObjects.cpp

webkit-early-warning-system · 2023-12-09T08:27:32Z

EWS run on previous version of this PR (hash e4d949f)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	✅ 🛠 gtk
⏳ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	~~🧪 mac-AS-debug-wk2~~	⏳ 🧪 api-gtk
	✅ 🛠 tv-sim	~~🧪 mac-wk2-stress~~	✅ 🛠 jsc-armv7
	⏳ 🛠 watch		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-12-09T08:35:05Z

EWS run on previous version of this PR (hash 3107db9)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 gtk
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	✅ 🛠 watch		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-12-09T18:40:55Z

EWS run on previous version of this PR (hash 640c33b)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	✅ 🛠 watch		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-12-09T22:01:29Z

EWS run on current version of this PR (hash a6c133a)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	~~🧪 mac-wk2~~	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-armv7
	✅ 🛠 watch		✅ 🧪 jsc-armv7-tests
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=266085 rdar://114740670 Reviewed by Alan Baradlay. Implements 'align-content' on block containers by shifting the contents of RenderBlockFlow if there is extra space after sizing. See https://www.w3.org/TR/css-align/#distribution-block Alignment is not supported if the box is fragmented. To support this, adds methods for shifting content in the block axis to: - FloatingObjects - legacy RenderLineBoxList - modern LineLayout Also implements the requirement that non-normal 'align-content' values establish a new formatting context. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-001-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-001-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-001.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-002.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-003.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-004.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-005.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-006.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-007.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-008.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-009.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-010.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-011.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-010.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020-aligned-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020-unaligned-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-content-020.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-010-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-010-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-010.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-020-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-020-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-break-overflow-020.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-overflow-000-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-overflow-000-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-overflow-000.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-block-simple-height-change.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-align/blocks/align-content-table-cell.html: Added. * Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp: (WebCore::LayoutIntegration::LineLayout::shiftLinesBy): Implement shifting line boxes and their contents. * Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h: Add API to shift line boxes and their contents. * Source/WebCore/rendering/FloatingObjects.cpp: (WebCore::FloatingObjects::shiftFloatsBy): Implement shifting floats while avoiding side-effects. * Source/WebCore/rendering/FloatingObjects.h: Add APIs for shifting all floats by a fixed amount. * Source/WebCore/rendering/RenderBlockFlow.cpp: (WebCore::RenderBlockFlow::layoutBlock): Shift for align-content, trigger abspos reflow if shifted. (WebCore::RenderBlockFlow::shiftForAlignContent): Implement method to shift content per align-content. * Source/WebCore/rendering/RenderBlockFlow.h: Add shiftForAlignContent() * Source/WebCore/rendering/RenderElement.cpp: (WebCore::RenderElement::createsNewFormattingContext const): Establish new formatting context. * Source/WebCore/rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::shiftLinesBy): Implement method to shift lines by delta. * Source/WebCore/rendering/RenderLineBoxList.h: Add API to shift lines by delta. * Source/WebCore/rendering/style/StyleContentAlignmentData.cpp: (WebCore::StyleContentAlignmentData::isStartward const): Add convenience method for 'start'-equivalent values. (WebCore::StyleContentAlignmentData::isEndward const): Add convenience method for 'end'-equivalent values. (WebCore::StyleContentAlignmentData::isCentered const): Add convenience method for 'center'-equivalent values. * Source/WebCore/rendering/style/StyleContentAlignmentData.h: (WebCore::StyleContentAlignmentData::isNormal const): Add convenience method to correctly check for 'normal'. Canonical link: https://commits.webkit.org/271818@main

webkit-commit-queue · 2023-12-10T00:59:41Z

Committed 271818@main (4c9ed16): https://commits.webkit.org/271818@main

Reviewed commits have been landed. Closing PR #21522 and removing active labels.

pxlcoder requested review from nt1m, alanbaradlay, anttijk and smfr December 8, 2023 19:48

nt1m requested a review from sammygill December 8, 2023 19:52

fantasai force-pushed the align-content branch from f2375d1 to 77f159f Compare December 8, 2023 20:01

nt1m reviewed Dec 8, 2023

View reviewed changes

Ahmad-S792 assigned fantasai Dec 8, 2023

Ahmad-S792 added the Layout and Rendering For bugs with layout and rendering of Web pages. label Dec 8, 2023

cdumez reviewed Dec 8, 2023

View reviewed changes

smfr reviewed Dec 8, 2023

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 8, 2023

nt1m reviewed Dec 8, 2023

View reviewed changes

Source/WebCore/rendering/style/StyleContentAlignmentData.cpp Outdated Show resolved Hide resolved

fantasai force-pushed the align-content branch 2 times, most recently from 905f7ac to e5055e9 Compare December 9, 2023 00:09

alanbaradlay approved these changes Dec 9, 2023

View reviewed changes

fantasai force-pushed the align-content branch 2 times, most recently from b80b86b to 522100b Compare December 9, 2023 02:25

nt1m reviewed Dec 9, 2023

View reviewed changes

fantasai force-pushed the align-content branch from 522100b to e4d949f Compare December 9, 2023 08:27

fantasai force-pushed the align-content branch from e4d949f to 3107db9 Compare December 9, 2023 08:34

fantasai force-pushed the align-content branch from 3107db9 to 640c33b Compare December 9, 2023 18:40

fantasai force-pushed the align-content branch from 640c33b to a6c133a Compare December 9, 2023 22:01

alanbaradlay added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks and removed merging-blocked Applied to prevent a change from being merged labels Dec 9, 2023

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 9, 2023

webkit-ews-buildbot added merging-blocked Applied to prevent a change from being merged and removed unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing labels Dec 10, 2023

alanbaradlay added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Dec 10, 2023

webkit-commit-queue force-pushed the align-content branch from a6c133a to 4c9ed16 Compare December 10, 2023 00:59

webkit-commit-queue merged commit 4c9ed16 into WebKit:main Dec 10, 2023

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 10, 2023

karlcow mentioned this pull request Mar 26, 2024

re-import css/css-align WPT #26454

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement align-content on block containers #21522

Implement align-content on block containers #21522

fantasai commented Dec 8, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Dec 8, 2023 •

edited

nt1m Dec 8, 2023

fantasai Dec 8, 2023

webkit-early-warning-system commented Dec 8, 2023 •

edited

fantasai commented Dec 8, 2023

smfr Dec 8, 2023

fantasai Dec 9, 2023

smfr Dec 8, 2023

fantasai Dec 8, 2023

sammygill Dec 8, 2023

fantasai Dec 8, 2023

alanbaradlay Dec 9, 2023

fantasai Dec 9, 2023

alanbaradlay Dec 9, 2023

fantasai Dec 9, 2023

webkit-early-warning-system commented Dec 9, 2023 •

edited

nt1m left a comment

nt1m Dec 9, 2023

fantasai Dec 9, 2023

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-commit-queue commented Dec 10, 2023

	RenderBox& renderer = downcast<RenderBox>(m_boxTree.rendererForLayoutBox(layoutBox));
	auto& renderer = downcast<RenderBox>(m_boxTree.rendererForLayoutBox(layoutBox));

	Layout::Box& layoutBox = *object->layoutBox();
	auto& layoutBox = *object->layoutBox();

Implement align-content on block containers #21522

Implement align-content on block containers #21522

Conversation

fantasai commented Dec 8, 2023 • edited by webkit-early-warning-system

webkit-early-warning-system commented Dec 8, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Dec 8, 2023 • edited

fantasai commented Dec 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Dec 9, 2023 • edited

nt1m left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Dec 9, 2023 • edited

webkit-early-warning-system commented Dec 9, 2023 • edited

webkit-early-warning-system commented Dec 9, 2023 • edited

webkit-early-warning-system commented Dec 9, 2023 • edited

webkit-commit-queue commented Dec 10, 2023

fantasai commented Dec 8, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Dec 8, 2023 •

edited

webkit-early-warning-system commented Dec 8, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited

webkit-early-warning-system commented Dec 9, 2023 •

edited