Source/core/layout/LayoutBlock.cpp - Issue 1121173002: Fix shrink-to-fit when children's writing-mode is orthogonal

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/layout/LayoutBlock.cpp

Issue 1121173002: Fix shrink-to-fit when children's writing-mode is orthogonal (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Tests and test results updated Created 5 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/writing-mode/orthogonal-parent-width-min-content.html ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | Source/core/layout/LayoutObject.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutBlock.cpp

diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp

index 6aa189fc9eb98f54b55729fc7bac7f14d579b22c..de56e5a1f88458a4fbd2f911a6fa67022263b6aa 100644

--- a/Source/core/layout/LayoutBlock.cpp

+++ b/Source/core/layout/LayoutBlock.cpp

@@ -3058,12 +3058,7 @@ void LayoutBlock::computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth

margin = marginStart + marginEnd;

LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogicalWidth;

- if (child->isBox() && child->isHorizontalWritingMode() != isHorizontalWritingMode()) {

- childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = toLayoutBox(child)->computeLogicalHeightWithoutLayout();

- } else {

- childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();

- childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth();

- }

+ child->minMaxPreferredLogicalWidthForParent(childMinPreferredLogicalWidth, childMaxPreferredLogicalWidth);

LayoutUnit w = childMinPreferredLogicalWidth + margin;

minLogicalWidth = std::max(w, minLogicalWidth);