| OLD | NEW |
| 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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1190 bool lineHasInFlowItem = false; | 1190 bool lineHasInFlowItem = false; |
| 1191 | 1191 |
| 1192 for (LayoutBox* child = m_orderIterator.currentChild(); child; child = m_ord
erIterator.next()) { | 1192 for (LayoutBox* child = m_orderIterator.currentChild(); child; child = m_ord
erIterator.next()) { |
| 1193 if (child->isOutOfFlowPositioned()) { | 1193 if (child->isOutOfFlowPositioned()) { |
| 1194 orderedChildren.append(child); | 1194 orderedChildren.append(child); |
| 1195 continue; | 1195 continue; |
| 1196 } | 1196 } |
| 1197 | 1197 |
| 1198 // If this condition is true, then computeMainAxisExtentForChild will ca
ll child.intrinsicContentLogicalHeight() | 1198 // If this condition is true, then computeMainAxisExtentForChild will ca
ll child.intrinsicContentLogicalHeight() |
| 1199 // and child.scrollbarLogicalHeight(), so if the child has intrinsic min
/max/preferred size, | 1199 // and child.scrollbarLogicalHeight(), so if the child has intrinsic min
/max/preferred size, |
| 1200 // run layout on it now to make sure its logical height and scroll bars
are up-to-date. | 1200 // run layout on it now to make sure its logical height and scroll bars
are up to date. |
| 1201 if (childHasIntrinsicMainAxisSize(*child) && child->needsLayout()) { | 1201 if (childHasIntrinsicMainAxisSize(*child) && child->needsLayout()) { |
| 1202 child->clearOverrideSize(); | 1202 child->clearOverrideSize(); |
| 1203 child->layoutIfNeeded(); | 1203 child->layoutIfNeeded(); |
| 1204 cacheChildMainSize(*child); | 1204 cacheChildMainSize(*child); |
| 1205 } | 1205 } |
| 1206 | 1206 |
| 1207 LayoutUnit childInnerFlexBaseSize = computeInnerFlexBaseSizeForChild(*ch
ild, relayoutChildren ? ForceLayout : LayoutIfNeeded); | 1207 LayoutUnit childInnerFlexBaseSize = computeInnerFlexBaseSizeForChild(*ch
ild, relayoutChildren ? ForceLayout : LayoutIfNeeded); |
| 1208 LayoutUnit childMainAxisMarginBorderPadding = mainAxisBorderAndPaddingEx
tentForChild(*child) | 1208 LayoutUnit childMainAxisMarginBorderPadding = mainAxisBorderAndPaddingEx
tentForChild(*child) |
| 1209 + (isHorizontalFlow() ? child->marginWidth() : child->marginHeight()
); | 1209 + (isHorizontalFlow() ? child->marginWidth() : child->marginHeight()
); |
| 1210 LayoutUnit childOuterFlexBaseSize = childInnerFlexBaseSize + childMainAx
isMarginBorderPadding; | 1210 LayoutUnit childOuterFlexBaseSize = childInnerFlexBaseSize + childMainAx
isMarginBorderPadding; |
| (...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1863 ASSERT(child); | 1863 ASSERT(child); |
| 1864 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1864 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1865 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1865 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1866 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1866 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1867 adjustAlignmentForChild(*child, newOffset - originalOffset); | 1867 adjustAlignmentForChild(*child, newOffset - originalOffset); |
| 1868 } | 1868 } |
| 1869 } | 1869 } |
| 1870 } | 1870 } |
| 1871 | 1871 |
| 1872 } // namespace blink | 1872 } // namespace blink |
| OLD | NEW |