| 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..4863f24bc928d39e018b33a4cd904a6bdcd33913 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| @@ -1043,7 +1043,7 @@ bool LayoutFlexibleBox::computeNextFlexLine(OrderedFlexItemList& orderedChildren
|
| // If this condition is true, then computeMainAxisExtentForChild will call child.contentLogicalHeight()
|
| // and child.scrollbarLogicalHeight(), so if the child has intrinsic min/max/preferred size,
|
| // run layout on it now to make sure its logical height and scroll bars are up-to-date.
|
| - if (childHasIntrinsicMainAxisSize(*child)) {
|
| + if (childHasIntrinsicMainAxisSize(*child) && child->needsLayout()) {
|
| child->clearOverrideSize();
|
| child->layoutIfNeeded();
|
| // Keep our cache up-to-date
|
|
|