Source/core/rendering/RenderFlowThread.cpp - Issue 620753006: Rendering API cleanup

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderFlowThread.cpp

Issue 620753006: Rendering API cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Address jchaffraix remarks Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

« Source/core/rendering/RenderBoxModelObject.h ('K') | « Source/core/rendering/RenderFlowThread.h ('k') | Source/core/rendering/RenderFrameSet.h » ('j') | Source/core/rendering/RenderFrameSet.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderFlowThread.cpp

diff --git a/Source/core/rendering/RenderFlowThread.cpp b/Source/core/rendering/RenderFlowThread.cpp

index a2c02183483289ba21a1c400f1024380a69a56fc..0d69b0da6dff7a9d0ab86429c434897b16c8890c 100644

--- a/Source/core/rendering/RenderFlowThread.cpp

+++ b/Source/core/rendering/RenderFlowThread.cpp

@@ -139,7 +139,7 @@ void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L

for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.begin(); iter != m_multiColumnSetList.end(); ++iter) {

RenderMultiColumnSet* columnSet = *iter;

- computedValues.m_extent += columnSet->logicalHeightOfAllFlowThreadContent();

+ computedValues.m_extent += columnSet->logicalHeightInFlowThread();

}

@@ -225,7 +225,7 @@ void RenderFlowThread::updateRegionsFlowThreadPortionRect()

RenderMultiColumnSet* columnSet = *iter;

LayoutUnit columnSetLogicalWidth = columnSet->pageLogicalWidth();

- LayoutUnit columnSetLogicalHeight = std::min<LayoutUnit>(RenderFlowThread::maxLogicalHeight() - logicalHeight, columnSet->logicalHeightOfAllFlowThreadContent());

+ LayoutUnit columnSetLogicalHeight = std::min<LayoutUnit>(RenderFlowThread::maxLogicalHeight() - logicalHeight, columnSet->logicalHeightInFlowThread());

LayoutRect columnSetRect(style()->direction() == LTR ? LayoutUnit() : logicalWidth() - columnSetLogicalWidth, logicalHeight, columnSetLogicalWidth, columnSetLogicalHeight);