Changeset 198210 in webkit


Ignore:
Timestamp:
Mar 15, 2016 8:10:07 AM (8 years ago)
Author:
Manuel Rego Casasnovas
Message:

[css-grid] Rename GridCoordinate to GridArea
​https://bugs.webkit.org/show_bug.cgi?id=155489

Reviewed by Sergio Villar Senin.

As the comment in GridCoordinate states,
it actually represents a grid area as it stores
the initial and final positions in both axis (columns and rows).

Someone can think about a grid coordinate just like a single cell.
However this class was representing an area of several cells.

On top of that the "grid area" concept is defined in the spec:
​https://drafts.csswg.org/css-grid/#grid-area-concept

No new tests, no change of behavior.

  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSGridTemplateAreasValue.cpp:

(WebCore::stringForPosition):

  • css/CSSGridTemplateAreasValue.h:
  • css/CSSParser.cpp:

(WebCore::CSSParser::parseGridTemplateAreasRow):

  • css/CSSParser.h:
  • rendering/RenderGrid.cpp:

(WebCore::RenderGrid::GridIterator::nextEmptyGridArea):
(WebCore::RenderGrid::insertItemIntoGrid):
(WebCore::RenderGrid::placeItemsOnGrid):
(WebCore::RenderGrid::populateExplicitGridAndOrderIterator):
(WebCore::RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid):
(WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
(WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
(WebCore::RenderGrid::clearGrid):
(WebCore::RenderGrid::cachedGridArea):
(WebCore::RenderGrid::cachedGridSpan):

  • rendering/RenderGrid.h:
  • rendering/style/GridArea.h: Renamed from Source/WebCore/rendering/style/GridCoordinate.h.

(WebCore::GridSpan::untranslatedDefiniteGridSpan):
(WebCore::GridSpan::translatedDefiniteGridSpan):
(WebCore::GridSpan::indefiniteGridSpan):
(WebCore::GridSpan::operator==):
(WebCore::GridSpan::integerSpan):
(WebCore::GridSpan::untranslatedResolvedInitialPosition):
(WebCore::GridSpan::untranslatedResolvedFinalPosition):
(WebCore::GridSpan::resolvedInitialPosition):
(WebCore::GridSpan::resolvedFinalPosition):
(WebCore::GridSpan::GridSpanIterator::GridSpanIterator):
(WebCore::GridSpan::GridSpanIterator::operator unsigned&):
(WebCore::GridSpan::GridSpanIterator::operator*):
(WebCore::GridSpan::begin):
(WebCore::GridSpan::end):
(WebCore::GridSpan::isTranslatedDefinite):
(WebCore::GridSpan::isIndefinite):
(WebCore::GridSpan::translate):
(WebCore::GridSpan::GridSpan):
(WebCore::GridArea::GridArea):
(WebCore::GridArea::operator==):
(WebCore::GridArea::operator!=):

  • rendering/style/GridPositionsResolver.cpp:
  • rendering/style/StyleGridData.h:
Location:
trunk/Source/WebCore
Files:
10 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r198209 r198210  
     12016-03-15  Manuel Rego Casasnovas  <rego@igalia.com>
     2
     3        [css-grid] Rename GridCoordinate to GridArea
     4        https://bugs.webkit.org/show_bug.cgi?id=155489
     5
     6        Reviewed by Sergio Villar Senin.
     7
     8        As the comment in GridCoordinate states,
     9        it actually represents a grid area as it stores
     10        the initial and final positions in both axis (columns and rows).
     11
     12        Someone can think about a grid coordinate just like a single cell.
     13        However this class was representing an area of several cells.
     14
     15        On top of that the "grid area" concept is defined in the spec:
     16        https://drafts.csswg.org/css-grid/#grid-area-concept
     17
     18        No new tests, no change of behavior.
     19
     20        * WebCore.xcodeproj/project.pbxproj:
     21        * css/CSSGridTemplateAreasValue.cpp:
     22        (WebCore::stringForPosition):
     23        * css/CSSGridTemplateAreasValue.h:
     24        * css/CSSParser.cpp:
     25        (WebCore::CSSParser::parseGridTemplateAreasRow):
     26        * css/CSSParser.h:
     27        * rendering/RenderGrid.cpp:
     28        (WebCore::RenderGrid::GridIterator::nextEmptyGridArea):
     29        (WebCore::RenderGrid::insertItemIntoGrid):
     30        (WebCore::RenderGrid::placeItemsOnGrid):
     31        (WebCore::RenderGrid::populateExplicitGridAndOrderIterator):
     32        (WebCore::RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid):
     33        (WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
     34        (WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
     35        (WebCore::RenderGrid::clearGrid):
     36        (WebCore::RenderGrid::cachedGridArea):
     37        (WebCore::RenderGrid::cachedGridSpan):
     38        * rendering/RenderGrid.h:
     39        * rendering/style/GridArea.h: Renamed from Source/WebCore/rendering/style/GridCoordinate.h.
     40        (WebCore::GridSpan::untranslatedDefiniteGridSpan):
     41        (WebCore::GridSpan::translatedDefiniteGridSpan):
     42        (WebCore::GridSpan::indefiniteGridSpan):
     43        (WebCore::GridSpan::operator==):
     44        (WebCore::GridSpan::integerSpan):
     45        (WebCore::GridSpan::untranslatedResolvedInitialPosition):
     46        (WebCore::GridSpan::untranslatedResolvedFinalPosition):
     47        (WebCore::GridSpan::resolvedInitialPosition):
     48        (WebCore::GridSpan::resolvedFinalPosition):
     49        (WebCore::GridSpan::GridSpanIterator::GridSpanIterator):
     50        (WebCore::GridSpan::GridSpanIterator::operator unsigned&):
     51        (WebCore::GridSpan::GridSpanIterator::operator*):
     52        (WebCore::GridSpan::begin):
     53        (WebCore::GridSpan::end):
     54        (WebCore::GridSpan::isTranslatedDefinite):
     55        (WebCore::GridSpan::isIndefinite):
     56        (WebCore::GridSpan::translate):
     57        (WebCore::GridSpan::GridSpan):
     58        (WebCore::GridArea::GridArea):
     59        (WebCore::GridArea::operator==):
     60        (WebCore::GridArea::operator!=):
     61        * rendering/style/GridPositionsResolver.cpp:
     62        * rendering/style/StyleGridData.h:
     63
    1642016-03-15  Joonghun Park  <jh718.park@samsung.com>
    265

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r198207 r198210  
    60406040                CD3A496417A9D01B00274E42 /* SourceBufferList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD3A495B17A9D01B00274E42 /* SourceBufferList.cpp */; };
    60416041                CD3A496517A9D01B00274E42 /* SourceBufferList.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3A495C17A9D01B00274E42 /* SourceBufferList.h */; };
    6042                 CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E251B18046B0600E27F56 /* GridCoordinate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     6042                CD3E251C18046B0600E27F56 /* GridArea.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E251B18046B0600E27F56 /* GridArea.h */; settings = {ATTRIBUTES = (Private, ); }; };
    60436043                CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */; };
    60446044                CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */; };
    … …  
    1401214012                CD3A495C17A9D01B00274E42 /* SourceBufferList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceBufferList.h; sourceTree = "<group>"; };
    1401314013                CD3A495D17A9D01B00274E42 /* SourceBufferList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourceBufferList.idl; sourceTree = "<group>"; };
    14014                 CD3E251B18046B0600E27F56 /* GridCoordinate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridCoordinate.h; sourceTree = "<group>"; };
     14014                CD3E251B18046B0600E27F56 /* GridArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridArea.h; sourceTree = "<group>"; };
    1401514015                CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGridTemplateAreasValue.cpp; sourceTree = "<group>"; };
    1401614016                CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGridTemplateAreasValue.h; sourceTree = "<group>"; };
    … …  
    2256122561                                BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */,
    2256222562                                BC5EB69D0E81DAEB00B25965 /* FillLayer.h */,
    22563                                 CD3E251B18046B0600E27F56 /* GridCoordinate.h */,
     22563                                CD3E251B18046B0600E27F56 /* GridArea.h */,
    2256422564                                CDEF4FD617E85C8F00AEE24B /* GridLength.h */,
    2256522565                                A12705C21656BD6500C2E27C /* GridPosition.h */,
    … …  
    2614726147                                B2A015AB0AF6CD53006BCE0E /* GraphicsTypes.h in Headers */,
    2614826148                                77A17A7B12F2890B004E02F6 /* GraphicsTypes3D.h in Headers */,
    26149                                 CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */,
     26149                                CD3E251C18046B0600E27F56 /* GridArea.h in Headers */,
    2615026150                                CDEF4FD717E85C8F00AEE24B /* GridLength.h in Headers */,
    2615126151                                A12705C31656BD6500C2E27C /* GridPosition.h in Headers */,

  • trunk/Source/WebCore/css/CSSGridTemplateAreasValue.cpp

    r197400 r198210  
    3535#if ENABLE(CSS_GRID_LAYOUT)
    3636
    37 #include "GridCoordinate.h"
     37#include "GridArea.h"
    3838#include <wtf/text/StringBuilder.h>
    3939
    … …  
    5555
    5656    for (const auto& it : gridAreaMap) {
    57         const GridCoordinate& coordinate = it.value;
    58         if (row >= coordinate.rows.resolvedInitialPosition() && row < coordinate.rows.resolvedFinalPosition())
     57        const GridArea& area = it.value;
     58        if (row >= area.rows.resolvedInitialPosition() && row < area.rows.resolvedFinalPosition())
    5959            candidates.append(it.key);
    6060    }
    6161
    6262    for (const auto& it : gridAreaMap) {
    63         const GridCoordinate& coordinate = it.value;
    64         if (column >= coordinate.columns.resolvedInitialPosition() && column < coordinate.columns.resolvedFinalPosition() && candidates.contains(it.key))
     63        const GridArea& area = it.value;
     64        if (column >= area.columns.resolvedInitialPosition() && column < area.columns.resolvedFinalPosition() && candidates.contains(it.key))
    6565            return it.key;
    6666    }

  • trunk/Source/WebCore/css/CSSGridTemplateAreasValue.h

    r177259 r198210  
    3636
    3737#include "CSSValue.h"
    38 #include "GridCoordinate.h"
     38#include "GridArea.h"
    3939
    4040namespace WebCore {

  • trunk/Source/WebCore/css/CSSParser.cpp

    r197850 r198210  
    7272#include "Document.h"
    7373#include "FloatConversion.h"
    74 #include "GridCoordinate.h"
     74#include "GridArea.h"
    7575#include "HTMLParserIdioms.h"
    7676#include "HashTools.h"
    … …  
    62506250        auto gridAreaIterator = gridAreaMap.find(gridAreaName);
    62516251        if (gridAreaIterator == gridAreaMap.end())
    6252             gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan::translatedDefiniteGridSpan(rowCount, rowCount + 1), GridSpan::translatedDefiniteGridSpan(currentColumn, lookAheadColumn)));
     6252            gridAreaMap.add(gridAreaName, GridArea(GridSpan::translatedDefiniteGridSpan(rowCount, rowCount + 1), GridSpan::translatedDefiniteGridSpan(currentColumn, lookAheadColumn)));
    62536253        else {
    6254             GridCoordinate& gridCoordinate = gridAreaIterator->value;
     6254            GridArea& gridArea = gridAreaIterator->value;
    62556255
    62566256            // The following checks test that the grid area is a single filled-in rectangle.
    62576257            // 1. The new row is adjacent to the previously parsed row.
    6258             if (rowCount != gridCoordinate.rows.resolvedFinalPosition())
     6258            if (rowCount != gridArea.rows.resolvedFinalPosition())
    62596259                return false;
    62606260
    62616261            // 2. The new area starts at the same position as the previously parsed area.
    6262             if (currentColumn != gridCoordinate.columns.resolvedInitialPosition())
     6262            if (currentColumn != gridArea.columns.resolvedInitialPosition())
    62636263                return false;
    62646264
    62656265            // 3. The new area ends at the same position as the previously parsed area.
    6266             if (lookAheadColumn != gridCoordinate.columns.resolvedFinalPosition())
     6266            if (lookAheadColumn != gridArea.columns.resolvedFinalPosition())
    62676267                return false;
    62686268
    6269             gridCoordinate.rows = GridSpan::translatedDefiniteGridSpan(gridCoordinate.rows.resolvedInitialPosition(), gridCoordinate.rows.resolvedFinalPosition() + 1);
     6269            gridArea.rows = GridSpan::translatedDefiniteGridSpan(gridArea.rows.resolvedInitialPosition(), gridArea.rows.resolvedFinalPosition() + 1);
    62706270        }
    62716271        currentColumn = lookAheadColumn - 1;

  • trunk/Source/WebCore/css/CSSParser.h

    r196934 r198210  
    4444
    4545#if ENABLE(CSS_GRID_LAYOUT)
    46 #include "GridCoordinate.h"
     46#include "GridArea.h"
    4747#endif
    4848

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

    r198207 r198210  
    3030#if ENABLE(CSS_GRID_LAYOUT)
    3131
    32 #include "GridCoordinate.h"
     32#include "GridArea.h"
    3333#include "GridPositionsResolver.h"
    3434#include "LayoutRepainter.h"
    … …  
    178178    }
    179179
    180     std::unique_ptr<GridCoordinate> nextEmptyGridArea(unsigned fixedTrackSpan, unsigned varyingTrackSpan)
     180    std::unique_ptr<GridArea> nextEmptyGridArea(unsigned fixedTrackSpan, unsigned varyingTrackSpan)
    181181    {
    182182        ASSERT(fixedTrackSpan >= 1 && varyingTrackSpan >= 1);
    … …  
    192192        for (; varyingTrackIndex < endOfVaryingTrackIndex; ++varyingTrackIndex) {
    193193            if (isEmptyAreaEnough(rowSpan, columnSpan)) {
    194                 std::unique_ptr<GridCoordinate> result = std::make_unique<GridCoordinate>(GridSpan::translatedDefiniteGridSpan(m_rowIndex, m_rowIndex + rowSpan), GridSpan::translatedDefiniteGridSpan(m_columnIndex, m_columnIndex + columnSpan));
     194                std::unique_ptr<GridArea> result = std::make_unique<GridArea>(GridSpan::translatedDefiniteGridSpan(m_rowIndex, m_rowIndex + rowSpan), GridSpan::translatedDefiniteGridSpan(m_columnIndex, m_columnIndex + columnSpan));
    195195                // Advance the iterator to avoid an infinite loop where we would return the same grid area over and over.
    196196                ++varyingTrackIndex;
    … …  
    11401140}
    11411141
    1142 void RenderGrid::insertItemIntoGrid(RenderBox& child, const GridCoordinate& coordinate)
    1143 {
    1144     ASSERT(coordinate.rows.isTranslatedDefinite() && coordinate.columns.isTranslatedDefinite());
    1145     ensureGridSize(coordinate.rows.resolvedFinalPosition(), coordinate.columns.resolvedFinalPosition());
    1146 
    1147     for (auto row : coordinate.rows) {
    1148         for (auto column : coordinate.columns)
     1142void RenderGrid::insertItemIntoGrid(RenderBox& child, const GridArea& area)
     1143{
     1144    ASSERT(area.rows.isTranslatedDefinite() && area.columns.isTranslatedDefinite());
     1145    ensureGridSize(area.rows.resolvedFinalPosition(), area.columns.resolvedFinalPosition());
     1146
     1147    for (auto row : area.rows) {
     1148        for (auto column : area.columns)
    11491149            m_grid[row][column].append(&child);
    11501150    }
    … …  
    11541154{
    11551155    ASSERT(!gridWasPopulated());
    1156     ASSERT(m_gridItemCoordinate.isEmpty());
     1156    ASSERT(m_gridItemArea.isEmpty());
    11571157
    11581158    populateExplicitGridAndOrderIterator();
    … …  
    11641164            continue;
    11651165
    1166         GridCoordinate coordinate = cachedGridCoordinate(*child);
    1167         if (!coordinate.rows.isIndefinite())
    1168             coordinate.rows.translate(std::abs(m_smallestRowStart));
    1169         if (!coordinate.columns.isIndefinite())
    1170             coordinate.columns.translate(std::abs(m_smallestColumnStart));
    1171         m_gridItemCoordinate.set(child, coordinate);
    1172 
    1173         if (coordinate.rows.isIndefinite() || coordinate.columns.isIndefinite()) {
     1166        GridArea area = cachedGridArea(*child);
     1167        if (!area.rows.isIndefinite())
     1168            area.rows.translate(std::abs(m_smallestRowStart));
     1169        if (!area.columns.isIndefinite())
     1170            area.columns.translate(std::abs(m_smallestColumnStart));
     1171        m_gridItemArea.set(child, area);
     1172
     1173        if (area.rows.isIndefinite() || area.columns.isIndefinite()) {
    11741174            bool majorAxisDirectionIsForColumns = autoPlacementMajorAxisDirection() == ForColumns;
    1175             if ((majorAxisDirectionIsForColumns && coordinate.columns.isIndefinite())
    1176                 || (!majorAxisDirectionIsForColumns && coordinate.rows.isIndefinite()))
     1175            if ((majorAxisDirectionIsForColumns && area.columns.isIndefinite())
     1176                || (!majorAxisDirectionIsForColumns && area.rows.isIndefinite()))
    11771177                autoMajorAxisAutoGridItems.append(child);
    11781178            else
    … …  
    11801180            continue;
    11811181        }
    1182         insertItemIntoGrid(*child, GridCoordinate(coordinate.rows, coordinate.columns));
     1182        insertItemIntoGrid(*child, GridArea(area.rows, area.columns));
    11831183    }
    11841184
    … …  
    11941194            continue;
    11951195
    1196         GridCoordinate coordinate = cachedGridCoordinate(*child);
    1197         ASSERT(coordinate.rows.isTranslatedDefinite() && coordinate.columns.isTranslatedDefinite());
     1196        GridArea area = cachedGridArea(*child);
     1197        ASSERT(area.rows.isTranslatedDefinite() && area.columns.isTranslatedDefinite());
    11981198    }
    11991199#endif
    … …  
    12331233        }
    12341234
    1235         m_gridItemCoordinate.set(child, GridCoordinate(rowPositions, columnPositions));
     1235        m_gridItemArea.set(child, GridArea(rowPositions, columnPositions));
    12361236    }
    12371237
    … …  
    12411241}
    12421242
    1243 std::unique_ptr<GridCoordinate> RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox& gridItem, GridTrackSizingDirection specifiedDirection, const GridSpan& specifiedPositions) const
     1243std::unique_ptr<GridArea> RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox& gridItem, GridTrackSizingDirection specifiedDirection, const GridSpan& specifiedPositions) const
    12441244{
    12451245    GridTrackSizingDirection crossDirection = specifiedDirection == ForColumns ? ForRows : ForColumns;
    … …  
    12471247    unsigned crossDirectionSpanSize = GridPositionsResolver::spanSizeForAutoPlacedItem(style(), gridItem, crossDirection);
    12481248    GridSpan crossDirectionPositions = GridSpan::translatedDefiniteGridSpan(endOfCrossDirection, endOfCrossDirection + crossDirectionSpanSize);
    1249     return std::make_unique<GridCoordinate>(specifiedDirection == ForColumns ? crossDirectionPositions : specifiedPositions, specifiedDirection == ForColumns ? specifiedPositions : crossDirectionPositions);
     1249    return std::make_unique<GridArea>(specifiedDirection == ForColumns ? crossDirectionPositions : specifiedPositions, specifiedDirection == ForColumns ? specifiedPositions : crossDirectionPositions);
    12501250}
    12511251
    … …  
    12681268
    12691269        GridIterator iterator(m_grid, autoPlacementMajorAxisDirection(), majorAxisPositions.resolvedInitialPosition(), isGridAutoFlowDense ? 0 : minorAxisCursors.get(majorAxisInitialPosition));
    1270         std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea(majorAxisPositions.integerSpan(), minorAxisSpanSize);
     1270        std::unique_ptr<GridArea> emptyGridArea = iterator.nextEmptyGridArea(majorAxisPositions.integerSpan(), minorAxisSpanSize);
    12711271        if (!emptyGridArea)
    12721272            emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(*autoGridItem, autoPlacementMajorAxisDirection(), majorAxisPositions);
    12731273
    1274         m_gridItemCoordinate.set(autoGridItem, *emptyGridArea);
     1274        m_gridItemArea.set(autoGridItem, *emptyGridArea);
    12751275        insertItemIntoGrid(*autoGridItem, *emptyGridArea);
    12761276
    … …  
    13041304    unsigned minorAxisAutoPlacementCursor = autoPlacementMajorAxisDirection() == ForColumns ? autoPlacementCursor.first : autoPlacementCursor.second;
    13051305
    1306     std::unique_ptr<GridCoordinate> emptyGridArea;
     1306    std::unique_ptr<GridArea> emptyGridArea;
    13071307    GridSpan minorAxisPositions = cachedGridSpan(gridItem, autoPlacementMinorAxisDirection());
    13081308    if (minorAxisPositions.isTranslatedDefinite()) {
    … …  
    13451345    }
    13461346
    1347     m_gridItemCoordinate.set(&gridItem, *emptyGridArea);
     1347    m_gridItemArea.set(&gridItem, *emptyGridArea);
    13481348    insertItemIntoGrid(gridItem, *emptyGridArea);
    13491349    autoPlacementCursor.first = emptyGridArea->rows.resolvedInitialPosition();
    … …  
    13641364{
    13651365    m_grid.clear();
    1366     m_gridItemCoordinate.clear();
     1366    m_gridItemArea.clear();
    13671367}
    13681368
    … …  
    15431543}
    15441544
    1545 GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox& gridItem) const
    1546 {
    1547     ASSERT(m_gridItemCoordinate.contains(&gridItem));
    1548     return m_gridItemCoordinate.get(&gridItem);
     1545GridArea RenderGrid::cachedGridArea(const RenderBox& gridItem) const
     1546{
     1547    ASSERT(m_gridItemArea.contains(&gridItem));
     1548    return m_gridItemArea.get(&gridItem);
    15491549}
    15501550
    15511551GridSpan RenderGrid::cachedGridSpan(const RenderBox& gridItem, GridTrackSizingDirection direction) const
    15521552{
    1553     GridCoordinate coordinate = cachedGridCoordinate(gridItem);
    1554     return direction == ForColumns ? coordinate.columns : coordinate.rows;
     1553    GridArea area = cachedGridArea(gridItem);
     1554    return direction == ForColumns ? area.columns : area.rows;
    15551555}
    15561556

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

    r198207 r198210  
    3636namespace WebCore {
    3737
    38 class GridCoordinate;
     38class GridArea;
    3939class GridSpan;
    4040class GridTrack;
    … …  
    7878
    7979    void ensureGridSize(unsigned maximumRowSize, unsigned maximumColumnSize);
    80     void insertItemIntoGrid(RenderBox&, const GridCoordinate&);
     80    void insertItemIntoGrid(RenderBox&, const GridArea&);
    8181    void placeItemsOnGrid();
    8282    void populateExplicitGridAndOrderIterator();
    83     std::unique_ptr<GridCoordinate> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox&, GridTrackSizingDirection, const GridSpan&) const;
     83    std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox&, GridTrackSizingDirection, const GridSpan&) const;
    8484    void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
    8585    void placeAutoMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
    … …  
    141141    ContentAlignmentData computeContentPositionAndDistributionOffset(GridTrackSizingDirection, const LayoutUnit& availableFreeSpace, unsigned numberOfGridTracks) const;
    142142    LayoutPoint findChildLogicalPosition(const RenderBox&) const;
    143     GridCoordinate cachedGridCoordinate(const RenderBox&) const;
     143    GridArea cachedGridArea(const RenderBox&) const;
    144144    GridSpan cachedGridSpan(const RenderBox&, GridTrackSizingDirection) const;
    145145
    … …  
    186186    Vector<LayoutUnit> m_columnPositions;
    187187    Vector<LayoutUnit> m_rowPositions;
    188     HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;
     188    HashMap<const RenderBox*, GridArea> m_gridItemArea;
    189189    OrderIterator m_orderIterator;
    190190

  • trunk/Source/WebCore/rendering/style/GridArea.h

    r198209 r198210  
    11/*
    22 * Copyright (C) 2013 Google Inc. All rights reserved.
    3  * Copyright (C) 2013, 2014 Igalia S.L.
     3 * Copyright (C) 2013, 2014, 2016 Igalia S.L.
    44 *
    55 * Redistribution and use in source and binary forms, with or without
    … …  
    3030 */
    3131
    32 #ifndef GridCoordinate_h
    33 #define GridCoordinate_h
     32#ifndef GridArea_h
     33#define GridArea_h
    3434
    3535#if ENABLE(CSS_GRID_LAYOUT)
    … …  
    175175
    176176// This represents a grid area that spans in both rows' and columns' direction.
    177 class GridCoordinate {
     177class GridArea {
    178178public:
    179179    // HashMap requires a default constuctor.
    180     GridCoordinate()
     180    GridArea()
    181181        : columns(GridSpan::indefiniteGridSpan())
    182182        , rows(GridSpan::indefiniteGridSpan())
    … …  
    184184    }
    185185
    186     GridCoordinate(const GridSpan& r, const GridSpan& c)
     186    GridArea(const GridSpan& r, const GridSpan& c)
    187187        : columns(c)
    188188        , rows(r)
    … …  
    190190    }
    191191
    192     bool operator==(const GridCoordinate& o) const
     192    bool operator==(const GridArea& o) const
    193193    {
    194194        return columns == o.columns && rows == o.rows;
    195195    }
    196196
    197     bool operator!=(const GridCoordinate& o) const
     197    bool operator!=(const GridArea& o) const
    198198    {
    199199        return !(*this == o);
    … …  
    204204};
    205205
    206 typedef HashMap<String, GridCoordinate> NamedGridAreaMap;
     206typedef HashMap<String, GridArea> NamedGridAreaMap;
    207207
    208208} // namespace WebCore
    … …  
    210210#endif /* ENABLE(CSS_GRID_LAYOUT) */
    211211
    212 #endif // GridCoordinate_h
     212#endif // GridArea_h

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

    r198207 r198210  
    3434#if ENABLE(CSS_GRID_LAYOUT)
    3535
    36 #include "GridCoordinate.h"
     36#include "GridArea.h"
    3737#include "RenderBox.h"
    3838#include <cstdlib>

  • trunk/Source/WebCore/rendering/style/StyleGridData.h

    r190663 r198210  
    2929#if ENABLE(CSS_GRID_LAYOUT)
    3030
    31 #include "GridCoordinate.h"
     31#include "GridArea.h"
    3232#include "GridTrackSize.h"
    3333#include "RenderStyleConstants.h"
Note: See TracChangeset for help on using the changeset viewer.