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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 | 389 |
390 m_relaidOutChildren.clear(); | 390 m_relaidOutChildren.clear(); |
391 | 391 |
392 if (updateLogicalWidthAndColumnWidth()) | 392 if (updateLogicalWidthAndColumnWidth()) |
393 relayoutChildren = true; | 393 relayoutChildren = true; |
394 | 394 |
395 SubtreeLayoutScope layoutScope(*this); | 395 SubtreeLayoutScope layoutScope(*this); |
396 LayoutUnit previousHeight = logicalHeight(); | 396 LayoutUnit previousHeight = logicalHeight(); |
397 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()); | 397 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()); |
398 | 398 |
399 PaintLayerScrollableArea::DelayScrollPositionClampScope delayClampScope; | 399 PaintLayerScrollableArea::DelayScrollOffsetClampScope delayClampScope; |
400 | 400 |
401 { | 401 { |
402 TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope); | 402 TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope); |
403 LayoutState state(*this, locationOffset()); | 403 LayoutState state(*this, locationOffset()); |
404 | 404 |
405 m_numberOfInFlowChildrenOnFirstLine = -1; | 405 m_numberOfInFlowChildrenOnFirstLine = -1; |
406 | 406 |
407 prepareOrderIteratorAndMargins(); | 407 prepareOrderIteratorAndMargins(); |
408 | 408 |
409 layoutFlexItems(relayoutChildren, layoutScope); | 409 layoutFlexItems(relayoutChildren, layoutScope); |
(...skipping 1875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2285 LayoutUnit originalOffset = | 2285 LayoutUnit originalOffset = |
2286 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; | 2286 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; |
2287 LayoutUnit newOffset = | 2287 LayoutUnit newOffset = |
2288 contentExtent - originalOffset - lineCrossAxisExtent; | 2288 contentExtent - originalOffset - lineCrossAxisExtent; |
2289 adjustAlignmentForChild(*child, newOffset - originalOffset); | 2289 adjustAlignmentForChild(*child, newOffset - originalOffset); |
2290 } | 2290 } |
2291 } | 2291 } |
2292 } | 2292 } |
2293 | 2293 |
2294 } // namespace blink | 2294 } // namespace blink |
OLD | NEW |