| Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-margin-border-padding-scrollbar.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-margin-border-padding-scrollbar.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-margin-border-padding-scrollbar.html
|
| index f5b8bfee757538341925fb6e44e8d1d5e6506fcc..421a474bd991338d491c47096540fc56a6b9e1dc 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-margin-border-padding-scrollbar.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-margin-border-padding-scrollbar.html
|
| @@ -1,13 +1,10 @@
|
| <!DOCTYPE html>
|
| <html>
|
| <head>
|
| +<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
|
| +<link href="../css-intrinsic-dimensions/resources/height-keyword-classes.css" rel="stylesheet">
|
| <link href="resources/grid.css" rel="stylesheet">
|
| <style>
|
| -.grid {
|
| - width: -webkit-min-content;
|
| - height: -webkit-min-content;
|
| -}
|
| -
|
| .margin {
|
| margin: 10px;
|
| }
|
| @@ -35,67 +32,67 @@
|
| <body onload="checkLayout('.grid');">
|
| <p>This test checks that grid container size includes border, padding and scrollbar; ignoring margin as expected.</p>
|
|
|
| - <div class="grid" data-expected-width="100" data-expected-height="100">
|
| + <div class="grid min-content" data-expected-width="100" data-expected-height="100">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin" data-expected-width="100" data-expected-height="100">
|
| + <div class="grid min-content margin" data-expected-width="100" data-expected-height="100">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid border" data-expected-width="110" data-expected-height="110">
|
| + <div class="grid min-content border" data-expected-width="110" data-expected-height="110">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid padding" data-expected-width="140" data-expected-height="140">
|
| + <div class="grid min-content padding" data-expected-width="140" data-expected-height="140">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid scroll" data-expected-width="115" data-expected-height="115">
|
| + <div class="grid min-content scroll" data-expected-width="115" data-expected-height="115">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin border" data-expected-width="110" data-expected-height="110">
|
| + <div class="grid min-content margin border" data-expected-width="110" data-expected-height="110">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin padding" data-expected-width="140" data-expected-height="140">
|
| + <div class="grid min-content margin padding" data-expected-width="140" data-expected-height="140">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin scroll" data-expected-width="115" data-expected-height="115">
|
| + <div class="grid min-content margin scroll" data-expected-width="115" data-expected-height="115">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid border padding" data-expected-width="150" data-expected-height="150">
|
| + <div class="grid min-content border padding" data-expected-width="150" data-expected-height="150">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid border scroll" data-expected-width="125" data-expected-height="125">
|
| + <div class="grid min-content border scroll" data-expected-width="125" data-expected-height="125">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid padding scroll" data-expected-width="155" data-expected-height="155">
|
| + <div class="grid min-content padding scroll" data-expected-width="155" data-expected-height="155">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin border padding" data-expected-width="150" data-expected-height="150">
|
| + <div class="grid min-content margin border padding" data-expected-width="150" data-expected-height="150">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin border scroll" data-expected-width="125" data-expected-height="125">
|
| + <div class="grid min-content margin border scroll" data-expected-width="125" data-expected-height="125">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin padding scroll" data-expected-width="155" data-expected-height="155">
|
| + <div class="grid min-content margin padding scroll" data-expected-width="155" data-expected-height="155">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid border padding scroll" data-expected-width="165" data-expected-height="165">
|
| + <div class="grid min-content border padding scroll" data-expected-width="165" data-expected-height="165">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
| - <div class="grid margin border padding scroll" data-expected-width="165" data-expected-height="165">
|
| + <div class="grid min-content margin border padding scroll" data-expected-width="165" data-expected-height="165">
|
| <div class="item" data-expected-width="100" data-expected-height="100"></div>
|
| </div>
|
|
|
|
|