From ef7824a8ff88c95d36b31b377fe252f7c56d2da0 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 16 Nov 2018 09:54:35 +0100
Subject: [PATCH] [css-grid] Some fixes on grid-container-scrollbar-* tests

* Use Ahem font to avoid weird small pixel differences on iOS.
* Fix some typos reported by @fred-wang at https://bugs.webkit.org/show_bug.cgi?id=191656#c14
---
 .../grid-model/grid-container-scrollbar-001-ref.html         | 3 ++-
 css/css-grid/grid-model/grid-container-scrollbar-001.html    | 5 +++--
 .../grid-container-scrollbar-vertical-lr-001-ref.html        | 3 ++-
 .../grid-model/grid-container-scrollbar-vertical-lr-001.html | 5 +++--
 .../grid-container-scrollbar-vertical-rl-001-ref.html        | 3 ++-
 .../grid-model/grid-container-scrollbar-vertical-rl-001.html | 5 +++--
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html b/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html
index 31a9ef3db8e08d..f304cedfeaba12 100644
--- a/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html
+++ b/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html
@@ -4,6 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <style>
   .container {
+    font: 10px/1 Ahem;
     margin: 10px;
     background: grey;
   }
@@ -32,7 +33,7 @@
   }
 </style>
 
-<p>The test passes if it has the same output than the reference.</p>
+<p>The test passes if it has the same output as the reference.</p>
 
 <div style="float: left; width: 350px;">
 
diff --git a/css/css-grid/grid-model/grid-container-scrollbar-001.html b/css/css-grid/grid-model/grid-container-scrollbar-001.html
index 1b3c6eef691d99..b4ecd188db70e4 100644
--- a/css/css-grid/grid-model/grid-container-scrollbar-001.html
+++ b/css/css-grid/grid-model/grid-container-scrollbar-001.html
@@ -4,10 +4,11 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="match" href="grid-container-scrollbar-001-ref.html">
-<meta name="assert" content="This test verifes that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
+<meta name="assert" content="This test verifies that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
 <link href="support/grid.css" rel="stylesheet">
 <style>
   .grid {
+    font: 10px/1 Ahem;
     margin: 10px;
   }
 
@@ -29,7 +30,7 @@
   }
 </style>
 
-<p>The test passes if it has the same output than the reference.</p>
+<p>The test passes if it has the same output as the reference.</p>
 
 <div style="float: left; width: 350px;">
 
diff --git a/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html b/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html
index 512fb8a81d5778..e6640cc749e945 100644
--- a/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html
+++ b/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html
@@ -4,6 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <style>
   .container {
+    font: 10px/1 Ahem;
     margin: 10px;
     background: grey;
     writing-mode: vertical-lr;
@@ -33,7 +34,7 @@
   }
 </style>
 
-<p>The test passes if it has the same output than the reference.</p>
+<p>The test passes if it has the same output as the reference.</p>
 
 <div style="float: left; width: 350px;">
 
diff --git a/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html b/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
index ecdc7b76840692..6733759cf00b26 100644
--- a/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
+++ b/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
@@ -4,10 +4,11 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="match" href="grid-container-scrollbar-vertical-lr-001-ref.html">
-<meta name="assert" content="This test verifes that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
+<meta name="assert" content="This test verifies that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
 <link href="support/grid.css" rel="stylesheet">
 <style>
   .grid {
+    font: 10px/1 Ahem;
     margin: 10px;
     writing-mode: vertical-lr;
   }
@@ -30,7 +31,7 @@
   }
 </style>
 
-<p>The test passes if it has the same output than the reference.</p>
+<p>The test passes if it has the same output as the reference.</p>
 
 <div style="float: left; width: 350px;">
 
diff --git a/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html b/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html
index d8eeedfa07d572..2b1bbaebb46e93 100644
--- a/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html
+++ b/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html
@@ -4,6 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <style>
   .container {
+    font: 10px/1 Ahem;
     margin: 10px;
     background: grey;
     writing-mode: vertical-rl;
@@ -33,7 +34,7 @@
   }
 </style>
 
-<p>The test passes if it has the same output than the reference.</p>
+<p>The test passes if it has the same output as the reference.</p>
 
 <div style="float: left; width: 350px;">
 
diff --git a/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html b/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
index f2ab39ff505401..a3de9386a81af4 100644
--- a/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
+++ b/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
@@ -4,10 +4,11 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="match" href="grid-container-scrollbar-vertical-rl-001-ref.html">
-<meta name="assert" content="This test verifes that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
+<meta name="assert" content="This test verifies that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
 <link href="support/grid.css" rel="stylesheet">
 <style>
   .grid {
+    font: 10px/1 Ahem;
     margin: 10px;
     writing-mode: vertical-rl;
   }
@@ -30,7 +31,7 @@
   }
 </style>
 
-<p>The test passes if it has the same output than the reference.</p>
+<p>The test passes if it has the same output as the reference.</p>
 
 <div style="float: left; width: 350px;">