Title: [188823] trunk/Source/WebCore
- Revision
- 188823
- Author
- mcatanz...@igalia.com
- Date
- 2015-08-22 10:42:46 -0700 (Sat, 22 Aug 2015)
Log Message
Unreviewed, fix build without ENABLE_CSS_GRID_LAYOUT after r188582
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalWidthInRegion):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188822 => 188823)
--- trunk/Source/WebCore/ChangeLog 2015-08-22 17:14:22 UTC (rev 188822)
+++ trunk/Source/WebCore/ChangeLog 2015-08-22 17:42:46 UTC (rev 188823)
@@ -1,3 +1,10 @@
+2015-08-22 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, fix build without ENABLE_CSS_GRID_LAYOUT after r188582
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalWidthInRegion):
+
2015-08-22 Zalan Bujtas <za...@apple.com>
Page::renderTreeSize() does not include anonymous renderers.
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (188822 => 188823)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-08-22 17:14:22 UTC (rev 188822)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-08-22 17:42:46 UTC (rev 188823)
@@ -2338,7 +2338,11 @@
// width. Use the width from the style context.
// FIXME: Account for block-flow in flexible boxes.
// https://bugs.webkit.org/show_bug.cgi?id=46418
- if (hasOverrideLogicalContentWidth() && (isRubyRun() || style().borderFit() == BorderFitLines || (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isRenderGrid()))) {
+ if (hasOverrideLogicalContentWidth() && (isRubyRun() || style().borderFit() == BorderFitLines || (parent()->isFlexibleBoxIncludingDeprecated()
+#if ENABLE(CSS_GRID_LAYOUT)
+ || parent()->isRenderGrid()
+#endif
+ ))) {
computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
