| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 | 249 |
| 250 layoutFlexItems(relayoutChildren); | 250 layoutFlexItems(relayoutChildren); |
| 251 | 251 |
| 252 RenderBlock::finishDelayUpdateScrollInfo(); | 252 RenderBlock::finishDelayUpdateScrollInfo(); |
| 253 | 253 |
| 254 if (logicalHeight() != previousHeight) | 254 if (logicalHeight() != previousHeight) |
| 255 relayoutChildren = true; | 255 relayoutChildren = true; |
| 256 | 256 |
| 257 layoutPositionedObjects(relayoutChildren || isDocumentElement()); | 257 layoutPositionedObjects(relayoutChildren || isDocumentElement()); |
| 258 | 258 |
| 259 computeRegionRangeForBlock(flowThreadContainingBlock()); | |
| 260 | |
| 261 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva
lidations for more overflow than it needs to. | 259 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva
lidations for more overflow than it needs to. |
| 262 computeOverflow(clientLogicalBottomAfterRepositioning()); | 260 computeOverflow(clientLogicalBottomAfterRepositioning()); |
| 263 } | 261 } |
| 264 | 262 |
| 265 updateLayerTransformAfterLayout(); | 263 updateLayerTransformAfterLayout(); |
| 266 | 264 |
| 267 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 265 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
| 268 // we overflow or not. | 266 // we overflow or not. |
| 269 updateScrollInfoAfterLayout(); | 267 updateScrollInfoAfterLayout(); |
| 270 | 268 |
| (...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1402 ASSERT(child); | 1400 ASSERT(child); |
| 1403 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1401 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1404 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1402 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1405 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1403 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1406 adjustAlignmentForChild(child, newOffset - originalOffset); | 1404 adjustAlignmentForChild(child, newOffset - originalOffset); |
| 1407 } | 1405 } |
| 1408 } | 1406 } |
| 1409 } | 1407 } |
| 1410 | 1408 |
| 1411 } | 1409 } |
| OLD | NEW |