Changeset 289993 in webkit

Timestamp:

Feb 16, 2022 7:40:20 PM (5 months ago)

Author:

commit-queue@webkit.org

Message:

Implement getComputedStyle for subgrids
​https://bugs.webkit.org/show_bug.cgi?id=236148

Patch by Matt Woodrow <Matt Woodrow> on 2022-02-16
Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

Adds OrderedNamedLinesCollectorInSubgridLayout to iterate the subgrid names list, stopping
at the number of actual tracks in the grid.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::OrderedNamedLinesCollectorInSubgridLayout::OrderedNamedLinesCollectorInSubgridLayout):
(WebCore::OrderedNamedLinesCollectorInGridLayout::collectLineNamesForIndex const):
(WebCore::OrderedNamedLinesCollectorInSubgridLayout::collectLineNamesForIndex const):
(WebCore::addValuesForNamedGridLinesAtIndex):
(WebCore::populateSubgridTrackList):
(WebCore::valueForGridTrackList):

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computeAutoRepeatTracksCount const):

• rendering/RenderGrid.h:
• rendering/style/GridPositionsResolver.cpp:

(WebCore::NamedLineCollection::contains const):

• style/StyleBuilderConverter.h:

(WebCore::Style::BuilderConverter::createGridTrackList):

LayoutTests:

Mark tests as no longer crashing.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-subgridded-axis-auto-repeater-crash-001-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-subgridded-axis-auto-repeater-crash-002-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.h (modified) (1 diff)
• Source/WebCore/rendering/style/GridPositionsResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-16  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Implement getComputedStyle for subgrids
+        https://bugs.webkit.org/show_bug.cgi?id=236148
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Mark tests as no longer crashing.
+
+        * TestExpectations:
+
 2022-02-16  Jon Lee  <jonlee@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1435 +1435 @@
 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-003.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-004.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-subgridded-axis-auto-repeater-crash-001.html [ Crash ]
-imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-subgridded-axis-auto-repeater-crash-002.html [ Crash ]
 
 webkit.org/b/149890 fast/css-grid-layout/grid-shorthands-style-format.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-16  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Implement getComputedStyle for subgrids
+        https://bugs.webkit.org/show_bug.cgi?id=236148
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Adds OrderedNamedLinesCollectorInSubgridLayout to iterate the subgrid names list, stopping
+        at the number of actual tracks in the grid.
+
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::OrderedNamedLinesCollectorInSubgridLayout::OrderedNamedLinesCollectorInSubgridLayout):
+        (WebCore::OrderedNamedLinesCollectorInGridLayout::collectLineNamesForIndex const):
+        (WebCore::OrderedNamedLinesCollectorInSubgridLayout::collectLineNamesForIndex const):
+        (WebCore::addValuesForNamedGridLinesAtIndex):
+        (WebCore::populateSubgridTrackList):
+        (WebCore::valueForGridTrackList):
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::computeAutoRepeatTracksCount const):
+        * rendering/RenderGrid.h:
+        * rendering/style/GridPositionsResolver.cpp:
+        (WebCore::NamedLineCollection::contains const):
+        * style/StyleBuilderConverter.h:
+        (WebCore::Style::BuilderConverter::createGridTrackList):
+
 2022-02-16  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -899 +899 @@
 };
 
+class OrderedNamedLinesCollectorInSubgridLayout : public OrderedNamedLinesCollector {
+public:
+    OrderedNamedLinesCollectorInSubgridLayout(const RenderStyle& style, bool isRowAxis, unsigned totalTracksCount)
+        : OrderedNamedLinesCollector(style, isRowAxis)
+        , m_insertionPoint(isRowAxis ? style.gridAutoRepeatColumnsInsertionPoint() : style.gridAutoRepeatRowsInsertionPoint())
+        , m_autoRepeatLineSetListLength((isRowAxis ? style.autoRepeatOrderedNamedGridColumnLines() : style.autoRepeatOrderedNamedGridRowLines()).size())
+        , m_totalLines(totalTracksCount + 1)
+    {
+        if (!m_autoRepeatLineSetListLength) {
+            m_autoRepeatTotalLineSets = 0;
+            return;
+        }
+        unsigned named = (isRowAxis ? style.orderedNamedGridColumnLines() : style.orderedNamedGridRowLines()).size();
+        if (named >= m_totalLines) {
+            m_autoRepeatTotalLineSets = 0;
+            return;
+        }
+        m_autoRepeatTotalLineSets = (m_totalLines - named) / m_autoRepeatLineSetListLength;
+        m_autoRepeatTotalLineSets *= m_autoRepeatLineSetListLength;
+    }
+
+    void collectLineNamesForIndex(CSSGridLineNamesValue&, unsigned index) const override;
+
+    int namedGridLineCount() const override { return m_totalLines; }
+private:
+    unsigned m_insertionPoint;
+    unsigned m_autoRepeatTotalLineSets;
+    unsigned m_autoRepeatLineSetListLength;
+    unsigned m_totalLines;
+};
+
 void OrderedNamedLinesCollector::appendLines(CSSGridLineNamesValue& lineNamesValue, unsigned index, NamedLinesType type) const
 {
@@ -956 +987 @@
 }
 
+void OrderedNamedLinesCollectorInSubgridLayout::collectLineNamesForIndex(CSSGridLineNamesValue& lineNamesValue, unsigned i) const
+{
+    if (!m_autoRepeatLineSetListLength || i < m_insertionPoint) {
+        appendLines(lineNamesValue, i, NamedLines);
+        return;
+    }
+
+    if (i >= m_insertionPoint + m_autoRepeatTotalLineSets) {
+        appendLines(lineNamesValue, i - m_autoRepeatTotalLineSets, NamedLines);
+        return;
+    }
+
+    unsigned autoRepeatIndexInFirstRepetition = (i - m_insertionPoint) % m_autoRepeatLineSetListLength;
+    appendLines(lineNamesValue, autoRepeatIndexInFirstRepetition, AutoRepeatNamedLines);
+}
+
 static void addValuesForNamedGridLinesAtIndex(OrderedNamedLinesCollector& collector, unsigned i, CSSValueList& list, bool renderEmpty = false)
 {
-    if (collector.isEmpty())
+    if (collector.isEmpty() && !renderEmpty)
         return;
 
@@ -1036 +1083 @@
     // If the element is a grid container, the resolved value is the used value,
     // specifying track sizes in pixels and expanding the repeat() notation.
-    if (isRenderGrid) {
-        // FIXME: We need to handle computed subgrid here.
+    // If subgrid was specified, but the element isn't a subgrid (due to not having
+    // an appropriate grid parent), then we fall back to using the specified value.
+    if (isRenderGrid && (!isSubgrid || downcast<RenderGrid>(renderer)->isSubgrid(direction))) {
         auto* grid = downcast<RenderGrid>(renderer);
+        if (isSubgrid) {
+            OrderedNamedLinesCollectorInSubgridLayout collector(style, isRowAxis, grid->numTracks(direction));
+            populateSubgridLineNameList(list.get(), collector);
+            return list;
+        }
         OrderedNamedLinesCollectorInGridLayout collector(style, isRowAxis, grid->autoRepeatCountForDirection(direction), autoRepeatTrackSizes.size());
         // Named grid line indices are relative to the explicit grid, but we are including all tracks.

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -496 +496 @@
     ASSERT(!availableSize || availableSize.value() != -1);
     bool isRowAxis = direction == ForColumns;
+    if (isSubgrid(direction))
+        return 0;
+
     const auto& autoRepeatTracks = isRowAxis ? style().gridAutoRepeatColumns() : style().gridAutoRepeatRows();
     unsigned autoRepeatTrackListLength = autoRepeatTracks.size();

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -102 +102 @@
     }
 
+    unsigned numTracks(GridTrackSizingDirection direction) const
+    {
+        return numTracks(direction, m_grid);
+    }
+
 private:
     ItemPosition selfAlignmentNormalBehavior(const RenderBox* child = nullptr) const override

trunk/Source/WebCore/rendering/style/GridPositionsResolver.cpp

@@ -80 +80 @@
 
     m_autoRepeatTrackListLength = isRowAxis ? gridContainerStyle.gridAutoRepeatColumns().size() : gridContainerStyle.gridAutoRepeatRows().size();
+    // FIXME: Handle subgrid auto repeat tracks
+    if (isRowAxis ? gridContainerStyle.gridSubgridColumns() : gridContainerStyle.gridSubgridRows()) {
+        m_autoRepeatTrackListLength = 0;
+        m_autoRepeatNamedLinesIndexes = nullptr;
+    }
 }