third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.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/LayoutDeprecatedFlexibleBox.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/LayoutBlockFlow.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.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/LayoutDeprecatedFlexibleBox.cpp

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

index ed3942e2c946921f27add396f22f623c55659e18..802e3a1623e1cf738f7aeb079aa7f1d8f4af9119 100644

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

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

@@ -221,7 +221,9 @@ void LayoutDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren)

{

ASSERT(needsLayout());

- if (!relayoutChildren && simplifiedLayout())

+ SubtreeLayoutScope layouter(*this);

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

return;

{

@@ -233,7 +235,7 @@ void LayoutDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren)

updateLogicalWidth();

updateLogicalHeight();

- TextAutosizer::LayoutScope textAutosizerLayoutScope(this);

+ TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layouter);

if (previousSize != size()

|| (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOrient() == HORIZONTAL