| 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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1301 // FIXME: If we get here in columns, we want the use the descent
, except we currently can't get the ascent/descent of orthogonal children. | 1301 // FIXME: If we get here in columns, we want the use the descent
, except we currently can't get the ascent/descent of orthogonal children. |
| 1302 // https://bugs.webkit.org/show_bug.cgi?id=98076 | 1302 // https://bugs.webkit.org/show_bug.cgi?id=98076 |
| 1303 LayoutUnit ascent = marginBoxAscentForChild(child); | 1303 LayoutUnit ascent = marginBoxAscentForChild(child); |
| 1304 LayoutUnit startOffset = maxAscent - ascent; | 1304 LayoutUnit startOffset = maxAscent - ascent; |
| 1305 adjustAlignmentForChild(child, startOffset); | 1305 adjustAlignmentForChild(child, startOffset); |
| 1306 | 1306 |
| 1307 if (style()->flexWrap() == FlexWrapReverse) | 1307 if (style()->flexWrap() == FlexWrapReverse) |
| 1308 minMarginAfterBaseline = std::min(minMarginAfterBaseline, av
ailableAlignmentSpaceForChild(lineCrossAxisExtent, child) - startOffset); | 1308 minMarginAfterBaseline = std::min(minMarginAfterBaseline, av
ailableAlignmentSpaceForChild(lineCrossAxisExtent, child) - startOffset); |
| 1309 break; | 1309 break; |
| 1310 } | 1310 } |
| 1311 case ItemPositionLastBaseline: |
| 1311 case ItemPositionSelfStart: | 1312 case ItemPositionSelfStart: |
| 1312 case ItemPositionSelfEnd: | 1313 case ItemPositionSelfEnd: |
| 1313 case ItemPositionStart: | 1314 case ItemPositionStart: |
| 1314 case ItemPositionEnd: | 1315 case ItemPositionEnd: |
| 1315 case ItemPositionLeft: | 1316 case ItemPositionLeft: |
| 1316 case ItemPositionRight: | 1317 case ItemPositionRight: |
| 1317 // FIXME: File a bug about implementing that. The extended gramm
ar | 1318 // FIXME: File a bug about implementing that. The extended gramm
ar |
| 1318 // is not enabled by default so we shouldn't hit this codepath. | 1319 // is not enabled by default so we shouldn't hit this codepath. |
| 1319 ASSERT_NOT_REACHED(); | 1320 ASSERT_NOT_REACHED(); |
| 1320 break; | 1321 break; |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1396 ASSERT(child); | 1397 ASSERT(child); |
| 1397 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1398 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1398 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1399 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1399 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1400 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1400 adjustAlignmentForChild(child, newOffset - originalOffset); | 1401 adjustAlignmentForChild(child, newOffset - originalOffset); |
| 1401 } | 1402 } |
| 1402 } | 1403 } |
| 1403 } | 1404 } |
| 1404 | 1405 |
| 1405 } | 1406 } |
| OLD | NEW |