third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp - Issue 1887933002: (CANCELED) Fix TextAutosizer not to scheduleRelayout()

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: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

Issue 1887933002: (CANCELED) Fix TextAutosizer not to scheduleRelayout() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplifiedLayout Created 4 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 | « third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | third_party/WebKit/Source/core/layout/TableLayoutAlgorithmAuto.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

index a781e6885d20a16633580c9d720565382b9c82ef..b1790b39178d1a479a01fc6b44dc011d2ec83087 100644

--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

@@ -266,13 +266,14 @@ void LayoutFlexibleBox::layoutBlock(bool relayoutChildren)

{

ASSERT(needsLayout());

- if (!relayoutChildren && simplifiedLayout())

+ SubtreeLayoutScope layoutScope(*this);

+ if (!relayoutChildren && simplifiedLayout(&layoutScope))

return;

if (updateLogicalWidthAndColumnWidth())

relayoutChildren = true;

- SubtreeLayoutScope layoutScope(*this);

LayoutUnit previousHeight = logicalHeight();

setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());