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

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

Issue 2042923002: Restore PaintLayerScrollableArea::ScrollbarManager::canDetach behavior. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 6 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 | « no previous file | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp » ('j') | 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 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)
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698