| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/style/GridResolvedPosition.h" | 6 #include "core/style/GridResolvedPosition.h" |
| 7 | 7 |
| 8 #include "core/layout/LayoutBox.h" | 8 #include "core/layout/LayoutBox.h" |
| 9 #include "core/style/GridCoordinate.h" | 9 #include "core/style/GridCoordinate.h" |
| 10 #include <algorithm> |
| 10 | 11 |
| 11 namespace blink { | 12 namespace blink { |
| 12 | 13 |
| 13 static const NamedGridLinesMap& gridLinesForSide(const ComputedStyle& style, Gri
dPositionSide side) | 14 static const NamedGridLinesMap& gridLinesForSide(const ComputedStyle& style, Gri
dPositionSide side) |
| 14 { | 15 { |
| 15 return (side == ColumnStartSide || side == ColumnEndSide) ? style.namedGridC
olumnLines() : style.namedGridRowLines(); | 16 return (side == ColumnStartSide || side == ColumnEndSide) ? style.namedGridC
olumnLines() : style.namedGridRowLines(); |
| 16 } | 17 } |
| 17 | 18 |
| 18 static inline String implicitNamedGridLineForSide(const String& lineName, GridPo
sitionSide side) | 19 static inline String implicitNamedGridLineForSide(const String& lineName, GridPo
sitionSide side) |
| 19 { | 20 { |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 296 |
| 296 if (resolvedFinalPosition < resolvedInitialPosition) | 297 if (resolvedFinalPosition < resolvedInitialPosition) |
| 297 std::swap(resolvedFinalPosition, resolvedInitialPosition); | 298 std::swap(resolvedFinalPosition, resolvedInitialPosition); |
| 298 else if (resolvedFinalPosition == resolvedInitialPosition) | 299 else if (resolvedFinalPosition == resolvedInitialPosition) |
| 299 resolvedFinalPosition = resolvedInitialPosition + 1; | 300 resolvedFinalPosition = resolvedInitialPosition + 1; |
| 300 | 301 |
| 301 return GridSpan::definiteGridSpan(resolvedInitialPosition, resolvedFinalPosi
tion); | 302 return GridSpan::definiteGridSpan(resolvedInitialPosition, resolvedFinalPosi
tion); |
| 302 } | 303 } |
| 303 | 304 |
| 304 } // namespace blink | 305 } // namespace blink |
| OLD | NEW |