| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 | 237 |
| 238 if (updateLogicalWidthAndColumnWidth()) | 238 if (updateLogicalWidthAndColumnWidth()) |
| 239 relayoutChildren = true; | 239 relayoutChildren = true; |
| 240 | 240 |
| 241 LayoutUnit previousHeight = logicalHeight(); | 241 LayoutUnit previousHeight = logicalHeight(); |
| 242 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight())
; | 242 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight())
; |
| 243 | 243 |
| 244 { | 244 { |
| 245 LayoutStateMaintainer statePusher(*this, locationOffset()); | 245 LayoutStateMaintainer statePusher(*this, locationOffset()); |
| 246 | 246 |
| 247 RenderFlowThread* flowThread = flowThreadContainingBlock(); | |
| 248 if (updateRegionsAndShapesLogicalSize(flowThread)) | |
| 249 relayoutChildren = true; | |
| 250 | |
| 251 m_numberOfInFlowChildrenOnFirstLine = -1; | 247 m_numberOfInFlowChildrenOnFirstLine = -1; |
| 252 | 248 |
| 253 RenderBlock::startDelayUpdateScrollInfo(); | 249 RenderBlock::startDelayUpdateScrollInfo(); |
| 254 | 250 |
| 255 prepareOrderIteratorAndMargins(); | 251 prepareOrderIteratorAndMargins(); |
| 256 | 252 |
| 257 ChildFrameRects oldChildRects; | 253 ChildFrameRects oldChildRects; |
| 258 appendChildFrameRects(oldChildRects); | 254 appendChildFrameRects(oldChildRects); |
| 259 | 255 |
| 260 layoutFlexItems(relayoutChildren); | 256 layoutFlexItems(relayoutChildren); |
| 261 | 257 |
| 262 RenderBlock::finishDelayUpdateScrollInfo(); | 258 RenderBlock::finishDelayUpdateScrollInfo(); |
| 263 | 259 |
| 264 if (logicalHeight() != previousHeight) | 260 if (logicalHeight() != previousHeight) |
| 265 relayoutChildren = true; | 261 relayoutChildren = true; |
| 266 | 262 |
| 267 layoutPositionedObjects(relayoutChildren || isRoot()); | 263 layoutPositionedObjects(relayoutChildren || isRoot()); |
| 268 | 264 |
| 269 computeRegionRangeForBlock(flowThread); | 265 computeRegionRangeForBlock(flowThreadContainingBlock()); |
| 270 | 266 |
| 271 repaintChildrenDuringLayoutIfMoved(oldChildRects); | 267 repaintChildrenDuringLayoutIfMoved(oldChildRects); |
| 272 // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more ove
rflow than it needs to. | 268 // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more ove
rflow than it needs to. |
| 273 computeOverflow(clientLogicalBottomAfterRepositioning()); | 269 computeOverflow(clientLogicalBottomAfterRepositioning()); |
| 274 } | 270 } |
| 275 | 271 |
| 276 updateLayerTransform(); | 272 updateLayerTransform(); |
| 277 | 273 |
| 278 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 274 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
| 279 // we overflow or not. | 275 // we overflow or not. |
| (...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1403 ASSERT(child); | 1399 ASSERT(child); |
| 1404 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1400 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1405 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1401 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1406 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1402 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1407 adjustAlignmentForChild(child, newOffset - originalOffset); | 1403 adjustAlignmentForChild(child, newOffset - originalOffset); |
| 1408 } | 1404 } |
| 1409 } | 1405 } |
| 1410 } | 1406 } |
| 1411 | 1407 |
| 1412 } | 1408 } |
| OLD | NEW |