aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2020-01-20 14:49:10 +0100
committerMartin Robinson <mrobinson@igalia.com>2020-01-21 15:29:23 +0100
commite4a55d77555ec60ce37f8272cfe6ec7292b6af5f (patch)
treeb7d8bbe1e266191461cd68f9556ff6f766e0f65c
parent1cd772fe5f8583bdf22ae9cc264c4a1c37f1a088 (diff)
downloadservo-e4a55d77555ec60ce37f8272cfe6ec7292b6af5f.tar.gz
servo-e4a55d77555ec60ce37f8272cfe6ec7292b6af5f.zip
Add a workaround to root_scroll.html for #25559
This allows us to test initial root scrolling support in Layout 2020 and can hopefully be removed very soon.
-rw-r--r--tests/wpt/mozilla/meta/MANIFEST.json4
-rw-r--r--tests/wpt/mozilla/tests/mozilla/scroll_root.html3
-rw-r--r--tests/wpt/mozilla/tests/mozilla/scroll_root_ref.html7
3 files changed, 12 insertions, 2 deletions
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 380ca0c7023..a683eeb8628 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -19368,11 +19368,11 @@
"testharness"
],
"mozilla/scroll_root.html": [
- "b1a9cb590b0fcce9c883f99e17fa029a999b699b",
+ "5896eb3957da1eb85a26680053823d3f3bf9af49",
"reftest"
],
"mozilla/scroll_root_ref.html": [
- "6503ad5d5265c0698f61fc607e2e4e017b31cb6f",
+ "c7d4cfec7b9d9b5daf32841172721ddac3e4d071",
"support"
],
"mozilla/scroll_top_null_target.html": [
diff --git a/tests/wpt/mozilla/tests/mozilla/scroll_root.html b/tests/wpt/mozilla/tests/mozilla/scroll_root.html
index b1a9cb590b0..5896eb3957d 100644
--- a/tests/wpt/mozilla/tests/mozilla/scroll_root.html
+++ b/tests/wpt/mozilla/tests/mozilla/scroll_root.html
@@ -7,6 +7,9 @@
<style>
body {
background: green;
+
+ /* FIXME(mrobinson): Remove this workaround when #25559 is fixed. */
+ margin: 0;
}
</style>
</head>
diff --git a/tests/wpt/mozilla/tests/mozilla/scroll_root_ref.html b/tests/wpt/mozilla/tests/mozilla/scroll_root_ref.html
index 6503ad5d526..c7d4cfec7b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/scroll_root_ref.html
+++ b/tests/wpt/mozilla/tests/mozilla/scroll_root_ref.html
@@ -5,7 +5,14 @@
<style>
body {
background: green;
+
+ /* FIXME(mrobinson): Remove this workaround when #25559 is fixed. */
+ margin: 0;
}
</style>
</head>
+ <body>
+ <!-- FIXME(mrobinson): Remove this workaround div when #25559 is fixed. -->
+ <div style="height: 10000px;"></div>
+ </body>
</html>