Modified: trunk/LayoutTests/ChangeLog (166609 => 166610)
--- trunk/LayoutTests/ChangeLog 2014-04-01 21:21:41 UTC (rev 166609)
+++ trunk/LayoutTests/ChangeLog 2014-04-01 21:22:56 UTC (rev 166610)
@@ -1,3 +1,16 @@
+2014-04-01 Javier Fernandez <jfernan...@igalia.com>
+
+ [CSS Grid Layout] Make the grid-item-margin-auto-columns-rows.html test a reftest
+ https://bugs.webkit.org/show_bug.cgi?id=130935
+
+ Reviewed by Darin Adler.
+
+ Removed the 'checkLayout' script references from the test.
+
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html: Added.
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt: Removed.
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows.html:
+
2014-04-01 Myles C. Maxfield <mmaxfi...@apple.com>
svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures.html and svg/css/font-face-crash.html frequently assert in ComplexTextController::offsetForPosition
Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html (0 => 166610)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html 2014-04-01 21:22:56 UTC (rev 166610)
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<html>
+<style>
+.grid {
+ display: block;
+ background-color: grey;
+ width: 200px;
+}
+
+.gridLong {
+ height: 120px;
+}
+
+.gridShort {
+ height: 100px;
+}
+
+.firstRowFirstColumn {
+ background-color: blue;
+ position: absolute;
+}
+
+.firstRowSecondColumn {
+ background-color: lime;
+ position: absolute;
+}
+
+.secondRowFirstColumn {
+ background-color: purple;
+ position: absolute;
+}
+
+.secondRowSecondColumn {
+ background-color: orange;
+ position: absolute;
+ left: 20px;
+}
+
+.gridItem {
+ width: 20px;
+ height: 40px;
+}
+
+.testContainer {
+ position: relative;
+ margin-bottom: 20px;
+}
+</style>
+</head>
+<body>
+
+<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="left: 180px; top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 180px; top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 160px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="left: 180px; top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 180px; top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 160px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="top: 80px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px; top: 80px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 0px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="top: 20px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="top: 60px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px; top: 40px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 0px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="top: 20px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="left: 180px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 180px; top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 160px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 80px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="left: 180px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 180px; top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 160px; top: 20px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="top: 0px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 20px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 80px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="top: 0px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="top: 60px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 20px; top: 20px;" ></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridLong">
+ <div class="gridItem firstRowFirstColumn" style="top: 80px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px; top: 80px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 0px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 20px;"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid gridShort">
+ <div class="gridItem firstRowFirstColumn" style="top: 60px;"></div>
+ <div class="gridItem firstRowSecondColumn" style="left: 20px; top: 40px;"></div>
+ <div class="gridItem secondRowFirstColumn" style="left: 0px;"></div>
+ <div class="gridItem secondRowSecondColumn" style="left: 20px;"></div>
+ </div>
+</div>
+
+</body>
+</html>
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt (166609 => 166610)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt 2014-04-01 21:21:41 UTC (rev 166609)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt 2014-04-01 21:22:56 UTC (rev 166610)
@@ -1,17 +0,0 @@
-This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
-PASS
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html (166609 => 166610)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html 2014-04-01 21:21:41 UTC (rev 166609)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html 2014-04-01 21:22:56 UTC (rev 166610)
@@ -4,7 +4,6 @@
if (window.testRunner)
testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
-<script src=""
<link href="" rel="stylesheet">
<style>
.grid {
@@ -25,14 +24,20 @@
.marginBottom {
margin-bottom: 20px;
}
+
+.testContainer {
+ position: relative;
+ margin-bottom: 20px;
+}
+
</style>
</head>
-<body _onload_="checkLayout('.grid')">
+<body>
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
-<div style="position: relative">
- <div class="grid" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -40,8 +45,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem marginBottom firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -49,8 +54,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalRL" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid verticalRL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -58,8 +63,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalRL" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid verticalRL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -67,8 +72,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalLR" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid verticalLR">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -76,8 +81,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalLR" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid verticalLR">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -85,8 +90,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid horizontalBT" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid horizontalBT">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -94,8 +99,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid horizontalBT" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid horizontalBT">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem marginBottom firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -104,8 +109,8 @@
</div>
<!-- rtl direction -->
-<div style="position: relative">
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -113,8 +118,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem marginBottom firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -122,8 +127,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalRL directionRTL" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid verticalRL directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -131,8 +136,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalRL directionRTL" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid verticalRL directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -140,8 +145,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalLR directionRTL" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid verticalLR directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
@@ -149,8 +154,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid verticalLR directionRTL" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid verticalLR directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -158,8 +163,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid horizontalBT directionRTL" data-expected-width="200" data-expected-height="120">
+<div class="testContainer">
+ <div class="grid horizontalBT directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem firstRowSecondColumn"></div>
<div class="gridItem marginBottom secondRowFirstColumn"></div>
@@ -167,8 +172,8 @@
</div>
</div>
-<div style="position: relative">
- <div class="grid horizontalBT directionRTL" data-expected-width="200" data-expected-height="100">
+<div class="testContainer">
+ <div class="grid horizontalBT directionRTL">
<div class="gridItem marginTop firstRowFirstColumn"></div>
<div class="gridItem marginBottom firstRowSecondColumn"></div>
<div class="gridItem secondRowFirstColumn"></div>
