| 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 RenderRegionRangeMap::const_iterator it = m_regionRangeMap.find(box); | 358 RenderRegionRangeMap::const_iterator it = m_regionRangeMap.find(box); |
| 359 if (it == m_regionRangeMap.end()) | 359 if (it == m_regionRangeMap.end()) |
| 360 return; | 360 return; |
| 361 | 361 |
| 362 const RenderRegionRange& range = it->value; | 362 const RenderRegionRange& range = it->value; |
| 363 startRegion = range.startRegion(); | 363 startRegion = range.startRegion(); |
| 364 endRegion = range.endRegion(); | 364 endRegion = range.endRegion(); |
| 365 ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion
)); | 365 ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion
)); |
| 366 } | 366 } |
| 367 | 367 |
| 368 void RenderFlowThread::applyBreakAfterContent(LayoutUnit clientHeight) | |
| 369 { | |
| 370 // Simulate a region break at height. If it points inside an auto logical he
ight region, | |
| 371 // then it may determine the region computed autoheight. | |
| 372 addForcedRegionBreak(clientHeight, this, false); | |
| 373 } | |
| 374 | |
| 375 void RenderFlowThread::updateRegionsFlowThreadPortionRect() | 368 void RenderFlowThread::updateRegionsFlowThreadPortionRect() |
| 376 { | 369 { |
| 377 LayoutUnit logicalHeight = 0; | 370 LayoutUnit logicalHeight = 0; |
| 378 // FIXME: Optimize not to clear the interval all the time. This implies manu
ally managing the tree nodes lifecycle. | 371 // FIXME: Optimize not to clear the interval all the time. This implies manu
ally managing the tree nodes lifecycle. |
| 379 m_regionIntervalTree.clear(); | 372 m_regionIntervalTree.clear(); |
| 380 m_regionIntervalTree.initIfNeeded(); | 373 m_regionIntervalTree.initIfNeeded(); |
| 381 for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regio
nList.end(); ++iter) { | 374 for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regio
nList.end(); ++iter) { |
| 382 RenderRegion* region = *iter; | 375 RenderRegion* region = *iter; |
| 383 | 376 |
| 384 LayoutUnit regionLogicalWidth = region->pageLogicalWidth(); | 377 LayoutUnit regionLogicalWidth = region->pageLogicalWidth(); |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 { | 541 { |
| 549 if (!m_renderFlowThread) | 542 if (!m_renderFlowThread) |
| 550 return; | 543 return; |
| 551 RenderView* view = m_renderFlowThread->view(); | 544 RenderView* view = m_renderFlowThread->view(); |
| 552 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 545 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 553 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 546 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 554 } | 547 } |
| 555 | 548 |
| 556 | 549 |
| 557 } // namespace WebCore | 550 } // namespace WebCore |
| OLD | NEW |