Changeset 173427 in webkit


Ignore:
Timestamp:
Sep 9, 2014 4:39:41 AM (10 years ago)
Author:
svillar@igalia.com
Message:

[CSS Grid Layout] RenderGrid methods should take RenderBox references
​https://bugs.webkit.org/show_bug.cgi?id=136630

Reviewed by Darin Adler.

RenderGrid has several methods that take pointers to RenderBox
instances but the body of those methods assumes that the objects
will never be NULL. We should replace them by references.

  • rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
(WebCore::RenderGrid::logicalContentHeightForChild):
(WebCore::RenderGrid::minContentForChild):
(WebCore::RenderGrid::maxContentForChild):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
(WebCore::RenderGrid::insertItemIntoGrid):
(WebCore::RenderGrid::placeItemsOnGrid):
(WebCore::RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid):
(WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
(WebCore::RenderGrid::placeAutoMajorAxisItemsOnGrid):
(WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
(WebCore::RenderGrid::layoutGridItems):
(WebCore::RenderGrid::cachedGridCoordinate):
(WebCore::RenderGrid::gridAreaBreadthForChild):
(WebCore::RenderGrid::findChildLogicalPosition):

  • rendering/RenderGrid.h:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r173426 r173427  
     12014-09-08  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [CSS Grid Layout] RenderGrid methods should take RenderBox references
     4        https://bugs.webkit.org/show_bug.cgi?id=136630
     5
     6        Reviewed by Darin Adler.
     7
     8        RenderGrid has several methods that take pointers to RenderBox
     9        instances but the body of those methods assumes that the objects
     10        will never be NULL. We should replace them by references.
     11
     12        * rendering/RenderGrid.cpp:
     13        (WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
     14        (WebCore::RenderGrid::logicalContentHeightForChild):
     15        (WebCore::RenderGrid::minContentForChild):
     16        (WebCore::RenderGrid::maxContentForChild):
     17        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
     18        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
     19        (WebCore::RenderGrid::insertItemIntoGrid):
     20        (WebCore::RenderGrid::placeItemsOnGrid):
     21        (WebCore::RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid):
     22        (WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
     23        (WebCore::RenderGrid::placeAutoMajorAxisItemsOnGrid):
     24        (WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
     25        (WebCore::RenderGrid::layoutGridItems):
     26        (WebCore::RenderGrid::cachedGridCoordinate):
     27        (WebCore::RenderGrid::gridAreaBreadthForChild):
     28        (WebCore::RenderGrid::findChildLogicalPosition):
     29        * rendering/RenderGrid.h:
     30
    1312014-09-09  Antti Koivisto  <antti@apple.com>
    232

  • trunk/Source/WebCore/rendering/RenderGrid.cpp

    r171102 r173427  
    361361            GridIterator iterator(m_grid, direction, flexibleSizedTracksIndex[i]);
    362362            while (RenderBox* gridItem = iterator.nextGridItem()) {
    363                 const GridCoordinate coordinate = cachedGridCoordinate(gridItem);
     363                const GridCoordinate coordinate = cachedGridCoordinate(*gridItem);
    364364                const GridSpan span = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
    365365
    … …  
    368368                    continue;
    369369
    370                 double itemNormalizedFlexBreadth = computeNormalizedFractionBreadth(tracks, span, direction, maxContentForChild(gridItem, direction, sizingData.columnTracks));
     370                double itemNormalizedFlexBreadth = computeNormalizedFractionBreadth(tracks, span, direction, maxContentForChild(*gridItem, direction, sizingData.columnTracks));
    371371                normalizedFractionBreadth = std::max(normalizedFractionBreadth, itemNormalizedFlexBreadth);
    372372            }
    … …  
    485485}
    486486
    487 LayoutUnit RenderGrid::logicalContentHeightForChild(RenderBox* child, Vector<GridTrack>& columnTracks)
    488 {
    489     LayoutUnit oldOverrideContainingBlockContentLogicalWidth = child->hasOverrideContainingBlockLogicalWidth() ? child->overrideContainingBlockContentLogicalWidth() : LayoutUnit();
     487LayoutUnit RenderGrid::logicalContentHeightForChild(RenderBox& child, Vector<GridTrack>& columnTracks)
     488{
     489    LayoutUnit oldOverrideContainingBlockContentLogicalWidth = child.hasOverrideContainingBlockLogicalWidth() ? child.overrideContainingBlockContentLogicalWidth() : LayoutUnit();
    490490    LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(child, ForColumns, columnTracks);
    491     if (child->style().logicalHeight().isPercent() || oldOverrideContainingBlockContentLogicalWidth != overrideContainingBlockContentLogicalWidth)
    492         child->setNeedsLayout(MarkOnlyThis);
    493 
    494     child->setOverrideContainingBlockContentLogicalWidth(overrideContainingBlockContentLogicalWidth);
     491    if (child.style().logicalHeight().isPercent() || oldOverrideContainingBlockContentLogicalWidth != overrideContainingBlockContentLogicalWidth)
     492        child.setNeedsLayout(MarkOnlyThis);
     493
     494    child.setOverrideContainingBlockContentLogicalWidth(overrideContainingBlockContentLogicalWidth);
    495495    // If |child| has a percentage logical height, we shouldn't let it override its intrinsic height, which is
    496496    // what we are interested in here. Thus we need to set the override logical height to -1 (no possible resolution).
    497     child->setOverrideContainingBlockContentLogicalHeight(-1);
    498     child->layoutIfNeeded();
    499     return child->logicalHeight() + child->marginLogicalHeight();
    500 }
    501 
    502 LayoutUnit RenderGrid::minContentForChild(RenderBox* child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
    503 {
    504     bool hasOrthogonalWritingMode = child->isHorizontalWritingMode() != isHorizontalWritingMode();
     497    child.setOverrideContainingBlockContentLogicalHeight(-1);
     498    child.layoutIfNeeded();
     499    return child.logicalHeight() + child.marginLogicalHeight();
     500}
     501
     502LayoutUnit RenderGrid::minContentForChild(RenderBox& child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
     503{
     504    bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
    505505    // FIXME: Properly support orthogonal writing mode.
    506506    if (hasOrthogonalWritingMode)
    … …  
    510510        // FIXME: It's unclear if we should return the intrinsic width or the preferred width.
    511511        // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
    512         return child->minPreferredLogicalWidth() + marginIntrinsicLogicalWidthForChild(*child);
     512        return child.minPreferredLogicalWidth() + marginIntrinsicLogicalWidthForChild(child);
    513513    }
    514514
    … …  
    516516}
    517517
    518 LayoutUnit RenderGrid::maxContentForChild(RenderBox* child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
    519 {
    520     bool hasOrthogonalWritingMode = child->isHorizontalWritingMode() != isHorizontalWritingMode();
     518LayoutUnit RenderGrid::maxContentForChild(RenderBox& child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
     519{
     520    bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
    521521    // FIXME: Properly support orthogonal writing mode.
    522522    if (hasOrthogonalWritingMode)
    … …  
    526526        // FIXME: It's unclear if we should return the intrinsic width or the preferred width.
    527527        // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
    528         return child->maxPreferredLogicalWidth() + marginIntrinsicLogicalWidthForChild(*child);
     528        return child.maxPreferredLogicalWidth() + marginIntrinsicLogicalWidthForChild(child);
    529529    }
    530530
    … …  
    539539        GridIterator iterator(m_grid, direction, sizingData.contentSizedTracksIndex[i]);
    540540        while (RenderBox* gridItem = iterator.nextGridItem()) {
    541             resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, gridItem, &GridTrackSize::hasMinOrMaxContentMinTrackBreadth, &RenderGrid::minContentForChild, &GridTrack::usedBreadth, &GridTrack::growUsedBreadth);
    542             resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, gridItem, &GridTrackSize::hasMaxContentMinTrackBreadth, &RenderGrid::maxContentForChild, &GridTrack::usedBreadth, &GridTrack::growUsedBreadth);
    543             resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, gridItem, &GridTrackSize::hasMinOrMaxContentMaxTrackBreadth, &RenderGrid::minContentForChild, &GridTrack::maxBreadthIfNotInfinite, &GridTrack::growMaxBreadth);
    544             resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, gridItem, &GridTrackSize::hasMaxContentMaxTrackBreadth, &RenderGrid::maxContentForChild, &GridTrack::maxBreadthIfNotInfinite, &GridTrack::growMaxBreadth);
     541            resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, *gridItem, &GridTrackSize::hasMinOrMaxContentMinTrackBreadth, &RenderGrid::minContentForChild, &GridTrack::usedBreadth, &GridTrack::growUsedBreadth);
     542            resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, *gridItem, &GridTrackSize::hasMaxContentMinTrackBreadth, &RenderGrid::maxContentForChild, &GridTrack::usedBreadth, &GridTrack::growUsedBreadth);
     543            resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, *gridItem, &GridTrackSize::hasMinOrMaxContentMaxTrackBreadth, &RenderGrid::minContentForChild, &GridTrack::maxBreadthIfNotInfinite, &GridTrack::growMaxBreadth);
     544            resolveContentBasedTrackSizingFunctionsForItems(direction, sizingData, *gridItem, &GridTrackSize::hasMaxContentMaxTrackBreadth, &RenderGrid::maxContentForChild, &GridTrack::maxBreadthIfNotInfinite, &GridTrack::growMaxBreadth);
    545545        }
    546546
    … …  
    551551}
    552552
    553 void RenderGrid::resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection direction, GridSizingData& sizingData, RenderBox* gridItem, FilterFunction filterFunction, SizingFunction sizingFunction, AccumulatorGetter trackGetter, AccumulatorGrowFunction trackGrowthFunction)
     553void RenderGrid::resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection direction, GridSizingData& sizingData, RenderBox& gridItem, FilterFunction filterFunction, SizingFunction sizingFunction, AccumulatorGetter trackGetter, AccumulatorGrowFunction trackGrowthFunction)
    554554{
    555555    const GridCoordinate coordinate = cachedGridCoordinate(gridItem);
    … …  
    646646}
    647647
    648 void RenderGrid::insertItemIntoGrid(RenderBox* child, const GridCoordinate& coordinate)
     648void RenderGrid::insertItemIntoGrid(RenderBox& child, const GridCoordinate& coordinate)
    649649{
    650650    ensureGridSize(coordinate.rows.resolvedFinalPosition.toInt(), coordinate.columns.resolvedFinalPosition.toInt());
    … …  
    652652    for (auto row : coordinate.rows) {
    653653        for (auto column : coordinate.columns)
    654             m_grid[row.toInt()][column.toInt()].append(child);
    655     }
    656     m_gridItemCoordinate.set(child, coordinate);
     654            m_grid[row.toInt()][column.toInt()].append(&child);
     655    }
     656    m_gridItemCoordinate.set(&child, coordinate);
    657657}
    658658
    … …  
    679679            continue;
    680680        }
    681         insertItemIntoGrid(child, GridCoordinate(*rowPositions, *columnPositions));
     681        insertItemIntoGrid(*child, GridCoordinate(*rowPositions, *columnPositions));
    682682    }
    683683
    … …  
    733733}
    734734
    735 std::unique_ptr<GridCoordinate> RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox* gridItem, GridTrackSizingDirection specifiedDirection, const GridSpan& specifiedPositions) const
     735std::unique_ptr<GridCoordinate> RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox& gridItem, GridTrackSizingDirection specifiedDirection, const GridSpan& specifiedPositions) const
    736736{
    737737    GridTrackSizingDirection crossDirection = specifiedDirection == ForColumns ? ForRows : ForColumns;
    738738    const size_t endOfCrossDirection = crossDirection == ForColumns ? gridColumnCount() : gridRowCount();
    739     GridSpan crossDirectionPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), *gridItem, crossDirection, GridResolvedPosition(endOfCrossDirection));
     739    GridSpan crossDirectionPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), gridItem, crossDirection, GridResolvedPosition(endOfCrossDirection));
    740740    return std::make_unique<GridCoordinate>(specifiedDirection == ForColumns ? crossDirectionPositions : specifiedPositions, specifiedDirection == ForColumns ? specifiedPositions : crossDirectionPositions);
    741741}
    … …  
    750750        std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea(majorAxisPositions->integerSpan(), minorAxisPositions.integerSpan());
    751751        if (!emptyGridArea)
    752             emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(autoGridItem, autoPlacementMajorAxisDirection(), *majorAxisPositions);
    753         insertItemIntoGrid(autoGridItem, *emptyGridArea);
     752            emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(*autoGridItem, autoPlacementMajorAxisDirection(), *majorAxisPositions);
     753        insertItemIntoGrid(*autoGridItem, *emptyGridArea);
    754754    }
    755755}
    … …  
    761761
    762762    for (auto& autoGridItem : autoGridItems) {
    763         placeAutoMajorAxisItemOnGrid(autoGridItem, autoPlacementCursor);
     763        placeAutoMajorAxisItemOnGrid(*autoGridItem, autoPlacementCursor);
    764764
    765765        if (isGridAutoFlowDense) {
    … …  
    770770}
    771771
    772 void RenderGrid::placeAutoMajorAxisItemOnGrid(RenderBox* gridItem, AutoPlacementCursor& autoPlacementCursor)
    773 {
    774     std::unique_ptr<GridSpan> minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromStyle(style(), *gridItem, autoPlacementMinorAxisDirection());
    775     ASSERT(!GridResolvedPosition::resolveGridPositionsFromStyle(style(), *gridItem, autoPlacementMajorAxisDirection()));
    776     GridSpan majorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), *gridItem, autoPlacementMajorAxisDirection(), GridResolvedPosition(0));
     772void RenderGrid::placeAutoMajorAxisItemOnGrid(RenderBox& gridItem, AutoPlacementCursor& autoPlacementCursor)
     773{
     774    std::unique_ptr<GridSpan> minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromStyle(style(), gridItem, autoPlacementMinorAxisDirection());
     775    ASSERT(!GridResolvedPosition::resolveGridPositionsFromStyle(style(), gridItem, autoPlacementMajorAxisDirection()));
     776    GridSpan majorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), gridItem, autoPlacementMajorAxisDirection(), GridResolvedPosition(0));
    777777
    778778    const size_t endOfMajorAxis = (autoPlacementMajorAxisDirection() == ForColumns) ? gridColumnCount() : gridRowCount();
    … …  
    794794            emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(gridItem, autoPlacementMinorAxisDirection(), *minorAxisPositions);
    795795    } else {
    796         GridSpan minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), *gridItem, autoPlacementMinorAxisDirection(), GridResolvedPosition(0));
     796        GridSpan minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), gridItem, autoPlacementMinorAxisDirection(), GridResolvedPosition(0));
    797797
    798798        for (size_t majorAxisIndex = majorAxisAutoPlacementCursor; majorAxisIndex < endOfMajorAxis; ++majorAxisIndex) {
    … …  
    859859        LayoutUnit oldOverrideContainingBlockContentLogicalHeight = child->hasOverrideContainingBlockLogicalHeight() ? child->overrideContainingBlockContentLogicalHeight() : LayoutUnit();
    860860
    861         LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(child, ForColumns, sizingData.columnTracks);
    862         LayoutUnit overrideContainingBlockContentLogicalHeight = gridAreaBreadthForChild(child, ForRows, sizingData.rowTracks);
     861        LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(*child, ForColumns, sizingData.columnTracks);
     862        LayoutUnit overrideContainingBlockContentLogicalHeight = gridAreaBreadthForChild(*child, ForRows, sizingData.rowTracks);
    863863        if (oldOverrideContainingBlockContentLogicalWidth != overrideContainingBlockContentLogicalWidth || (oldOverrideContainingBlockContentLogicalHeight != overrideContainingBlockContentLogicalHeight && child->hasRelativeLogicalHeight()))
    864864            child->setNeedsLayout(MarkOnlyThis);
    … …  
    874874        child->layoutIfNeeded();
    875875
    876         child->setLogicalLocation(findChildLogicalPosition(child, sizingData));
     876        child->setLogicalLocation(findChildLogicalPosition(*child, sizingData));
    877877
    878878        // If the child moved, we have to repaint it as well as any floating/positioned
    … …  
    891891}
    892892
    893 GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox* gridItem) const
    894 {
    895     ASSERT(m_gridItemCoordinate.contains(gridItem));
    896     return m_gridItemCoordinate.get(gridItem);
    897 }
    898 
    899 LayoutUnit RenderGrid::gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDirection direction, const Vector<GridTrack>& tracks) const
     893GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox& gridItem) const
     894{
     895    ASSERT(m_gridItemCoordinate.contains(&gridItem));
     896    return m_gridItemCoordinate.get(&gridItem);
     897}
     898
     899LayoutUnit RenderGrid::gridAreaBreadthForChild(const RenderBox& child, GridTrackSizingDirection direction, const Vector<GridTrack>& tracks) const
    900900{
    901901    const GridCoordinate& coordinate = cachedGridCoordinate(child);
    … …  
    920920}
    921921
    922 LayoutPoint RenderGrid::findChildLogicalPosition(RenderBox* child, const GridSizingData& sizingData)
     922LayoutPoint RenderGrid::findChildLogicalPosition(RenderBox& child, const GridSizingData& sizingData)
    923923{
    924924    const GridCoordinate& coordinate = cachedGridCoordinate(child);
    … …  
    927927
    928928    // The grid items should be inside the grid container's border box, that's why they need to be shifted.
    929     return LayoutPoint(m_columnPositions[coordinate.columns.resolvedInitialPosition.toInt()] + marginStartForChild(*child), m_rowPositions[coordinate.rows.resolvedInitialPosition.toInt()] + marginBeforeForChild(*child));
     929    return LayoutPoint(m_columnPositions[coordinate.columns.resolvedInitialPosition.toInt()] + marginStartForChild(child), m_rowPositions[coordinate.rows.resolvedInitialPosition.toInt()] + marginBeforeForChild(child));
    930930}
    931931

  • trunk/Source/WebCore/rendering/RenderGrid.h

    r171082 r173427  
    7272
    7373    void ensureGridSize(size_t maximumRowIndex, size_t maximumColumnIndex);
    74     void insertItemIntoGrid(RenderBox*, const GridCoordinate&);
     74    void insertItemIntoGrid(RenderBox&, const GridCoordinate&);
    7575    void placeItemsOnGrid();
    7676    void populateExplicitGridAndOrderIterator();
    77     std::unique_ptr<GridCoordinate> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox*, GridTrackSizingDirection, const GridSpan&) const;
     77    std::unique_ptr<GridCoordinate> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox&, GridTrackSizingDirection, const GridSpan&) const;
    7878    void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
    7979    void placeAutoMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
    8080    typedef std::pair<size_t, size_t> AutoPlacementCursor;
    81     void placeAutoMajorAxisItemOnGrid(RenderBox*, AutoPlacementCursor&);
     81    void placeAutoMajorAxisItemOnGrid(RenderBox&, AutoPlacementCursor&);
    8282    GridTrackSizingDirection autoPlacementMajorAxisDirection() const;
    8383    GridTrackSizingDirection autoPlacementMinorAxisDirection() const;
    … …  
    8787    void clearGrid();
    8888
    89     typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox*, GridTrackSizingDirection, Vector<GridTrack>&);
     89    typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>&);
    9090    typedef LayoutUnit (GridTrack::* AccumulatorGetter)() const;
    9191    typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);
    9292    typedef bool (GridTrackSize::* FilterFunction)() const;
    93     void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, RenderBox*, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction);
     93    void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, RenderBox&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction);
    9494    void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<GridTrack*>* tracksForGrowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizingData&, LayoutUnit& availableLogicalSpace);
    9595
    … …  
    9898    const GridTrackSize& gridTrackSize(GridTrackSizingDirection, size_t) const;
    9999
    100     LayoutUnit logicalContentHeightForChild(RenderBox*, Vector<GridTrack>&);
    101     LayoutUnit minContentForChild(RenderBox*, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
    102     LayoutUnit maxContentForChild(RenderBox*, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
    103     LayoutPoint findChildLogicalPosition(RenderBox*, const GridSizingData&);
    104     GridCoordinate cachedGridCoordinate(const RenderBox*) const;
     100    LayoutUnit logicalContentHeightForChild(RenderBox&, Vector<GridTrack>&);
     101    LayoutUnit minContentForChild(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
     102    LayoutUnit maxContentForChild(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
     103    LayoutPoint findChildLogicalPosition(RenderBox&, const GridSizingData&);
     104    GridCoordinate cachedGridCoordinate(const RenderBox&) const;
    105105
    106     LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
     106    LayoutUnit gridAreaBreadthForChild(const RenderBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
    107107
    108108    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint& paintOffset, PaintInfo& forChild, bool usePrintRect) override final;
Note: See TracChangeset for help on using the changeset viewer.