Source/WebCore/ChangeLog

112014-04-30 Manuel Rego Casasnovas <rego@igalia.com>
22
 3 [CSS Grid Layout] Guard RenderObject::isRenderGrid() method
 4 https://bugs.webkit.org/show_bug.cgi?id=132380
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Guard RenderObject::isRenderGrid() method under ENABLE_CSS_GRID_LAYOUT compilation flag.
 9
 10 * rendering/RenderBox.cpp:
 11 (WebCore::RenderBox::computeLogicalWidthInRegion):
 12 * rendering/RenderObject.h:
 13
 142014-04-30 Manuel Rego Casasnovas <rego@igalia.com>
 15
316 [CSS Grid Layout] Enable runtime feature by default
417 https://bugs.webkit.org/show_bug.cgi?id=132189
518

Source/WebCore/rendering/RenderBox.cpp

@@void RenderBox::computeLogicalWidthInRegion(LogicalExtentComputedValues& compute
23012301 }
23022302
23032303 if (!hasPerpendicularContainingBlock && containerLogicalWidth && containerLogicalWidth != (computedValues.m_extent + computedValues.m_margins.m_start + computedValues.m_margins.m_end)
2304  && !isFloating() && !isInline() && !cb->isFlexibleBoxIncludingDeprecated() && !cb->isRenderGrid()) {
 2304 && !isFloating() && !isInline() && !cb->isFlexibleBoxIncludingDeprecated()
 2305#if ENABLE(CSS_GRID_LAYOUT)
 2306 && !cb->isRenderGrid()
 2307#endif
 2308 ) {
23052309 LayoutUnit newMargin = containerLogicalWidth - computedValues.m_extent - cb->marginStartForChild(*this);
23062310 bool hasInvertedDirection = cb->style().isLeftToRightDirection() != style().isLeftToRightDirection();
23072311 if (hasInvertedDirection)

Source/WebCore/rendering/RenderObject.h

@@public:
352352 virtual bool isRenderFullScreen() const { return false; }
353353 virtual bool isRenderFullScreenPlaceholder() const { return false; }
354354#endif
355 
 355#if ENABLE(CSS_GRID_LAYOUT)
356356 virtual bool isRenderGrid() const { return false; }
357 
 357#endif
358358 virtual bool isRenderFlowThread() const { return false; }
359359 virtual bool isRenderNamedFlowThread() const { return false; }
360360 bool isInFlowRenderFlowThread() const { return isRenderFlowThread() && !isOutOfFlowPositioned(); }