| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 bool done = false; | 302 bool done = false; |
| 303 LayoutUnit pageLogicalHeight = 0; | 303 LayoutUnit pageLogicalHeight = 0; |
| 304 while (!done) | 304 while (!done) |
| 305 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; | 305 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; |
| 306 } | 306 } |
| 307 | 307 |
| 308 inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
pageLogicalHeight, SubtreeLayoutScope& layoutScope) | 308 inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
pageLogicalHeight, SubtreeLayoutScope& layoutScope) |
| 309 { | 309 { |
| 310 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); | 310 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); |
| 311 | 311 |
| 312 LayoutUnit oldLeft = logicalLeft(); |
| 312 if (updateLogicalWidthAndColumnWidth()) | 313 if (updateLogicalWidthAndColumnWidth()) |
| 313 relayoutChildren = true; | 314 relayoutChildren = true; |
| 314 | 315 |
| 315 rebuildFloatsFromIntruding(); | 316 rebuildFloatsFromIntruding(); |
| 316 | 317 |
| 317 bool pageLogicalHeightChanged = false; | 318 bool pageLogicalHeightChanged = false; |
| 318 bool hasSpecifiedPageLogicalHeight = false; | 319 bool hasSpecifiedPageLogicalHeight = false; |
| 319 checkForPaginationLogicalHeightChange(pageLogicalHeight, pageLogicalHeightCh
anged, hasSpecifiedPageLogicalHeight); | 320 checkForPaginationLogicalHeightChange(pageLogicalHeight, pageLogicalHeightCh
anged, hasSpecifiedPageLogicalHeight); |
| 320 | 321 |
| 321 LayoutStateMaintainer statePusher(*this, locationOffset(), pageLogicalHeight
, pageLogicalHeightChanged, columnInfo()); | 322 LayoutStateMaintainer statePusher(*this, locationOffset(), pageLogicalHeight
, pageLogicalHeightChanged, columnInfo()); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 addOverhangingFloats(block, false); | 419 addOverhangingFloats(block, false); |
| 419 } | 420 } |
| 420 } | 421 } |
| 421 } | 422 } |
| 422 } | 423 } |
| 423 | 424 |
| 424 bool heightChanged = (previousHeight != newHeight); | 425 bool heightChanged = (previousHeight != newHeight); |
| 425 if (heightChanged) | 426 if (heightChanged) |
| 426 relayoutChildren = true; | 427 relayoutChildren = true; |
| 427 | 428 |
| 428 layoutPositionedObjects(relayoutChildren || isRoot()); | 429 layoutPositionedObjects(relayoutChildren || isRoot(), oldLeft != logicalLeft
() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout); |
| 429 | 430 |
| 430 updateRegionsAndShapesAfterChildLayout(flowThread, heightChanged); | 431 updateRegionsAndShapesAfterChildLayout(flowThread, heightChanged); |
| 431 | 432 |
| 432 // Add overflow from children (unless we're multi-column, since in that case
all our child overflow is clipped anyway). | 433 // Add overflow from children (unless we're multi-column, since in that case
all our child overflow is clipped anyway). |
| 433 computeOverflow(oldClientAfterEdge); | 434 computeOverflow(oldClientAfterEdge); |
| 434 | 435 |
| 435 statePusher.pop(); | 436 statePusher.pop(); |
| 436 | 437 |
| 437 fitBorderToLinesIfNeeded(); | 438 fitBorderToLinesIfNeeded(); |
| 438 | 439 |
| (...skipping 2393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2833 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
| 2833 { | 2834 { |
| 2834 if (m_rareData) | 2835 if (m_rareData) |
| 2835 return *m_rareData; | 2836 return *m_rareData; |
| 2836 | 2837 |
| 2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2838 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
| 2838 return *m_rareData; | 2839 return *m_rareData; |
| 2839 } | 2840 } |
| 2840 | 2841 |
| 2841 } // namespace WebCore | 2842 } // namespace WebCore |
| OLD | NEW |