Title: [169195] trunk/Source/WebCore
- Revision
- 169195
- Author
- [email protected]
- Date
- 2014-05-22 04:54:24 -0700 (Thu, 22 May 2014)
Log Message
[CSS Grid Layout] Guard RenderObject::isRenderGrid() method
https://bugs.webkit.org/show_bug.cgi?id=132380
Reviewed by Benjamin Poulain.
Guard RenderObject::isRenderGrid() method under ENABLE_CSS_GRID_LAYOUT compilation flag.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalWidthInRegion):
* rendering/RenderObject.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169194 => 169195)
--- trunk/Source/WebCore/ChangeLog 2014-05-22 10:52:42 UTC (rev 169194)
+++ trunk/Source/WebCore/ChangeLog 2014-05-22 11:54:24 UTC (rev 169195)
@@ -1,3 +1,16 @@
+2014-05-22 Manuel Rego Casasnovas <[email protected]>
+
+ [CSS Grid Layout] Guard RenderObject::isRenderGrid() method
+ https://bugs.webkit.org/show_bug.cgi?id=132380
+
+ Reviewed by Benjamin Poulain.
+
+ Guard RenderObject::isRenderGrid() method under ENABLE_CSS_GRID_LAYOUT compilation flag.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalWidthInRegion):
+ * rendering/RenderObject.h:
+
2014-05-21 Antti Koivisto <[email protected]>
REGRESSION(r167870): Crash in simple line layout code with :after
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (169194 => 169195)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-05-22 10:52:42 UTC (rev 169194)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-05-22 11:54:24 UTC (rev 169195)
@@ -2306,7 +2306,11 @@
}
if (!hasPerpendicularContainingBlock && containerLogicalWidth && containerLogicalWidth != (computedValues.m_extent + computedValues.m_margins.m_start + computedValues.m_margins.m_end)
- && !isFloating() && !isInline() && !cb->isFlexibleBoxIncludingDeprecated() && !cb->isRenderGrid()) {
+ && !isFloating() && !isInline() && !cb->isFlexibleBoxIncludingDeprecated()
+#if ENABLE(CSS_GRID_LAYOUT)
+ && !cb->isRenderGrid()
+#endif
+ ) {
LayoutUnit newMargin = containerLogicalWidth - computedValues.m_extent - cb->marginStartForChild(*this);
bool hasInvertedDirection = cb->style().isLeftToRightDirection() != style().isLeftToRightDirection();
if (hasInvertedDirection)
Modified: trunk/Source/WebCore/rendering/RenderObject.h (169194 => 169195)
--- trunk/Source/WebCore/rendering/RenderObject.h 2014-05-22 10:52:42 UTC (rev 169194)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-05-22 11:54:24 UTC (rev 169195)
@@ -354,9 +354,9 @@
virtual bool isRenderFullScreen() const { return false; }
virtual bool isRenderFullScreenPlaceholder() const { return false; }
#endif
-
+#if ENABLE(CSS_GRID_LAYOUT)
virtual bool isRenderGrid() const { return false; }
-
+#endif
virtual bool isRenderFlowThread() const { return false; }
virtual bool isRenderNamedFlowThread() const { return false; }
bool isInFlowRenderFlowThread() const { return isRenderFlowThread() && !isOutOfFlowPositioned(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
