Changeset 169195 in webkit

Timestamp:

May 22, 2014 4:54:24 AM (10 years ago)

Author:

Manuel Rego Casasnovas

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:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-22  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [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  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2307 +2307 @@
     
     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();

trunk/Source/WebCore/rendering/RenderObject.h

@@ -355 +355 @@
     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; }