Index: Source/core/rendering/RenderBox.cpp |
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp |
index 043b01932f06144112b10fee73ca869b406ae58a..5c9da8b352da01dde74d51bdf95f5b24afe7ec5d 100644 |
--- a/Source/core/rendering/RenderBox.cpp |
+++ b/Source/core/rendering/RenderBox.cpp |
@@ -2521,8 +2521,11 @@ LayoutUnit RenderBox::computeContentAndScrollbarLogicalHeightUsing(const Length& |
{ |
// FIXME(cbiesinger): The css-sizing spec is considering changing what min-content/max-content should resolve to. |
// If that happens, this code will have to change. |
- if (height.isIntrinsic()) |
+ if (height.isIntrinsic()) { |
+ if (intrinsicContentHeight == -1) |
+ return -1; // Intrinsic height isn't available. |
return computeIntrinsicLogicalContentHeightUsing(height, intrinsicContentHeight, borderAndPaddingLogicalHeight()); |
+ } |
if (height.isFixed()) |
return height.value(); |
if (height.isPercent()) |