third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp - Issue 1549153002: Fix preferred logical widths of orthogonal writing modes

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 1549153002: Fix preferred logical widths of orthogonal writing modes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Allow call to remove() while iterating as long as it doesn't actually remove Created 4 years, 11 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

« third_party/WebKit/Source/core/layout/LayoutBox.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutState.h » ('j') | no next file with comments »
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 f589bc10dd9940647f92964093bf09969095937d..7b77eb2d2cf1dcccbd5d295e93b6e900bd6f3ae4 100644

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

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

@@ -109,13 +109,7 @@ void LayoutFlexibleBox::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidt

LayoutUnit minPreferredLogicalWidth;

LayoutUnit maxPreferredLogicalWidth;

- bool hasOrthogonalWritingMode = child->isHorizontalWritingMode() != isHorizontalWritingMode();

- if (hasOrthogonalWritingMode) {

- minPreferredLogicalWidth = maxPreferredLogicalWidth = child->computeLogicalHeightWithoutLayout();

- } else {

- minPreferredLogicalWidth = child->minPreferredLogicalWidth();

- maxPreferredLogicalWidth = child->maxPreferredLogicalWidth();

- }

+ computeChildPreferredLogicalWidths(*child, minPreferredLogicalWidth, maxPreferredLogicalWidth);

ASSERT(minPreferredLogicalWidth >= 0);

ASSERT(maxPreferredLogicalWidth >= 0);

minPreferredLogicalWidth += margin;