Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html |
index 455114d851a69daf8bb43b3197090efc93535995..482c936cdaf8f68f1054fa3050e144b4c2584943 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html |
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html |
@@ -1,6 +1,7 @@ |
<!DOCTYPE html> |
<html> |
<head> |
+<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet"> |
<link href="resources/grid.css" rel="stylesheet"> |
<script src="../../resources/check-layout.js"></script> |
<style> |
@@ -11,7 +12,6 @@ body { |
.grid { |
grid-template-columns: 100px 100px; |
grid-template-rows: 200px 200px; |
- width: -webkit-fit-content; |
margin-bottom: 20px; |
position: relative; |
font: 15px/1 Ahem; |
@@ -38,7 +38,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | margin: 4px 8px 12px 16px</p> |
- <div class="grid" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content" data-expected-width="200" data-expected-height="400"> |
<div class="margins firstRowFirstColumn" data-offset-x="16" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="76" data-expected-client-height="184">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -48,7 +48,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | border: 5px 10px 15px 20px</p> |
- <div class="grid" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content" data-expected-width="200" data-expected-height="400"> |
<div class="borders firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="70" data-expected-client-height="180">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -58,7 +58,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | padding: 4px 6px 8px 10px</p> |
- <div class="grid" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content" data-expected-width="200" data-expected-height="400"> |
<div class="paddings firstRowFirstColumn" data-total-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -68,7 +68,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | margin: 4px 8px 12px 16px | border: 5px 10px 15px 20px</p> |
- <div class="grid" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content" data-expected-width="200" data-expected-height="400"> |
<div class="margins borders firstRowFirstColumn" data-offset-x="16" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="46" data-expected-client-height="164">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -78,7 +78,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | margin: 4px 8px 12px 16px | padding: 4px 6px 8px 10px</p> |
- <div class="grid" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content" data-expected-width="200" data-expected-height="400"> |
<div class="margins paddings firstRowFirstColumn" data-offset-x="16" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="76" data-expected-client-height="184">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -88,7 +88,7 @@ body { |
<div style="position: relative"> |
<p>direction: LTR | margin: 4px 8px 12px 16px | border: 5px 10px 15px 20px | padding: 4px 6px 8px 10px</p> |
- <div class="grid" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content" data-expected-width="200" data-expected-height="400"> |
<div class="margins borders paddings firstRowFirstColumn" data-offset-x="16" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="46" data-expected-client-height="164">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -99,7 +99,7 @@ body { |
<!-- rtl direction --> |
<div style="position: relative"> |
<p>direction: RTL | margin: 4px 8px 12px 16px</p> |
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400"> |
<div class="margins firstRowFirstColumn" data-offset-x="116" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="76" data-expected-client-height="184">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -109,7 +109,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | border: 5px 10px 15px 20px</p> |
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400"> |
<div class="borders firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="70" data-expected-client-height="180">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -119,7 +119,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | padding: 4px 6px 8px 10px</p> |
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400"> |
<div class="paddings firstRowFirstColumn" data-total-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -129,7 +129,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | margin: 4px 8px 12px 16px | border: 5px 10px 15px 20px</p> |
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400"> |
<div class="margins borders firstRowFirstColumn" data-offset-x="116" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="46" data-expected-client-height="164">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -139,7 +139,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | margin: 4px 8px 12px 16px | padding: 4px 6px 8px 10px</p> |
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400"> |
<div class="margins paddings firstRowFirstColumn" data-offset-x="116" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="76" data-expected-client-height="184">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
@@ -149,7 +149,7 @@ body { |
<div style="position: relative"> |
<p>direction: RTL | margin: 4px 8px 12px 16px | border: 5px 10px 15px 20px | padding: 4px 6px 8px 10px</p> |
- <div class="grid directionRTL" data-expected-width="200" data-expected-height="400"> |
+ <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400"> |
<div class="margins borders paddings firstRowFirstColumn" data-offset-x="116" data-offset-y="4" data-expected-width="76" data-expected-height="184" data-expected-client-width="46" data-expected-client-height="164">X X X X X X X X X X</div> |
<div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |
<div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="200" data-expected-client-width="100" data-expected-client-height="200"></div> |