Changeset 183394 in webkit

Timestamp:

Apr 27, 2015, 4:10:49 AM (10 years ago)

Author:

Csaba Osztrogonác

Message:

Fix the !ENABLE(CSS_GRID_LAYOUT) build after r183370
​https://bugs.webkit.org/show_bug.cgi?id=144255

Reviewed by Carlos Garcia Campos.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalHeight):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-27  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Fix the !ENABLE(CSS_GRID_LAYOUT) build after r183370
+        https://bugs.webkit.org/show_bug.cgi?id=144255
+
+        Reviewed by Carlos Garcia Campos.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalHeight):
+
 2015-04-27  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2713 +2713 @@
         // FIXME: Account for block-flow in flexible boxes.
         // https://bugs.webkit.org/show_bug.cgi?id=46418
-        if (hasOverrideLogicalContentHeight() && (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isRenderGrid()))
+        if (hasOverrideLogicalContentHeight() && (parent()->isFlexibleBoxIncludingDeprecated()
+#if ENABLE(CSS_GRID_LAYOUT)
+            || parent()->isRenderGrid()
+#endif
+        ))
             h = Length(overrideLogicalContentHeight(), Fixed);
         else if (treatAsReplaced)