Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Side by Side Diff: Source/core/rendering/RenderFlowThread.cpp

Issue 263083009: [New Multicolumn] Make fast/multicol/overflow-content.html pass in the new implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase master Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderFlowThread.h ('k') | Source/core/rendering/RenderMultiColumnSet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 RenderRegionRangeMap::const_iterator it = m_regionRangeMap.find(box); 355 RenderRegionRangeMap::const_iterator it = m_regionRangeMap.find(box);
356 if (it == m_regionRangeMap.end()) 356 if (it == m_regionRangeMap.end())
357 return; 357 return;
358 358
359 const RenderRegionRange& range = it->value; 359 const RenderRegionRange& range = it->value;
360 startRegion = range.startRegion(); 360 startRegion = range.startRegion();
361 endRegion = range.endRegion(); 361 endRegion = range.endRegion();
362 ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion )); 362 ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion ));
363 } 363 }
364 364
365 void RenderFlowThread::applyBreakAfterContent(LayoutUnit clientHeight)
366 {
367 // Simulate a region break at height. If it points inside an auto logical he ight region,
368 // then it may determine the region computed autoheight.
369 addForcedRegionBreak(clientHeight, this, false);
370 }
371
372 void RenderFlowThread::updateRegionsFlowThreadPortionRect() 365 void RenderFlowThread::updateRegionsFlowThreadPortionRect()
373 { 366 {
374 LayoutUnit logicalHeight = 0; 367 LayoutUnit logicalHeight = 0;
375 // FIXME: Optimize not to clear the interval all the time. This implies manu ally managing the tree nodes lifecycle. 368 // FIXME: Optimize not to clear the interval all the time. This implies manu ally managing the tree nodes lifecycle.
376 m_regionIntervalTree.clear(); 369 m_regionIntervalTree.clear();
377 m_regionIntervalTree.initIfNeeded(); 370 m_regionIntervalTree.initIfNeeded();
378 for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regio nList.end(); ++iter) { 371 for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regio nList.end(); ++iter) {
379 RenderRegion* region = *iter; 372 RenderRegion* region = *iter;
380 373
381 LayoutUnit regionLogicalWidth = region->pageLogicalWidth(); 374 LayoutUnit regionLogicalWidth = region->pageLogicalWidth();
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 { 538 {
546 if (!m_renderFlowThread) 539 if (!m_renderFlowThread)
547 return; 540 return;
548 RenderView* view = m_renderFlowThread->view(); 541 RenderView* view = m_renderFlowThread->view();
549 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); 542 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread);
550 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); 543 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread);
551 } 544 }
552 545
553 546
554 } // namespace WebCore 547 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlowThread.h ('k') | Source/core/rendering/RenderMultiColumnSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698