Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: third_party/WebKit/Source/core/style/GridPositionsResolver.cpp

Issue 1648333002: [css-grid] Rename GridCoordinate to GridArea (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "GridPositionsResolver.h" 5 #include "GridPositionsResolver.h"
6 6
7 #include "core/layout/LayoutBox.h" 7 #include "core/layout/LayoutBox.h"
8 #include "core/style/GridCoordinate.h" 8 #include "core/style/GridArea.h"
9 #include <algorithm> 9 #include <algorithm>
10 10
11 namespace blink { 11 namespace blink {
12 12
13 static const NamedGridLinesMap& gridLinesForSide(const ComputedStyle& style, Gri dPositionSide side) 13 static const NamedGridLinesMap& gridLinesForSide(const ComputedStyle& style, Gri dPositionSide side)
14 { 14 {
15 return (side == ColumnStartSide || side == ColumnEndSide) ? style.namedGridC olumnLines() : style.namedGridRowLines(); 15 return (side == ColumnStartSide || side == ColumnEndSide) ? style.namedGridC olumnLines() : style.namedGridRowLines();
16 } 16 }
17 17
18 static inline String implicitNamedGridLineForSide(const String& lineName, GridPo sitionSide side) 18 static inline String implicitNamedGridLineForSide(const String& lineName, GridPo sitionSide side)
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 if (resolvedFinalPosition < resolvedInitialPosition) 292 if (resolvedFinalPosition < resolvedInitialPosition)
293 std::swap(resolvedFinalPosition, resolvedInitialPosition); 293 std::swap(resolvedFinalPosition, resolvedInitialPosition);
294 else if (resolvedFinalPosition == resolvedInitialPosition) 294 else if (resolvedFinalPosition == resolvedInitialPosition)
295 resolvedFinalPosition = resolvedInitialPosition + 1; 295 resolvedFinalPosition = resolvedInitialPosition + 1;
296 296
297 return GridSpan::untranslatedDefiniteGridSpan(resolvedInitialPosition, resol vedFinalPosition); 297 return GridSpan::untranslatedDefiniteGridSpan(resolvedInitialPosition, resol vedFinalPosition);
298 } 298 }
299 299
300 } // namespace blink 300 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/GridCoordinate.h ('k') | third_party/WebKit/Source/core/style/StyleGridData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698