Index: Source/core/rendering/RenderGrid.cpp |
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
index 29f9c2cc9d1a95471008886f5133d690797ba967..cfbd888e7c2e97fff4cd56da3716ebb54c8e3216 100644 |
--- a/Source/core/rendering/RenderGrid.cpp |
+++ b/Source/core/rendering/RenderGrid.cpp |
@@ -29,6 +29,7 @@ |
#include "core/rendering/LayoutRepainter.h" |
#include "core/rendering/RenderLayer.h" |
#include "core/rendering/RenderView.h" |
+#include "core/rendering/style/GridCoordinate.h" |
namespace WebCore { |
@@ -808,20 +809,20 @@ void RenderGrid::layoutGridItems() |
clearGrid(); |
} |
-RenderGrid::GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox* gridItem) const |
+GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox* gridItem) const |
{ |
ASSERT(m_gridItemCoordinate.contains(gridItem)); |
return m_gridItemCoordinate.get(gridItem); |
} |
-RenderGrid::GridSpan RenderGrid::resolveGridPositionsFromAutoPlacementPosition(const RenderBox*, TrackSizingDirection, size_t initialPosition) const |
+GridSpan RenderGrid::resolveGridPositionsFromAutoPlacementPosition(const RenderBox*, TrackSizingDirection, size_t initialPosition) const |
{ |
// FIXME: We don't support spanning with auto positions yet. Once we do, this is wrong. Also we should make |
// sure the grid can accomodate the new item as we only grow 1 position in a given direction. |
return GridSpan(initialPosition, initialPosition); |
} |
-PassOwnPtr<RenderGrid::GridSpan> RenderGrid::resolveGridPositionsFromStyle(const RenderBox* gridItem, TrackSizingDirection direction) const |
+PassOwnPtr<GridSpan> RenderGrid::resolveGridPositionsFromStyle(const RenderBox* gridItem, TrackSizingDirection direction) const |
{ |
const GridPosition& initialPosition = (direction == ForColumns) ? gridItem->style()->gridColumnStart() : gridItem->style()->gridRowStart(); |
const GridPositionSide initialPositionSide = (direction == ForColumns) ? ColumnStartSide : RowStartSide; |
@@ -927,7 +928,7 @@ size_t RenderGrid::resolveGridPositionFromStyle(const GridPosition& position, Gr |
return 0; |
} |
-PassOwnPtr<RenderGrid::GridSpan> RenderGrid::resolveGridPositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, GridPositionSide side) const |
+PassOwnPtr<GridSpan> RenderGrid::resolveGridPositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, GridPositionSide side) const |
{ |
if (position.isAuto()) |
return GridSpan::create(resolvedOppositePosition, resolvedOppositePosition); |