Changeset 188823 in webkit

Timestamp:

Aug 22, 2015 10:42:46 AM (9 years ago)

Author:

Michael Catanzaro

Message:

Unreviewed, fix build without ENABLE_CSS_GRID_LAYOUT after r188582

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalWidthInRegion):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, fix build without ENABLE_CSS_GRID_LAYOUT after r188582
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalWidthInRegion):
+
 2015-08-22  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2339 +2339 @@
     // 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;