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 4edc22e0c43ca21f8aaf5818daa5a55efc862f27..bb3cc3f80f4304244cbad146151cff70c69bf2ee 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
@@ -779,8 +779,10 @@ bool LayoutFlexibleBox::crossAxisLengthIsDefinite(const LayoutBox& child, const |
bool LayoutFlexibleBox::childFlexBaseSizeRequiresLayout(const LayoutBox& child) const |
{ |
- return !mainAxisLengthIsDefinite(child, flexBasisForChild(child)) && ( |
- hasOrthogonalFlow(child) || crossAxisOverflowForChild(child) == OverflowAuto); |
+ return (!mainAxisLengthIsDefinite(child, flexBasisForChild(child)) |
+ && (hasOrthogonalFlow(child) |
+ || (crossAxisOverflowForChild(child) == OverflowAuto |
+ && !PaintLayerScrollableArea::FreezeScrollbarsScope::scrollbarsAreFrozen()))); |
cbiesinger
2016/06/06 23:23:42
We might want to split this up into separate state
|
} |
void LayoutFlexibleBox::cacheChildMainSize(const LayoutBox& child) |