Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html |
index dcfb9f495f45dca3e0b163449c33e7664b35a895..edcf223c6d4e8ba01051a01e95a1cfeb7728a68d 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html |
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html |
@@ -2,6 +2,7 @@ |
<html> |
<head> |
<link href="resources/grid.css" rel="stylesheet"> |
+<link href="resources/grid-alignment.css" rel="stylesheet"> |
<script src="../../resources/check-layout.js"></script> |
<style> |
body { |
@@ -37,26 +38,6 @@ body { |
grid-auto-columns: auto; |
grid-auto-rows: auto; |
} |
- |
-.spaceBetween { |
- justify-content: space-between; |
- align-content: space-between; |
-} |
- |
-.spaceAround { |
- justify-content: space-around; |
- align-content: space-around; |
-} |
- |
-.spaceEvenly { |
- justify-content: space-evenly; |
- align-content: space-evenly; |
-} |
- |
-.stretch { |
- justify-content: stretch; |
- align-content: stretch; |
-} |
</style> |
</head> |
<body onload="checkLayout('.grid')"> |
@@ -65,7 +46,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | distribution: 'space-between'</p> |
- <div class="grid spaceBetween" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid contentSpaceBetween" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="160" data-expected-height="40"></div> |
<div class="b" data-offset-x="280" data-offset-y="0" data-expected-width="20" data-expected-height="200"></div> |
<div class="c" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div> |
@@ -75,7 +56,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | distribution: 'space-around'</p> |
- <div class="grid spaceAround" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid contentSpaceAround" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="40" data-offset-y="30" data-expected-width="120" data-expected-height="40"></div> |
<div class="b" data-offset-x="240" data-offset-y="30" data-expected-width="20" data-expected-height="140"></div> |
<div class="c" data-offset-x="40" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div> |
@@ -85,7 +66,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | distribution: 'space-evenly'</p> |
- <div class="grid spaceEvenly" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid contentSpaceEvenly" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="60" data-offset-y="40" data-expected-width="100" data-expected-height="40"></div> |
<div class="b" data-offset-x="220" data-offset-y="40" data-expected-width="20" data-expected-height="120"></div> |
<div class="c" data-offset-x="60" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div> |
@@ -95,7 +76,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | distribution: 'stretch'</p> |
- <div class="grid stretchedGrid stretch" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid stretchedGrid contentStretch" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div> |
<div class="b" data-offset-x="200" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div> |
<div class="c" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div> |
@@ -106,7 +87,7 @@ body { |
<!-- RTL direction. --> |
<div style="position: relative"> |
<p>direction: RTL | distribution: 'space-between'</p> |
- <div class="grid spaceBetween directionRTL" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid contentSpaceBetween directionRTL" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="140" data-offset-y="0" data-expected-width="160" data-expected-height="40"></div> |
<div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="200"></div> |
<div class="c" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div> |
@@ -116,7 +97,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | distribution: 'space-around'</p> |
- <div class="grid spaceAround directionRTL" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid contentSpaceAround directionRTL" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="140" data-offset-y="30" data-expected-width="120" data-expected-height="40"></div> |
<div class="b" data-offset-x="40" data-offset-y="30" data-expected-width="20" data-expected-height="140"></div> |
<div class="c" data-offset-x="240" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div> |
@@ -126,7 +107,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | distribution: 'space-evenly''</p> |
- <div class="grid spaceEvenly directionRTL" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid contentSpaceEvenly directionRTL" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="140" data-offset-y="40" data-expected-width="100" data-expected-height="40"></div> |
<div class="b" data-offset-x="60" data-offset-y="40" data-expected-width="20" data-expected-height="120"></div> |
<div class="c" data-offset-x="220" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div> |
@@ -136,7 +117,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | distribution: 'stretch'</p> |
- <div class="grid stretchedGrid stretch directionRTL" data-expected-width="300" data-expected-height="200"> |
+ <div class="grid stretchedGrid contentStretch directionRTL" data-expected-width="300" data-expected-height="200"> |
<div class="a" data-offset-x="100" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div> |
<div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div> |
<div class="c" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div> |