| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 prepareOrderIteratorAndMargins(); | 232 prepareOrderIteratorAndMargins(); |
| 233 | 233 |
| 234 ChildFrameRects oldChildRects; | 234 ChildFrameRects oldChildRects; |
| 235 appendChildFrameRects(oldChildRects); | 235 appendChildFrameRects(oldChildRects); |
| 236 | 236 |
| 237 layoutFlexItems(relayoutChildren); | 237 layoutFlexItems(relayoutChildren); |
| 238 | 238 |
| 239 if (logicalHeight() != previousHeight) | 239 if (logicalHeight() != previousHeight) |
| 240 relayoutChildren = true; | 240 relayoutChildren = true; |
| 241 | 241 |
| 242 layoutPositionedObjects(relayoutChildren || isDocumentElement()); | 242 layoutPositionedObjects(relayoutChildren); |
| 243 | 243 |
| 244 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva
lidations for more overflow than it needs to. | 244 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva
lidations for more overflow than it needs to. |
| 245 computeOverflow(clientLogicalBottomAfterRepositioning()); | 245 computeOverflow(clientLogicalBottomAfterRepositioning()); |
| 246 } | 246 } |
| 247 | 247 |
| 248 updateLayerTransformAfterLayout(); | 248 updateLayerTransformAfterLayout(); |
| 249 | 249 |
| 250 clearNeedsLayout(); | 250 clearNeedsLayout(); |
| 251 } | 251 } |
| 252 | 252 |
| (...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1288 ASSERT(child); | 1288 ASSERT(child); |
| 1289 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1289 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1290 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1290 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1291 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1291 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1292 adjustAlignmentForChild(child, newOffset - originalOffset); | 1292 adjustAlignmentForChild(child, newOffset - originalOffset); |
| 1293 } | 1293 } |
| 1294 } | 1294 } |
| 1295 } | 1295 } |
| 1296 | 1296 |
| 1297 } | 1297 } |
| OLD | NEW |