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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

Issue 2411073002: [css-flexbox] Remove unnecessary call to adjustAlignmentForChild (Closed)
Patch Set: Created 4 years, 2 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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 2139 matching lines...) Expand 10 before | Expand all | Expand 10 after
2150 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent; 2150 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent;
2151 LayoutUnit maxAscent = lineContexts[lineNumber].maxAscent; 2151 LayoutUnit maxAscent = lineContexts[lineNumber].maxAscent;
2152 2152
2153 for (size_t childNumber = 0; 2153 for (size_t childNumber = 0;
2154 childNumber < lineContexts[lineNumber].numberOfChildren; 2154 childNumber < lineContexts[lineNumber].numberOfChildren;
2155 ++childNumber, child = m_orderIterator.next()) { 2155 ++childNumber, child = m_orderIterator.next()) {
2156 DCHECK(child); 2156 DCHECK(child);
2157 if (child == childToExclude) 2157 if (child == childToExclude)
2158 continue; 2158 continue;
2159 if (child->isOutOfFlowPositioned()) { 2159 if (child->isOutOfFlowPositioned()) {
2160 if (style()->flexWrap() == FlexWrapReverse)
2161 adjustAlignmentForChild(*child, lineCrossAxisExtent);
2162 continue; 2160 continue;
2163 } 2161 }
2164 2162
2165 if (updateAutoMarginsInCrossAxis( 2163 if (updateAutoMarginsInCrossAxis(
2166 *child, std::max(LayoutUnit(), availableAlignmentSpaceForChild( 2164 *child, std::max(LayoutUnit(), availableAlignmentSpaceForChild(
2167 lineCrossAxisExtent, *child)))) 2165 lineCrossAxisExtent, *child))))
2168 continue; 2166 continue;
2169 2167
2170 ItemPosition position = alignmentForChild(*child); 2168 ItemPosition position = alignmentForChild(*child);
2171 if (position == ItemPositionStretch) 2169 if (position == ItemPositionStretch)
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
2298 LayoutUnit originalOffset = 2296 LayoutUnit originalOffset =
2299 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 2297 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
2300 LayoutUnit newOffset = 2298 LayoutUnit newOffset =
2301 contentExtent - originalOffset - lineCrossAxisExtent; 2299 contentExtent - originalOffset - lineCrossAxisExtent;
2302 adjustAlignmentForChild(*child, newOffset - originalOffset); 2300 adjustAlignmentForChild(*child, newOffset - originalOffset);
2303 } 2301 }
2304 } 2302 }
2305 } 2303 }
2306 2304
2307 } // namespace blink 2305 } // 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