Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
index a937370a4c0a89180fc907f7102ce38e54e8549a..0c0c4a6bb10792e02cf8cc3a007abdab506dc195 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
@@ -3016,7 +3016,7 @@ LayoutUnit LayoutBox::computeReplacedLogicalHeightUsing(SizeType sizeType, const |
availableHeight = containingBlockLogicalHeightForPositioned(toLayoutBoxModelObject(cb)); |
} else if (stretchedHeight != -1) { |
availableHeight = stretchedHeight; |
- } else if (isGridItem() && hasOverrideContainingBlockLogicalHeight()) { |
jfernandez
2016/08/19 21:14:24
I think it's correct, from the layout logic point
Manuel Rego
2016/08/22 10:31:09
The isGridItem() was added in:
https://codereview.
|
+ } else if (hasOverrideContainingBlockLogicalHeight()) { |
availableHeight = overrideContainingBlockContentLogicalHeight(); |
} else { |
availableHeight = containingBlockLogicalHeightForContent(IncludeMarginBorderPadding); |