third_party/WebKit/Source/core/layout/TextAutosizer.cpp - Issue 1904403002: Recurse the inner elements only if behavior is DescendToInnerBlocks

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

Issue 1904403002: Recurse the inner elements only if behavior is DescendToInnerBlocks Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make menuitem non-void Created 4 years, 7 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: third_party/WebKit/Source/core/layout/TextAutosizer.cpp

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

index a1477fcf3495f3c8524730ad2c98e2bb4d15353a..3b383f8af25480c38a69a1139a6b75ea44d2be9d 100644

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

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

@@ -450,7 +450,7 @@ float TextAutosizer::inflate(LayoutObject* parent, SubtreeLayoutScope* layouter,

// FIXME: Investigate why MarkOnlyThis is sufficient.

if (parent->isLayoutInline())

child->setPreferredLogicalWidthsDirty(MarkOnlyThis);

- } else if (child->isLayoutInline()) {

+ } else if (child->isLayoutInline() && behavior == DescendToInnerBlocks) {

multiplier = inflate(child, layouter, behavior, multiplier);

} else if (child->isLayoutBlock() && behavior == DescendToInnerBlocks

&& !classifyBlock(child, INDEPENDENT | EXPLICIT_WIDTH | SUPPRESSING)) {

« no previous file with comments | « third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp ('k') | no next file » | no next file with comments »