Source/core/rendering/RenderBlock.cpp - Issue 147233002: Remove internal recursion for RenderBlockFlow and RenderMultiColumnBlock layout

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/RenderBlock.cpp

Issue 147233002: Remove internal recursion for RenderBlockFlow and RenderMultiColumnBlock layout (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 11 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

Index: Source/core/rendering/RenderBlock.cpp

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

index 00ef04a0ed287f73c5c61df3fc2e2053c2e7d072..fb6bffde9b7ab6977bec29de769ef8b31449a8cb 100644

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

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

@@ -3523,17 +3523,6 @@ LayoutRect RenderBlock::columnRectAt(ColumnInfo* colInfo, unsigned index) const

return LayoutRect(colLogicalTop, colLogicalLeft, colLogicalHeight, colLogicalWidth);

}

-bool RenderBlock::relayoutToAvoidWidows(LayoutStateMaintainer& statePusher)

- if (!shouldBreakAtLineToAvoidWidow())

- return false;

- statePusher.pop();

- setEverHadLayout(true);

- layoutBlock(false);

- return true;

void RenderBlock::adjustPointToColumnContents(LayoutPoint& point) const

{

// Just bail if we have no columns.

« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | Source/core/rendering/RenderBlockFlow.cpp » ('J')