Changeset 160322 in webkit for trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp

Timestamp:

Dec 9, 2013, 11:45:21 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix handling of 'inherit' and 'initial' for grid lines.
​https://bugs.webkit.org/show_bug.cgi?id=125223

Patch by Peter Molnar <​pmolnar.u-szeged@partner.samsung.com> on 2013-12-09
Reviewed by Darin Adler.

'initial' and 'inherit' are always allowed values for CSS properties.
As the CSSParser handles them automatically, those 2 values were never
taken care of in StyleResolver, leading to crashes.

Source/WebCore:

Added tests cases for 'inherit' and 'initial' to the following tests:

fast/css-grid-layout/grid-item-column-row-get-set.html
fast/css-grid-layout/grid-item-end-after-get-set.html
fast/css-grid-layout/grid-item-start-before-get-set.html

Patch backported from Blink: ​https://src.chromium.org/viewvc/blink?revision=149257&view=revision

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

• rendering/style/RenderStyle.h:
• rendering/style/StyleGridItemData.cpp:

(WebCore::StyleGridItemData::StyleGridItemData):

LayoutTests:

Patch backported from Blink: ​https://src.chromium.org/viewvc/blink?revision=149257&view=revision

• fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
• fast/css-grid-layout/grid-item-column-row-get-set.html:
• fast/css-grid-layout/grid-item-end-after-get-set-expected.txt:
• fast/css-grid-layout/grid-item-end-after-get-set.html:
• fast/css-grid-layout/grid-item-start-before-get-set-expected.txt:
• fast/css-grid-layout/grid-item-start-before-get-set.html:
• fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js:

File:

• trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp

@@ -36 +36 @@
 
 StyleGridItemData::StyleGridItemData()
-    : m_gridColumnStart(RenderStyle::initialGridPosition())
-    , m_gridColumnEnd(RenderStyle::initialGridPosition())
-    , m_gridRowStart(RenderStyle::initialGridPosition())
-    , m_gridRowEnd(RenderStyle::initialGridPosition())
+    : m_gridColumnStart(RenderStyle::initialGridItemColumnStart())
+    , m_gridColumnEnd(RenderStyle::initialGridItemColumnEnd())
+    , m_gridRowStart(RenderStyle::initialGridItemRowStart())
+    , m_gridRowEnd(RenderStyle::initialGridItemRowEnd())
 {
 }