Changeset 183913 in webkit

Timestamp:

May 6, 2015 11:07:25 PM (9 years ago)

Author:

Manuel Rego Casasnovas

Message:

[CSS Grid Layout] Mark grid shorthands as layout dependent
​https://bugs.webkit.org/show_bug.cgi?id=144687

Reviewed by Darin Adler.

Source/WebCore:

grid-template and grid shorthands were not marked us layout dependent,
so you can end up calling them before the grid has been laid out and
you'll get a crash at valueForGridTrackList() because of trackPositions
won't be initialized yet.

Tests: fast/css-grid-layout/grid-shorthand-computed-style-crash.html

fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::isLayoutDependent): Add the grid shorthands only if the object
is a RenderGrid as otherwise it's not needed (using the same condition
for grid-template-columns and grid-template-rows properties too).

LayoutTests:

• fast/css-grid-layout/grid-shorthand-computed-style-crash-expected.txt: Added.
• fast/css-grid-layout/grid-shorthand-computed-style-crash.html: Added.
• fast/css-grid-layout/grid-template-shorthand-computed-style-crash-expected.txt: Added.
• fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash.html (added)
• LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Mark grid shorthands as layout dependent
+        https://bugs.webkit.org/show_bug.cgi?id=144687
+
+        Reviewed by Darin Adler.
+
+        * fast/css-grid-layout/grid-shorthand-computed-style-crash-expected.txt: Added.
+        * fast/css-grid-layout/grid-shorthand-computed-style-crash.html: Added.
+        * fast/css-grid-layout/grid-template-shorthand-computed-style-crash-expected.txt: Added.
+        * fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html: Added.
+
 2015-05-06  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Mark grid shorthands as layout dependent
+        https://bugs.webkit.org/show_bug.cgi?id=144687
+
+        Reviewed by Darin Adler.
+
+        grid-template and grid shorthands were not marked us layout dependent,
+        so you can end up calling them before the grid has been laid out and
+        you'll get a crash at valueForGridTrackList() because of trackPositions
+        won't be initialized yet.
+
+        Tests: fast/css-grid-layout/grid-shorthand-computed-style-crash.html
+               fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::isLayoutDependent): Add the grid shorthands only if the object
+        is a RenderGrid as otherwise it's not needed (using the same condition
+        for grid-template-columns and grid-template-rows properties too).
+
 2015-05-06  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1653 +1653 @@
     case CSSPropertyWidth:
     case CSSPropertyHeight:
-#if ENABLE(CSS_GRID_LAYOUT)
-    case CSSPropertyWebkitGridTemplateColumns:
-    case CSSPropertyWebkitGridTemplateRows:
-#endif
     case CSSPropertyPerspectiveOrigin:
     case CSSPropertyTransformOrigin:
@@ -1693 +1689 @@
     case CSSPropertyPaddingLeft:
         return paddingOrMarginIsRendererDependent<&RenderStyle::paddingLeft>(style, renderer); 
+#if ENABLE(CSS_GRID_LAYOUT)
+    case CSSPropertyWebkitGridTemplateColumns:
+    case CSSPropertyWebkitGridTemplateRows:
+    case CSSPropertyWebkitGridTemplate:
+    case CSSPropertyWebkitGrid:
+        return renderer && renderer->isRenderGrid();
+#endif
     default:
         return false;