Index: Source/core/rendering/RenderGrid.cpp |
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
index e7daaecd24e539d34fa4095dad4fb805159dccc8..695d52b99defee709baecff7e94f47a7ffbfa8d8 100644 |
--- a/Source/core/rendering/RenderGrid.cpp |
+++ b/Source/core/rendering/RenderGrid.cpp |
@@ -376,7 +376,11 @@ void RenderGrid::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo |
minLogicalWidth += minTrackBreadth; |
maxLogicalWidth += maxTrackBreadth; |
- // FIXME: This should add in the scrollbarWidth (e.g. see RenderFlexibleBox). |
+ maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); |
Julien - ping for review
2014/09/10 16:06:54
I would still remove it. If we fix the FIXME in co
Sunil Ratnu
2014/09/11 10:59:44
Done.
|
+ |
+ LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth(); |
+ maxLogicalWidth += scrollbarWidth; |
+ minLogicalWidth += scrollbarWidth; |
} |
} |