Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

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: TestExpectations Created 5 years 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/LayoutFlexibleBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
index 5fda5803fa1363f33c8fa711fce0a2d7b2d1c349..1029fb94e191347b15187449b9af93ccc63c4b58 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -104,13 +104,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);
cbiesinger 2016/01/15 05:31:47 Hmm I wonder why this didn't call that function in
kojii 2016/01/15 09:09:10 Great, thank you for the review.
ASSERT(minPreferredLogicalWidth >= 0);
ASSERT(maxPreferredLogicalWidth >= 0);
minPreferredLogicalWidth += margin;

Powered by Google App Engine
This is Rietveld 408576698