sky/engine/core/rendering/RenderBlockFlow.cpp - Issue 748943002: remove childrenInline & setChildrenInline

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: sky/engine/core/rendering/RenderBlockFlow.cpp

Issue 748943002: remove childrenInline & setChildrenInline (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: moar Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sky/engine/core/rendering/RenderBlockFlow.cpp

diff --git a/sky/engine/core/rendering/RenderBlockFlow.cpp b/sky/engine/core/rendering/RenderBlockFlow.cpp

index 79566f854cd42dc70cf2eea9ce6c0fd293767d1f..54e4600a225e90aab98c46d9741d58889b4fc0e4 100644

--- a/sky/engine/core/rendering/RenderBlockFlow.cpp

+++ b/sky/engine/core/rendering/RenderBlockFlow.cpp

@@ -103,10 +103,8 @@ inline void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, SubtreeLayou

m_paintInvalidationLogicalTop = 0;

m_paintInvalidationLogicalBottom = 0;

- if (!firstChild() && !isAnonymousBlock())

- setChildrenInline(true);

- if (childrenInline())

+ if (isRenderParagraph())

layoutInlineChildren(relayoutChildren, m_paintInvalidationLogicalTop, m_paintInvalidationLogicalBottom, afterEdge);

else

layoutBlockChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge);