Title: [183394] trunk/Source/WebCore
- Revision
- 183394
- Author
- [email protected]
- Date
- 2015-04-27 04:10:49 -0700 (Mon, 27 Apr 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183393 => 183394)
--- trunk/Source/WebCore/ChangeLog 2015-04-27 11:03:24 UTC (rev 183393)
+++ trunk/Source/WebCore/ChangeLog 2015-04-27 11:10:49 UTC (rev 183394)
@@ -1,3 +1,13 @@
+2015-04-27 Csaba Osztrogonác <[email protected]>
+
+ 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 <[email protected]>
Synchronous XMLHttpRequest should get access to AppCache resources stored as flat files
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (183393 => 183394)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-04-27 11:03:24 UTC (rev 183393)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-04-27 11:10:49 UTC (rev 183394)
@@ -2712,7 +2712,11 @@
// grab our cached flexible height.
// 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)
h = Length(computeReplacedLogicalHeight(), Fixed);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
