Changeset 140045 in webkit

Timestamp:

Jan 17, 2013 2:35:24 PM (11 years ago)

Author:

jchaffraix@webkit.org

Message:

[CSS Grid Layout] Updating -webkit-grid-rows or -webkit-grid-columns doesn't work as expected
​https://bugs.webkit.org/show_bug.cgi?id=107062

Reviewed by Tony Chang.

Source/WebCore:

Tests: fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html

fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html

This change makes -webkit-grid-rows and -webkit-grid-columns dynamic change properly
relayout their children, thus making them work!

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::layoutGridItems):
Fixed the logic to force a grid item relayout if the grid area size changes. This is the
safest approach as margins or paddings can also be a percent of the grid area's size.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):
Fixed a dumb mistake.

LayoutTests:

• fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update-expected.txt: Added.
• fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html: Added.
• fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update-expected.txt: Added.
• fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update-expected.txt (added)
• LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html (added)
• LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update-expected.txt (added)
• LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-17  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [CSS Grid Layout] Updating -webkit-grid-rows or -webkit-grid-columns doesn't work as expected
+        https://bugs.webkit.org/show_bug.cgi?id=107062
+
+        Reviewed by Tony Chang.
+
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update-expected.txt: Added.
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html: Added.
+        * fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update-expected.txt: Added.
+        * fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html: Added.
+
 2013-01-17  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-17  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [CSS Grid Layout] Updating -webkit-grid-rows or -webkit-grid-columns doesn't work as expected
+        https://bugs.webkit.org/show_bug.cgi?id=107062
+
+        Reviewed by Tony Chang.
+
+        Tests: fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
+               fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
+
+        This change makes -webkit-grid-rows and -webkit-grid-columns dynamic change properly
+        relayout their children, thus making them work!
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::layoutGridItems):
+        Fixed the logic to force a grid item relayout if the grid area size changes. This is the
+        safest approach as margins or paddings can also be a percent of the grid area's size.
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        Fixed a dumb mistake.
+
 2013-01-17  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -231 +231 @@
             // Because the grid area cannot be styled, we don't need to adjust
             // the grid breadth to account for 'box-sizing'.
+            LayoutUnit oldOverrideContainingBlockContentLogicalWidth = child->hasOverrideContainingBlockLogicalWidth() ? child->overrideContainingBlockContentLogicalWidth() : LayoutUnit();
+            LayoutUnit oldOverrideContainingBlockContentLogicalHeight = child->hasOverrideContainingBlockLogicalHeight() ? child->overrideContainingBlockContentLogicalHeight() : LayoutUnit();
+
+            if (oldOverrideContainingBlockContentLogicalWidth != columnTracks[columnTrack].m_usedBreadth || oldOverrideContainingBlockContentLogicalHeight != rowTracks[rowTrack].m_usedBreadth)
+                child->setNeedsLayout(true, MarkOnlyThis);
+
             child->setOverrideContainingBlockContentLogicalWidth(columnTracks[columnTrack].m_usedBreadth);
             child->setOverrideContainingBlockContentLogicalHeight(rowTracks[rowTrack].m_usedBreadth);
+
         }
 

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

@@ -439 +439 @@
 
         if (rareNonInheritedData->m_grid.get() != other->rareNonInheritedData->m_grid.get()
-            && rareNonInheritedData->m_gridItem.get() != other->rareNonInheritedData->m_gridItem.get())
+            || rareNonInheritedData->m_gridItem.get() != other->rareNonInheritedData->m_gridItem.get())
             return StyleDifferenceLayout;