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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout()); | 235 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout()); |
236 | 236 |
237 if (updateLogicalWidthAndColumnWidth()) | 237 if (updateLogicalWidthAndColumnWidth()) |
238 relayoutChildren = true; | 238 relayoutChildren = true; |
239 | 239 |
240 LayoutUnit previousHeight = logicalHeight(); | 240 LayoutUnit previousHeight = logicalHeight(); |
241 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight())
; | 241 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight())
; |
242 | 242 |
243 { | 243 { |
244 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); | 244 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); |
245 LayoutStateMaintainer statePusher(*this, locationOffset()); | 245 LayoutState state(*this, locationOffset()); |
246 | 246 |
247 m_numberOfInFlowChildrenOnFirstLine = -1; | 247 m_numberOfInFlowChildrenOnFirstLine = -1; |
248 | 248 |
249 RenderBlock::startDelayUpdateScrollInfo(); | 249 RenderBlock::startDelayUpdateScrollInfo(); |
250 | 250 |
251 prepareOrderIteratorAndMargins(); | 251 prepareOrderIteratorAndMargins(); |
252 | 252 |
253 ChildFrameRects oldChildRects; | 253 ChildFrameRects oldChildRects; |
254 appendChildFrameRects(oldChildRects); | 254 appendChildFrameRects(oldChildRects); |
255 | 255 |
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1416 ASSERT(child); | 1416 ASSERT(child); |
1417 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1417 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
1418 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1418 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
1419 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1419 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
1420 adjustAlignmentForChild(child, newOffset - originalOffset); | 1420 adjustAlignmentForChild(child, newOffset - originalOffset); |
1421 } | 1421 } |
1422 } | 1422 } |
1423 } | 1423 } |
1424 | 1424 |
1425 } | 1425 } |
OLD | NEW |