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

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

Issue 1809143002: [css-grid] Fix wrong type in GridPositionsResolver method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grid-span-last-rename
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/GridArea.h" 8 #include "core/style/GridArea.h"
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // Negative positions are not allowed per the specification and should have been handled during parsing. 143 // Negative positions are not allowed per the specification and should have been handled during parsing.
144 ASSERT(position.spanPosition() > 0); 144 ASSERT(position.spanPosition() > 0);
145 145
146 const NamedGridLinesMap& gridLinesNames = gridLinesForSide(gridContainerStyl e, side); 146 const NamedGridLinesMap& gridLinesNames = gridLinesForSide(gridContainerStyl e, side);
147 NamedGridLinesMap::const_iterator it = gridLinesNames.find(position.namedGri dLine()); 147 NamedGridLinesMap::const_iterator it = gridLinesNames.find(position.namedGri dLine());
148 const Vector<size_t>* gridLines = it == gridLinesNames.end() ? nullptr : &it ->value; 148 const Vector<size_t>* gridLines = it == gridLinesNames.end() ? nullptr : &it ->value;
149 size_t lastLine = explicitGridSizeForSide(gridContainerStyle, side); 149 size_t lastLine = explicitGridSizeForSide(gridContainerStyle, side);
150 return definiteGridSpanWithNamedSpanAgainstOpposite(opossiteLine, position, side, gridLines, lastLine); 150 return definiteGridSpanWithNamedSpanAgainstOpposite(opossiteLine, position, side, gridLines, lastLine);
151 } 151 }
152 152
153 static GridSpan definiteGridSpanWithSpanAgainstOpposite(size_t opossiteLine, con st GridPosition& position, GridPositionSide side) 153 static GridSpan definiteGridSpanWithSpanAgainstOpposite(int opossiteLine, const GridPosition& position, GridPositionSide side)
rune 2016/03/17 18:30:16 oppositeLine ?
Manuel Rego 2016/03/18 09:40:02 Yeah, sure the typo should be fixed actually in: h
154 { 154 {
155 size_t positionOffset = position.spanPosition(); 155 size_t positionOffset = position.spanPosition();
156 if (side == ColumnStartSide || side == RowStartSide) 156 if (side == ColumnStartSide || side == RowStartSide)
157 return GridSpan::untranslatedDefiniteGridSpan(opossiteLine - positionOff set, opossiteLine); 157 return GridSpan::untranslatedDefiniteGridSpan(opossiteLine - positionOff set, opossiteLine);
158 158
159 return GridSpan::untranslatedDefiniteGridSpan(opossiteLine, opossiteLine + p ositionOffset); 159 return GridSpan::untranslatedDefiniteGridSpan(opossiteLine, opossiteLine + p ositionOffset);
160 } 160 }
161 161
162 static GridSpan resolveGridPositionAgainstOppositePosition(const ComputedStyle& gridContainerStyle, int opossiteLine, const GridPosition& position, GridPosition Side side) 162 static GridSpan resolveGridPositionAgainstOppositePosition(const ComputedStyle& gridContainerStyle, int opossiteLine, const GridPosition& position, GridPosition Side side)
163 { 163 {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 if (endLine < startLine) 292 if (endLine < startLine)
293 std::swap(endLine, startLine); 293 std::swap(endLine, startLine);
294 else if (endLine == startLine) 294 else if (endLine == startLine)
295 endLine = startLine + 1; 295 endLine = startLine + 1;
296 296
297 return GridSpan::untranslatedDefiniteGridSpan(startLine, endLine); 297 return GridSpan::untranslatedDefiniteGridSpan(startLine, endLine);
298 } 298 }
299 299
300 } // namespace blink 300 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698