| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 } | 186 } |
| 187 } | 187 } |
| 188 } | 188 } |
| 189 | 189 |
| 190 updateLogicalWidth(); // Called to get the maximum logical width for the reg
ion. | 190 updateLogicalWidth(); // Called to get the maximum logical width for the reg
ion. |
| 191 updateRegionsFlowThreadPortionRect(); | 191 updateRegionsFlowThreadPortionRect(); |
| 192 } | 192 } |
| 193 | 193 |
| 194 void RenderFlowThread::layout() | 194 void RenderFlowThread::layout() |
| 195 { | 195 { |
| 196 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 197 | |
| 198 m_pageLogicalSizeChanged = m_regionsInvalidated && everHadLayout(); | 196 m_pageLogicalSizeChanged = m_regionsInvalidated && everHadLayout(); |
| 199 | 197 |
| 200 // In case this is the second pass of the normal phase we need to update the
auto-height regions to their initial value. | 198 // In case this is the second pass of the normal phase we need to update the
auto-height regions to their initial value. |
| 201 // If the region chain was invalidated this will happen anyway. | 199 // If the region chain was invalidated this will happen anyway. |
| 202 if (!m_regionsInvalidated && !inConstrainedLayoutPhase()) | 200 if (!m_regionsInvalidated && !inConstrainedLayoutPhase()) |
| 203 initializeRegionsComputedAutoHeight(); | 201 initializeRegionsComputedAutoHeight(); |
| 204 | 202 |
| 205 validateRegions(); | 203 validateRegions(); |
| 206 | 204 |
| 207 // This is the first phase of the layout and because we have auto-height reg
ions we'll need a second | 205 // This is the first phase of the layout and because we have auto-height reg
ions we'll need a second |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1043 { | 1041 { |
| 1044 if (!m_renderFlowThread) | 1042 if (!m_renderFlowThread) |
| 1045 return; | 1043 return; |
| 1046 RenderView* view = m_renderFlowThread->view(); | 1044 RenderView* view = m_renderFlowThread->view(); |
| 1047 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 1045 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 1048 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 1046 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 1049 } | 1047 } |
| 1050 | 1048 |
| 1051 | 1049 |
| 1052 } // namespace WebCore | 1050 } // namespace WebCore |
| OLD | NEW |