[CSS Grid Layout] The 'auto' height must be adapted to the item's margin.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Mar 2014 05:44:08 +0000 (05:44 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Mar 2014 05:44:08 +0000 (05:44 +0000)
commit3641839d2a5c1fd81a5e6a8053848120f7ab0a05
treecdf2b3993df73cdda8e27b0eee4b4529bfdbb06c
parentabbd828cd215c2ae568cafa2aaebb7053878108e
[CSS Grid Layout] The 'auto' height must be adapted to the item's margin.
https://bugs.webkit.org/show_bug.cgi?id=130920

Patch by Javier Fernandez <jfernandez@igalia.com> on 2014-03-28
Reviewed by Darin Adler.

Source/WebCore:

Adding the grid-item's marginLogicalHeight to the used breadth when computing
content based grid-track sizes.

Test: fast/css-grid-layout/grid-item-margin-auto-columns-rows.html

* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::logicalContentHeightForChild):

LayoutTests:

* fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt: Added.
* fast/css-grid-layout/grid-item-margin-auto-columns-rows.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166450 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt [new file with mode: 0644]
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderGrid.cpp