| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } | 137 } |
| 138 | 138 |
| 139 void RenderFlowThread::updateLogicalWidth() | |
| 140 { | |
| 141 setLogicalWidth(initialLogicalWidth()); | |
| 142 } | |
| 143 | |
| 144 void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L
ogicalExtentComputedValues& computedValues) const | 139 void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L
ogicalExtentComputedValues& computedValues) const |
| 145 { | 140 { |
| 146 computedValues.m_position = logicalTop; | 141 computedValues.m_position = logicalTop; |
| 147 computedValues.m_extent = 0; | 142 computedValues.m_extent = 0; |
| 148 | 143 |
| 149 for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m
_regionList.end(); ++iter) { | 144 for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m
_regionList.end(); ++iter) { |
| 150 RenderRegion* region = *iter; | 145 RenderRegion* region = *iter; |
| 151 computedValues.m_extent += region->logicalHeightOfAllFlowThreadContent()
; | 146 computedValues.m_extent += region->logicalHeightOfAllFlowThreadContent()
; |
| 152 } | 147 } |
| 153 } | 148 } |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 { | 540 { |
| 546 if (!m_renderFlowThread) | 541 if (!m_renderFlowThread) |
| 547 return; | 542 return; |
| 548 RenderView* view = m_renderFlowThread->view(); | 543 RenderView* view = m_renderFlowThread->view(); |
| 549 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 544 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 550 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 545 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 551 } | 546 } |
| 552 | 547 |
| 553 | 548 |
| 554 } // namespace WebCore | 549 } // namespace WebCore |
| OLD | NEW |