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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

Issue 1646413002: [css-flexbox] Add a missing needsLayout() check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/shrinking-column-flexbox.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..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
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/shrinking-column-flexbox.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698