Index: Source/core/rendering/style/GridResolvedPosition.cpp |
diff --git a/Source/core/rendering/style/GridResolvedPosition.cpp b/Source/core/rendering/style/GridResolvedPosition.cpp |
index 263ed15edfecf8063bd81eafc851cd2b5bdbf859..d30630b8f49035f84f2be062a868312f865c7a01 100644 |
--- a/Source/core/rendering/style/GridResolvedPosition.cpp |
+++ b/Source/core/rendering/style/GridResolvedPosition.cpp |
@@ -10,13 +10,6 @@ |
namespace WebCore { |
-GridSpan GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(const RenderBox&, GridTrackSizingDirection, const GridResolvedPosition& initialPosition) |
-{ |
- // 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); |
-} |
- |
static const NamedGridLinesMap& gridLinesForSide(const RenderStyle& style, GridPositionSide side) |
{ |
return (side == ColumnStartSide || side == ColumnEndSide) ? style.namedGridColumnLines() : style.namedGridRowLines(); |
@@ -27,12 +20,10 @@ static inline bool isNonExistentNamedLineOrArea(const String& lineName, const Re |
return !style.namedGridArea().contains(lineName) && !gridLinesForSide(style, side).contains(lineName); |
} |
-PassOwnPtr<GridSpan> GridResolvedPosition::resolveGridPositionsFromStyle(const RenderStyle& gridContainerStyle, const RenderBox& gridItem, GridTrackSizingDirection direction) |
+void GridResolvedPosition::initialAndFinalPositionsFromStyle(const RenderStyle& gridContainerStyle, const RenderBox& gridItem, GridTrackSizingDirection direction, GridPosition& initialPosition, const GridPositionSide initialPositionSide, GridPosition& finalPosition, const GridPositionSide finalPositionSide) |
Julien - ping for review
2014/05/29 21:07:00
I don't see what this refactoring gives us:
- the
|
{ |
- GridPosition initialPosition = (direction == ForColumns) ? gridItem.style()->gridColumnStart() : gridItem.style()->gridRowStart(); |
- const GridPositionSide initialPositionSide = (direction == ForColumns) ? ColumnStartSide : RowStartSide; |
- GridPosition finalPosition = (direction == ForColumns) ? gridItem.style()->gridColumnEnd() : gridItem.style()->gridRowEnd(); |
- const GridPositionSide finalPositionSide = (direction == ForColumns) ? ColumnEndSide : RowEndSide; |
+ initialPosition = (direction == ForColumns) ? gridItem.style()->gridColumnStart() : gridItem.style()->gridRowStart(); |
+ finalPosition = (direction == ForColumns) ? gridItem.style()->gridColumnEnd() : gridItem.style()->gridRowEnd(); |
// We must handle the placement error handling code here instead of in the StyleAdjuster because we don't want to |
// overwrite the specified values. |
@@ -44,6 +35,37 @@ PassOwnPtr<GridSpan> GridResolvedPosition::resolveGridPositionsFromStyle(const R |
if (finalPosition.isNamedGridArea() && isNonExistentNamedLineOrArea(finalPosition.namedGridLine(), gridContainerStyle, finalPositionSide)) |
finalPosition.setAutoPosition(); |
+} |
+ |
+PassOwnPtr<GridSpan> GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(const RenderStyle& gridContainerStyle, const RenderBox& gridItem, GridTrackSizingDirection direction, const GridResolvedPosition& resolvedInitialPosition) |
Julien - ping for review
2014/05/29 21:07:00
This function cannot return nullptr so we should m
|
+{ |
+ GridPosition initialPosition; |
+ const GridPositionSide initialPositionSide = (direction == ForColumns) ? ColumnStartSide : RowStartSide; |
+ GridPosition finalPosition; |
+ const GridPositionSide finalPositionSide = (direction == ForColumns) ? ColumnEndSide : RowEndSide; |
+ initialAndFinalPositionsFromStyle(gridContainerStyle, gridItem, direction, initialPosition, initialPositionSide, finalPosition, finalPositionSide); |
+ |
+ // This method will only be used when both positions need to be resolved against the opposite one. |
+ ASSERT(initialPosition.shouldBeResolvedAgainstOppositePosition() && finalPosition.shouldBeResolvedAgainstOppositePosition()); |
+ |
+ GridResolvedPosition resolvedFinalPosition = resolvedInitialPosition; |
+ |
+ if (initialPosition.isSpan()) { |
+ resolvedFinalPosition = resolveGridPositionAgainstOppositePosition(gridContainerStyle, resolvedInitialPosition, initialPosition, finalPositionSide)->resolvedFinalPosition; |
+ } else if (finalPosition.isSpan()) { |
+ resolvedFinalPosition = resolveGridPositionAgainstOppositePosition(gridContainerStyle, resolvedInitialPosition, finalPosition, finalPositionSide)->resolvedFinalPosition; |
+ } |
+ |
+ return adoptPtr(new GridSpan(resolvedInitialPosition, resolvedFinalPosition)); |
+} |
+ |
+PassOwnPtr<GridSpan> GridResolvedPosition::resolveGridPositionsFromStyle(const RenderStyle& gridContainerStyle, const RenderBox& gridItem, GridTrackSizingDirection direction) |
+{ |
+ GridPosition initialPosition; |
+ const GridPositionSide initialPositionSide = (direction == ForColumns) ? ColumnStartSide : RowStartSide; |
+ GridPosition finalPosition; |
+ const GridPositionSide finalPositionSide = (direction == ForColumns) ? ColumnEndSide : RowEndSide; |
+ initialAndFinalPositionsFromStyle(gridContainerStyle, gridItem, direction, initialPosition, initialPositionSide, finalPosition, finalPositionSide); |
if (initialPosition.shouldBeResolvedAgainstOppositePosition() && finalPosition.shouldBeResolvedAgainstOppositePosition()) { |
if (gridContainerStyle.gridAutoFlow() == AutoFlowNone) |