Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html |
index 7511d8183efccc92ec533cde6e3618ab3292cd38..53a4c9f2be595f33bd2b9a0d3fd180bd46f09680 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html |
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html |
@@ -1,7 +1,9 @@ |
<!DOCTYPE html> |
<html> |
<head> |
+<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet"> |
<link href="resources/grid.css" rel="stylesheet"> |
+<link href="resources/grid-alignment.css" rel="stylesheet"> |
<script src="../../resources/check-layout.js"></script> |
<style> |
body { |
@@ -11,7 +13,6 @@ body { |
.grid { |
grid-template-columns: 150px 150px; |
grid-template-rows: 120px 120px 120px; |
- width: -webkit-fit-content; |
margin-bottom: 20px; |
} |
@@ -30,94 +31,6 @@ body { |
height: 40px; |
} |
-.alignItemsCenter { |
- align-items: center; |
-} |
- |
-.alignItemsCenterSafe { |
- align-items: center safe; |
-} |
- |
-.alignItemsCenterUnsafe { |
- align-items: center unsafe; |
-} |
- |
-.alignItemsEnd { |
- align-items: end; |
-} |
- |
-.alignItemsEndSafe { |
- align-items: end safe; |
-} |
- |
-.alignItemsEndUnsafe { |
- align-items: end unsafe; |
-} |
- |
-.alignSelfCenter { |
- align-self: center; |
-} |
- |
-.alignSelfCenterSafe { |
- align-self: center safe; |
-} |
- |
-.alignSelfCenterUnsafe { |
- align-self: center unsafe; |
-} |
- |
-.alignSelfEnd { |
- align-self: end; |
-} |
- |
-.alignSelfEndSafe { |
- align-self: end safe; |
-} |
- |
-.alignSelfEndUnsafe { |
- align-self: end unsafe; |
-} |
- |
-.justifyItemsCenter { |
- justify-items: center; |
-} |
- |
-.justifyItemsCenterSafe { |
- justify-items: center safe; |
-} |
- |
-.justifyItemsCenterUnsafe { |
- justify-items: center unsafe; |
-} |
- |
-.justifyItemsEnd { |
- justify-items: end; |
-} |
- |
-.justifyItemsEndSafe { |
- justify-items: end safe; |
-} |
- |
-.justifyItemsEndUnsafe { |
- justify-items: end unsafe; |
-} |
- |
-.justifySelfCenter { |
- justify-self: center; |
-} |
- |
-.justifySelfCenterSafe { |
- justify-self: center safe; |
-} |
- |
-.justifySelfCenterUnsafe { |
- justify-self: center unsafe; |
-} |
- |
-.justifySelfEnd { |
- justify-self: end; |
-} |
- |
.thirdRowFirstColumn { |
background-color: green; |
grid-column: 1; |
@@ -130,7 +43,7 @@ body { |
<p>This test checks that the 'overflow' keyword is applied correctly for 'align' and 'justify' properties.</p> |
<div style="position: relative"> |
- <div class="grid alignItemsCenter justifyItemsCenter" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsCenter justifyItemsCenter" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowWidth firstRowFirstColumn" data-offset-x="-15" data-offset-y="40" data-expected-width="180" data-expected-height="40"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="50" data-offset-y="280" data-expected-width="50" data-expected-height="40"></div> |
@@ -141,7 +54,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsCenterUnsafe justifyItemsCenterUnsafe" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsCenterUnsafe justifyItemsCenterUnsafe" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="50" data-offset-y="-15" data-expected-width="50" data-expected-height="150"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="50" data-offset-y="280" data-expected-width="50" data-expected-height="40"></div> |
@@ -152,7 +65,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsCenterSafe justifyItemsCenterSafe" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsCenterSafe justifyItemsCenterSafe" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowWidth firstRowFirstColumn" data-offset-x="0" data-offset-y="40" data-expected-width="180" data-expected-height="40"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="50" data-offset-y="280" data-expected-width="50" data-expected-height="40"></div> |
@@ -163,7 +76,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsCenterSafe justifyItemsCenterSafe" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsCenterSafe justifyItemsCenterSafe" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="50" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="50" data-offset-y="280" data-expected-width="50" data-expected-height="40"></div> |
@@ -174,7 +87,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsEnd justifyItemsEnd" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsEnd justifyItemsEnd" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowWidth firstRowFirstColumn" data-offset-x="-30" data-offset-y="80" data-expected-width="180" data-expected-height="40"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn justifySelfCenter" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div> |
@@ -185,7 +98,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsEndUnsafe justifyItemsEndUnsafe" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsEndUnsafe justifyItemsEndUnsafe" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="100" data-offset-y="-30" data-expected-width="50" data-expected-height="150"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div> |
@@ -196,7 +109,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsEndSafe justifyItemsEndSafe" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsEndSafe justifyItemsEndSafe" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowWidth firstRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="180" data-expected-height="40"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn justifySelfCenterUnsafe" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div> |
@@ -207,7 +120,7 @@ body { |
</div> |
<div style="position: relative"> |
- <div class="grid alignItemsEndSafe justifyItemsEndSafe" data-expected-width="300" data-expected-height="360"> |
+ <div class="grid fit-content alignItemsEndSafe justifyItemsEndSafe" data-expected-width="300" data-expected-height="360"> |
<div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div> |
<div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div> |
<div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div> |