Source/core/rendering/RenderBlockFlow.h - Issue 218663004: Changing between multicol and regular block shouldn't recreate all renderers.

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/RenderBlockFlow.h

Issue 218663004: Changing between multicol and regular block shouldn't recreate all renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Code review Created 6 years, 8 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

« no previous file with comments | « LayoutTests/fast/multicol/regular-block-becomes-multicol-expected.html ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlockFlow.h

diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h

index f151d452cc04da6215563006740b3ff7aae8311b..14f1a3d593d7e453c16e4e3b3da5a0342c0e8503 100644

--- a/Source/core/rendering/RenderBlockFlow.h

+++ b/Source/core/rendering/RenderBlockFlow.h

@@ -197,6 +197,11 @@ public:

TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);

RenderMultiColumnFlowThread* multiColumnFlowThread() const { return m_rareData ? m_rareData->m_multiColumnFlowThread : 0; }

+ void resetMultiColumnFlowThread()

+ {

+ if (m_rareData)

+ m_rareData->m_multiColumnFlowThread = 0;

+ }

void addOverflowFromInlineChildren();

@@ -301,7 +306,7 @@ private:

virtual RootInlineBox* createRootInlineBox(); // Subclassed by SVG

- void createMultiColumnFlowThreadIfNeeded();

+ void createOrDestroyMultiColumnFlowThreadIfNeeded();

void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, int expansionOpportunityCount);

void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);