| 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" | |
| 6 #include "core/style/GridResolvedPosition.h" | 5 #include "core/style/GridResolvedPosition.h" |
| 7 | 6 |
| 8 #include "core/layout/LayoutBox.h" | 7 #include "core/layout/LayoutBox.h" |
| 9 #include "core/style/GridCoordinate.h" | 8 #include "core/style/GridCoordinate.h" |
| 10 #include <algorithm> | 9 #include <algorithm> |
| 11 | 10 |
| 12 namespace blink { | 11 namespace blink { |
| 13 | 12 |
| 14 static const NamedGridLinesMap& gridLinesForSide(const ComputedStyle& style, Gri
dPositionSide side) | 13 static const NamedGridLinesMap& gridLinesForSide(const ComputedStyle& style, Gri
dPositionSide side) |
| 15 { | 14 { |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 | 295 |
| 297 if (resolvedFinalPosition < resolvedInitialPosition) | 296 if (resolvedFinalPosition < resolvedInitialPosition) |
| 298 std::swap(resolvedFinalPosition, resolvedInitialPosition); | 297 std::swap(resolvedFinalPosition, resolvedInitialPosition); |
| 299 else if (resolvedFinalPosition == resolvedInitialPosition) | 298 else if (resolvedFinalPosition == resolvedInitialPosition) |
| 300 resolvedFinalPosition = resolvedInitialPosition + 1; | 299 resolvedFinalPosition = resolvedInitialPosition + 1; |
| 301 | 300 |
| 302 return GridSpan::definiteGridSpan(resolvedInitialPosition, resolvedFinalPosi
tion); | 301 return GridSpan::definiteGridSpan(resolvedInitialPosition, resolvedFinalPosi
tion); |
| 303 } | 302 } |
| 304 | 303 |
| 305 } // namespace blink | 304 } // namespace blink |
| OLD | NEW |