| 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 LayoutState state(*this, locationOffset()); | 281 LayoutState state(*this, locationOffset()); |
| 282 | 282 |
| 283 m_numberOfInFlowChildrenOnFirstLine = -1; | 283 m_numberOfInFlowChildrenOnFirstLine = -1; |
| 284 | 284 |
| 285 LayoutBlock::startDelayUpdateScrollInfo(); | 285 LayoutBlock::startDelayUpdateScrollInfo(); |
| 286 | 286 |
| 287 prepareOrderIteratorAndMargins(); | 287 prepareOrderIteratorAndMargins(); |
| 288 | 288 |
| 289 layoutFlexItems(relayoutChildren, layoutScope); | 289 layoutFlexItems(relayoutChildren, layoutScope); |
| 290 | 290 |
| 291 LayoutBlock::finishDelayUpdateScrollInfo(); | 291 if (LayoutBlock::finishDelayUpdateScrollInfo(&layoutScope)) |
| 292 layoutFlexItems(false, layoutScope); |
| 292 | 293 |
| 293 if (logicalHeight() != previousHeight) | 294 if (logicalHeight() != previousHeight) |
| 294 relayoutChildren = true; | 295 relayoutChildren = true; |
| 295 | 296 |
| 296 layoutPositionedObjects(relayoutChildren || isDocumentElement()); | 297 layoutPositionedObjects(relayoutChildren || isDocumentElement()); |
| 297 | 298 |
| 298 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva
lidations for more overflow than it needs to. | 299 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva
lidations for more overflow than it needs to. |
| 299 computeOverflow(clientLogicalBottomAfterRepositioning()); | 300 computeOverflow(clientLogicalBottomAfterRepositioning()); |
| 300 } | 301 } |
| 301 | 302 |
| (...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1661 ASSERT(child); | 1662 ASSERT(child); |
| 1662 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1663 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1663 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1664 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1664 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1665 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1665 adjustAlignmentForChild(*child, newOffset - originalOffset); | 1666 adjustAlignmentForChild(*child, newOffset - originalOffset); |
| 1666 } | 1667 } |
| 1667 } | 1668 } |
| 1668 } | 1669 } |
| 1669 | 1670 |
| 1670 } // namespace blink | 1671 } // namespace blink |
| OLD | NEW |