| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 } | 121 } |
| 122 | 122 |
| 123 updateLogicalWidth(); // Called to get the maximum logical width for the reg
ion. | 123 updateLogicalWidth(); // Called to get the maximum logical width for the reg
ion. |
| 124 updateRegionsFlowThreadPortionRect(); | 124 updateRegionsFlowThreadPortionRect(); |
| 125 } | 125 } |
| 126 | 126 |
| 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(); | |
| 132 | |
| 133 CurrentRenderFlowThreadMaintainer currentFlowThreadSetter(this); | 131 CurrentRenderFlowThreadMaintainer currentFlowThreadSetter(this); |
| 134 RenderBlockFlow::layout(); | 132 RenderBlockFlow::layout(); |
| 135 | 133 |
| 136 m_pageLogicalSizeChanged = false; | 134 m_pageLogicalSizeChanged = false; |
| 137 } | 135 } |
| 138 | 136 |
| 139 void RenderFlowThread::updateLogicalWidth() | 137 void RenderFlowThread::updateLogicalWidth() |
| 140 { | 138 { |
| 141 setLogicalWidth(initialLogicalWidth()); | 139 setLogicalWidth(initialLogicalWidth()); |
| 142 } | 140 } |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 { | 543 { |
| 546 if (!m_renderFlowThread) | 544 if (!m_renderFlowThread) |
| 547 return; | 545 return; |
| 548 RenderView* view = m_renderFlowThread->view(); | 546 RenderView* view = m_renderFlowThread->view(); |
| 549 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 547 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 550 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 548 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 551 } | 549 } |
| 552 | 550 |
| 553 | 551 |
| 554 } // namespace WebCore | 552 } // namespace WebCore |
| OLD | NEW |