[css-grid] Fix static position for positioned grid items
The spec was updated to define properly the static position
for positioned grid items, but we didn't update the implementation yet:
https://drafts.csswg.org/css-grid-1/issues-wd-20150108#issue-1
We were only setting the static position when the start line
was not auto. Otherwise we were using the default one
which includes the padding.
With the spec change we need to set it always,
even if the start line is auto.
Updated several tests to follow the new expected behavior.
BUG=607137
Review-Url: https://codereview.chromium.org/1929483002
Cr-Commit-Position: refs/heads/master@{#390215}
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
index 4c2cd2c..540a4c3 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
@@ -116,7 +116,7 @@
<div class="grid">
<div class="sizedToGridArea absolute autoRowAutoColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="530">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="530">
</div>
<div class="sizedToGridArea absolute firstRowFirstColumn"
data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="515">
@@ -140,22 +140,22 @@
<div class="grid">
<div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows"
- data-offset-x="15" data-offset-y="65" data-expected-width="315" data-expected-height="250">
+ data-offset-x="0" data-offset-y="65" data-expected-width="315" data-expected-height="250">
</div>
<div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows2Columns"
data-offset-x="65" data-offset-y="65" data-expected-width="250" data-expected-height="250">
</div>
<div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="165" data-expected-height="165">
+ data-offset-x="0" data-offset-y="0" data-expected-width="165" data-expected-height="165">
</div>
<div class="sizedToGridArea absolute endSecondRowEndFirstColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="65" data-expected-height="165">
+ data-offset-x="0" data-offset-y="0" data-expected-width="65" data-expected-height="165">
</div>
<div class="sizedToGridArea absolute endFirstRowEndSecondColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="165" data-expected-height="65">
+ data-offset-x="0" data-offset-y="0" data-expected-width="165" data-expected-height="65">
</div>
<div class="sizedToGridArea absolute endFirstRowEndFirstColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="65" data-expected-height="65">
+ data-offset-x="0" data-offset-y="0" data-expected-width="65" data-expected-height="65">
</div>
</div>
@@ -232,7 +232,7 @@
<div class="grid directionRTL">
<div class="sizedToGridArea absolute autoRowAutoColumn"
- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="530">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="530">
</div>
<div class="sizedToGridArea absolute firstRowFirstColumn"
data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="515">
@@ -256,22 +256,22 @@
<div class="grid directionRTL">
<div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows"
- data-offset-x="200" data-offset-y="65" data-expected-width="315" data-expected-height="250">
+ data-offset-x="215" data-offset-y="65" data-expected-width="315" data-expected-height="250">
</div>
<div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows2Columns"
data-offset-x="215" data-offset-y="65" data-expected-width="250" data-expected-height="250">
</div>
<div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
- data-offset-x="350" data-offset-y="15" data-expected-width="165" data-expected-height="165">
+ data-offset-x="365" data-offset-y="0" data-expected-width="165" data-expected-height="165">
</div>
<div class="sizedToGridArea absolute endSecondRowEndFirstColumn"
- data-offset-x="450" data-offset-y="15" data-expected-width="65" data-expected-height="165">
+ data-offset-x="465" data-offset-y="0" data-expected-width="65" data-expected-height="165">
</div>
<div class="sizedToGridArea absolute endFirstRowEndSecondColumn"
- data-offset-x="350" data-offset-y="15" data-expected-width="165" data-expected-height="65">
+ data-offset-x="365" data-offset-y="0" data-expected-width="165" data-expected-height="65">
</div>
<div class="sizedToGridArea absolute endFirstRowEndFirstColumn"
- data-offset-x="450" data-offset-y="15" data-expected-width="65" data-expected-height="65">
+ data-offset-x="465" data-offset-y="0" data-expected-width="65" data-expected-height="65">
</div>
</div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
index 26f979b..ed431464 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
@@ -56,7 +56,7 @@
<div class="container">
<div class="grid relative">
- <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="15" data-offset-y="5" data-expected-width="330" data-expected-height="210"></div>
+ <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="0" data-offset-y="0" data-expected-width="330" data-expected-height="210"></div>
</div>
</div>
@@ -92,7 +92,7 @@
<div class="container">
<div class="grid relative directionRTL">
- <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="-15" data-offset-y="5" data-expected-width="330" data-expected-height="210"></div>
+ <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="0" data-offset-y="0" data-expected-width="330" data-expected-height="210"></div>
</div>
</div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
index d95c7a8..d0d3551b 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
@@ -39,7 +39,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / auto; grid-row: auto / auto;"
- data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
@@ -195,7 +195,7 @@
<div class="grid directionRTL">
<div style="grid-column: 4 / auto; grid-row: 4 / auto;"
- data-offset-x="0" data-offset-y="15" data-expected-width="365" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="365" data-expected-height="230">
</div>
</div>
@@ -207,7 +207,7 @@
<div class="grid directionRTL">
<div style="grid-column: 5 / auto; grid-row: 5 / auto;"
- data-offset-x="0" data-offset-y="15" data-expected-width="265" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="265" data-expected-height="230">
</div>
</div>
@@ -219,7 +219,7 @@
<div class="grid directionRTL">
<div style="grid-column: 6 / auto; grid-row: 6 / auto;"
- data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
@@ -231,7 +231,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / 1; grid-row: auto / 1;"
- data-offset-x="800" data-offset-y="15" data-expected-width="15" data-expected-height="15">
+ data-offset-x="815" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
</div>
@@ -243,7 +243,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / 2; grid-row: auto / 2;"
- data-offset-x="700" data-offset-y="15" data-expected-width="115" data-expected-height="65">
+ data-offset-x="715" data-offset-y="0" data-expected-width="115" data-expected-height="65">
</div>
</div>
@@ -255,7 +255,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / 3; grid-row: auto / 3;"
- data-offset-x="550" data-offset-y="15" data-expected-width="265" data-expected-height="140">
+ data-offset-x="565" data-offset-y="0" data-expected-width="265" data-expected-height="140">
</div>
</div>
@@ -267,7 +267,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / 4; grid-row: auto / 4;"
- data-offset-x="400" data-offset-y="15" data-expected-width="415" data-expected-height="230">
+ data-offset-x="415" data-offset-y="0" data-expected-width="415" data-expected-height="230">
</div>
</div>
@@ -279,7 +279,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / 5; grid-row: auto / 5;"
- data-offset-x="250" data-offset-y="15" data-expected-width="565" data-expected-height="230">
+ data-offset-x="265" data-offset-y="0" data-expected-width="565" data-expected-height="230">
</div>
</div>
@@ -291,7 +291,7 @@
<div class="grid directionRTL">
<div style="grid-column: auto / 6; grid-row: auto / 6;"
- data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
index 7d8dcff..38b1b2c 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
@@ -39,7 +39,7 @@
<div class="grid">
<div style="grid-column: auto / auto; grid-row: auto / auto;"
- data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
@@ -195,7 +195,7 @@
<div class="grid">
<div style="grid-column: 4 / auto; grid-row: 4 / auto;"
- data-offset-x="465" data-offset-y="15" data-expected-width="365" data-expected-height="230">
+ data-offset-x="465" data-offset-y="0" data-expected-width="365" data-expected-height="230">
</div>
</div>
@@ -207,7 +207,7 @@
<div class="grid">
<div style="grid-column: 5 / auto; grid-row: 5 / auto;"
- data-offset-x="565" data-offset-y="15" data-expected-width="265" data-expected-height="230">
+ data-offset-x="565" data-offset-y="0" data-expected-width="265" data-expected-height="230">
</div>
</div>
@@ -219,7 +219,7 @@
<div class="grid">
<div style="grid-column: 6 / auto; grid-row: 6 / auto;"
- data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
@@ -231,7 +231,7 @@
<div class="grid">
<div style="grid-column: auto / 1; grid-row: auto / 1;"
- data-offset-x="15" data-offset-y="15" data-expected-width="15" data-expected-height="15">
+ data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
</div>
@@ -243,7 +243,7 @@
<div class="grid">
<div style="grid-column: auto / 2; grid-row: auto / 2;"
- data-offset-x="15" data-offset-y="15" data-expected-width="115" data-expected-height="65">
+ data-offset-x="0" data-offset-y="0" data-expected-width="115" data-expected-height="65">
</div>
</div>
@@ -255,7 +255,7 @@
<div class="grid">
<div style="grid-column: auto / 3; grid-row: auto / 3;"
- data-offset-x="15" data-offset-y="15" data-expected-width="265" data-expected-height="140">
+ data-offset-x="0" data-offset-y="0" data-expected-width="265" data-expected-height="140">
</div>
</div>
@@ -267,7 +267,7 @@
<div class="grid">
<div style="grid-column: auto / 4; grid-row: auto / 4;"
- data-offset-x="15" data-offset-y="15" data-expected-width="415" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="415" data-expected-height="230">
</div>
</div>
@@ -279,7 +279,7 @@
<div class="grid">
<div style="grid-column: auto / 5; grid-row: auto / 5;"
- data-offset-x="15" data-offset-y="15" data-expected-width="565" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="565" data-expected-height="230">
</div>
</div>
@@ -291,7 +291,7 @@
<div class="grid">
<div style="grid-column: auto / 6; grid-row: auto / 6;"
- data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
index c1bba98d..55554a46 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
@@ -53,7 +53,7 @@
<div class="grid">
<div class="absolute sizedToGridArea startImplicitLine"
- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</div>
<div class="absolute sizedToGridArea endImplicitLine"
data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="315">
@@ -62,7 +62,7 @@
<div class="grid">
<div class="absolute sizedToGridArea startImplicitLineSpan"
- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</div>
<div class="absolute sizedToGridArea endImplicitLineSpan"
data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="315">
@@ -71,7 +71,7 @@
<div class="grid directionRTL">
<div class="absolute sizedToGridArea startImplicitLine"
- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</div>
<div class="absolute sizedToGridArea endImplicitLine"
data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="315">
@@ -80,7 +80,7 @@
<div class="grid directionRTL">
<div class="absolute sizedToGridArea startImplicitLineSpan"
- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</div>
<div class="absolute sizedToGridArea endImplicitLineSpan"
data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="315">
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
index d81a9d55..dff31b8a 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
@@ -33,13 +33,13 @@
<div class="grid">
<div class="sizedToGridArea absolute secondRowSecondColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
<div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
<div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
</div>
@@ -48,7 +48,7 @@
data-offset-x="115" data-offset-y="65" data-expected-width="115" data-expected-height="165">
</div>
<div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
<div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
data-offset-x="115" data-offset-y="65" data-expected-width="115" data-expected-height="165">
@@ -57,13 +57,13 @@
<div class="grid directionRTL">
<div class="sizedToGridArea absolute secondRowSecondColumn"
- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
<div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
<div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
</div>
@@ -72,7 +72,7 @@
data-offset-x="0" data-offset-y="65" data-expected-width="115" data-expected-height="165">
</div>
<div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</div>
<div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
data-offset-x="0" data-offset-y="65" data-expected-width="115" data-expected-height="165">
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
index c1bb6fa4..9a2048f5a 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
@@ -47,25 +47,25 @@
<div class="grid">
<div class="absolute sizedToGridArea startAndEndUnknownLines"
- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</div>
<div class="absolute sizedToGridArea endUnknownLine"
data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</div>
<div class="absolute sizedToGridArea startUnknownLine"
- data-offset-x="15" data-offset-y="15" data-expected-width="315" data-expected-height="215">
+ data-offset-x="0" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
<div class="absolute sizedToGridArea startAndEndUnknownLines"
- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</div>
<div class="absolute sizedToGridArea endUnknownLine"
data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</div>
<div class="absolute sizedToGridArea startUnknownLine"
- data-offset-x="200" data-offset-y="15" data-expected-width="315" data-expected-height="215">
+ data-offset-x="215" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</div>
</div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
index 3da137b9..76b4272 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
@@ -60,7 +60,7 @@
<div class="unconstrainedContainer">
<div class="grid">
<div class="absolute autoRowAutoColumn sizedToGridArea"
- data-offset-x="15" data-offset-y="15" data-expected-width="1030" data-expected-height="1030">
+ data-offset-x="0" data-offset-y="0" data-expected-width="1030" data-expected-height="1030">
</div>
<div class="absolute secondRowSecondColumn sizedToGridArea"
data-offset-x="115" data-offset-y="65" data-expected-width="915" data-expected-height="965">
@@ -69,7 +69,7 @@
data-offset-x="15" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</div>
<div class="absolute endSecondRowEndSecondColumn sizedToGridArea"
- data-offset-x="15" data-offset-y="15" data-expected-width="315" data-expected-height="215">
+ data-offset-x="0" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</div>
</div>
</div>
@@ -77,7 +77,7 @@
<div class="unconstrainedContainer">
<div class="grid">
<div class="absolute autoRowAutoColumn lengthSize"
- data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="20">
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</div>
<div class="absolute secondRowSecondColumn lengthSize"
data-offset-x="115" data-offset-y="65" data-expected-width="50" data-expected-height="20">
@@ -86,7 +86,7 @@
data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</div>
<div class="absolute endSecondRowEndSecondColumn lengthSize"
- data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="20">
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</div>
</div>
</div>
@@ -94,7 +94,7 @@
<div class="unconstrainedContainer">
<div class="grid">
<div class="absolute autoRowAutoColumn percentageSize"
- data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="206">
+ data-offset-x="0" data-offset-y="0" data-expected-width="515" data-expected-height="206">
</div>
<div class="absolute secondRowSecondColumn percentageSize"
data-offset-x="115" data-offset-y="65" data-expected-width="457.5" data-expected-height="193">
@@ -103,7 +103,7 @@
data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="10">
</div>
<div class="absolute endSecondRowEndSecondColumn percentageSize"
- data-offset-x="15" data-offset-y="15" data-expected-width="157.5" data-expected-height="43">
+ data-offset-x="0" data-offset-y="0" data-expected-width="157.5" data-expected-height="43">
</div>
</div>
</div>
@@ -128,7 +128,7 @@
<div class="unconstrainedContainer">
<div class="grid directionRTL">
<div class="absolute autoRowAutoColumn sizedToGridArea"
- data-offset-x="-15" data-offset-y="15" data-expected-width="1030" data-expected-height="1030">
+ data-offset-x="0" data-offset-y="0" data-expected-width="1030" data-expected-height="1030">
</div>
<div class="absolute secondRowSecondColumn sizedToGridArea"
data-offset-x="0" data-offset-y="65" data-expected-width="915" data-expected-height="965">
@@ -137,7 +137,7 @@
data-offset-x="915" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</div>
<div class="absolute endSecondRowEndSecondColumn sizedToGridArea"
- data-offset-x="700" data-offset-y="15" data-expected-width="315" data-expected-height="215">
+ data-offset-x="715" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</div>
</div>
</div>
@@ -145,7 +145,7 @@
<div class="unconstrainedContainer">
<div class="grid directionRTL">
<div class="absolute autoRowAutoColumn lengthSize"
- data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="20">
+ data-offset-x="980" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</div>
<div class="absolute secondRowSecondColumn lengthSize"
data-offset-x="865" data-offset-y="65" data-expected-width="50" data-expected-height="20">
@@ -154,7 +154,7 @@
data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</div>
<div class="absolute endSecondRowEndSecondColumn lengthSize"
- data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="20">
+ data-offset-x="980" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</div>
</div>
</div>
@@ -162,7 +162,7 @@
<div class="unconstrainedContainer">
<div class="grid directionRTL">
<div class="absolute autoRowAutoColumn percentageSize"
- data-offset-x="500" data-offset-y="15" data-expected-width="515" data-expected-height="206">
+ data-offset-x="515" data-offset-y="0" data-expected-width="515" data-expected-height="206">
</div>
<div class="absolute secondRowSecondColumn percentageSize"
data-offset-x="457.5" data-offset-y="65" data-expected-width="457.5" data-expected-height="193">
@@ -171,7 +171,7 @@
data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="10">
</div>
<div class="absolute endSecondRowEndSecondColumn percentageSize"
- data-offset-x="858" data-offset-y="15" data-expected-width="157.5" data-expected-height="43">
+ data-offset-x="873" data-offset-y="0" data-expected-width="157.5" data-expected-height="43">
</div>
</div>
</div>
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index 04f532c..72ec0b6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -1653,6 +1653,12 @@
child->setOverrideContainingBlockContentLogicalHeight(rowBreadth);
child->setExtraInlineOffset(columnOffset);
child->setExtraBlockOffset(rowOffset);
+
+ if (child->parent() == this) {
+ PaintLayer* childLayer = child->layer();
+ childLayer->setStaticInlinePosition(borderStart() + columnOffset);
+ childLayer->setStaticBlockPosition(borderBefore() + rowOffset);
+ }
}
LayoutBlock::layoutPositionedObjects(relayoutChildren, info);
@@ -1740,14 +1746,6 @@
}
}
- if (child.parent() == this && !startIsAuto) {
- // If column/row start is "auto" the static position has been already set in prepareChildForPositionedLayout().
- PaintLayer* childLayer = child.layer();
- if (isForColumns)
- childLayer->setStaticInlinePosition(borderStart() + offset);
- else
- childLayer->setStaticBlockPosition(borderBefore() + offset);
- }
}
GridArea LayoutGrid::cachedGridArea(const LayoutBox& gridItem) const
