| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 void RenderFlowThread::layout() | 127 void RenderFlowThread::layout() |
| 128 { | 128 { |
| 129 m_pageLogicalSizeChanged = m_regionsInvalidated && everHadLayout(); | 129 m_pageLogicalSizeChanged = m_regionsInvalidated && everHadLayout(); |
| 130 | 130 |
| 131 validateRegions(); | 131 validateRegions(); |
| 132 | 132 |
| 133 CurrentRenderFlowThreadMaintainer currentFlowThreadSetter(this); | 133 CurrentRenderFlowThreadMaintainer currentFlowThreadSetter(this); |
| 134 RenderBlockFlow::layout(); | 134 RenderBlockFlow::layout(); |
| 135 | 135 |
| 136 m_pageLogicalSizeChanged = false; | 136 m_pageLogicalSizeChanged = false; |
| 137 | |
| 138 if (lastRegion()) | |
| 139 lastRegion()->expandToEncompassFlowThreadContentsIfNeeded(); | |
| 140 } | 137 } |
| 141 | 138 |
| 142 void RenderFlowThread::updateLogicalWidth() | 139 void RenderFlowThread::updateLogicalWidth() |
| 143 { | 140 { |
| 144 setLogicalWidth(initialLogicalWidth()); | 141 setLogicalWidth(initialLogicalWidth()); |
| 145 } | 142 } |
| 146 | 143 |
| 147 void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L
ogicalExtentComputedValues& computedValues) const | 144 void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L
ogicalExtentComputedValues& computedValues) const |
| 148 { | 145 { |
| 149 computedValues.m_position = logicalTop; | 146 computedValues.m_position = logicalTop; |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 { | 545 { |
| 549 if (!m_renderFlowThread) | 546 if (!m_renderFlowThread) |
| 550 return; | 547 return; |
| 551 RenderView* view = m_renderFlowThread->view(); | 548 RenderView* view = m_renderFlowThread->view(); |
| 552 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 549 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 553 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 550 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 554 } | 551 } |
| 555 | 552 |
| 556 | 553 |
| 557 } // namespace WebCore | 554 } // namespace WebCore |
| OLD | NEW |