Index: Source/core/layout/LayoutBox.cpp |
diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp |
index 36c0c273c5b5abb3310c289aa2d71bc9b8a9d42a..614a06899dc0b0d136aaa2234588ffcdecf056ec 100644 |
--- a/Source/core/layout/LayoutBox.cpp |
+++ b/Source/core/layout/LayoutBox.cpp |
@@ -1921,7 +1921,7 @@ void LayoutBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues) |
// width. Use the width from the style context. |
// FIXME: Account for writing-mode in flexible boxes. |
// https://bugs.webkit.org/show_bug.cgi?id=46418 |
- if (hasOverrideLogicalContentWidth() && parent()->isFlexibleBoxIncludingDeprecated()) { |
+ if (hasOverrideLogicalContentWidth() && (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isLayoutGrid())) { |
computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddingLogicalWidth(); |
return; |
} |