Bug 1439055: Tidy the ib-split remove-* tests. r?bz
Mostly removing some unneeded tags (<meta name=flags> is no longer needed, and
tagging it "dom" didn't seem appropriate to me). Also adding some tags that
match the WPT test template (charset / titles mostly). Also using consistent
indentation.
Finally, adding the needed
<link rel="match">
tags so that the exported tests work correctly upstream.
MozReview-Commit-ID: Lt83JmJE4pO
--- a/layout/reftests/ib-split/remove-from-split-inline-1-noib-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-1-noib-ref.html
@@ -1,17 +1,15 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- #start { border-right: none; }
- #two { border-left: none; }
- </style>
- </head>
- <body>
- <span id="start"></span>
- <div>One</div>
- <span id="two">
- Two
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<style>
+ body > span { border: 3px solid blue }
+ #start { border-right: none; }
+ #two { border-left: none; }
+</style>
+<span id="start"></span>
+<div>One</div>
+<span id="two">
+ Two
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-1-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-1-ref.html
@@ -1,14 +1,14 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body>
- <span
- ><div>One</div>
- Two
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-1-noib-ref.html">
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<span
+><div>One</div>
+ Two
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-1.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-1.html
@@ -1,26 +1,23 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body onload='doit()'>
- <span
- ><span id="target">Four</span
- ><div>One</div>
- Two
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-1-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<body onload='doit()'>
+ <span
+ ><span id="target">Four</span
+ ><div>One</div>
+ Two
+ </span>
+</body>
--- a/layout/reftests/ib-split/remove-from-split-inline-2-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-2-ref.html
@@ -1,14 +1,12 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body>
- <span>
- One
- Two
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<span>
+ One
+ Two
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-2.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-2.html
@@ -1,26 +1,23 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body onload='doit()'>
- <span>
- One
- <div id="target">Three</div>
- Two
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-2-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<body onload='doit()'>
+ <span>
+ One
+ <div id="target">Three</div>
+ Two
+ </span>
+</body>
--- a/layout/reftests/ib-split/remove-from-split-inline-3-noib-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-3-noib-ref.html
@@ -1,17 +1,15 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- #one { border-right: none; }
- #tail { border-left: none; }
- </style>
- </head>
- <body>
- <span id="one">
- One
- </span>
- <div>Two</div>
- <span id="tail"></span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<style>
+ body > span { border: 3px solid blue }
+ #one { border-right: none; }
+ #tail { border-left: none; }
+</style>
+<span id="one">
+ One
+</span>
+<div>Two</div>
+<span id="tail"></span>
--- a/layout/reftests/ib-split/remove-from-split-inline-3-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-3-ref.html
@@ -1,14 +1,14 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body>
- <span>
- One
- <div>Two</div
- ></span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-3-noib-ref.html">
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<span>
+ One
+ <div>Two</div
+></span>
--- a/layout/reftests/ib-split/remove-from-split-inline-3.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-3.html
@@ -1,27 +1,23 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- </head>
- <body onload='doit()'>
- <span>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-3-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<body onload='doit()'>
+ <span>
One
<div>Two</div
- ><span id="target">Three</span
+ ><span id="target">Three</span
></span>
- </body>
-</html>
+</body>
--- a/layout/reftests/ib-split/remove-from-split-inline-4-noib-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-4-noib-ref.html
@@ -1,20 +1,18 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- #one { border-right: none; }
- #four { border-left: none; }
- </style>
- </head>
- <body>
- <span id="one">
- One
- Two
- </span>
- <div>Three</div>
- <span id="four">
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<style>
+ body > span { border: 3px solid blue }
+ #one { border-right: none; }
+ #four { border-left: none; }
+</style>
+<span id="one">
+ One
+ Two
+</span>
+<div>Three</div>
+<span id="four">
+ Four
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-4-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-4-ref.html
@@ -1,16 +1,16 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body>
- <span>
- One
- Two
- <div>Three</div>
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-4-noib-ref.html">
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<span>
+ One
+ Two
+ <div>Three</div>
+ Four
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-4.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-4.html
@@ -1,28 +1,25 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body onload='doit()'>
- <span>
- One
- <div id="target">Five</div>
- Two
- <div>Three</div>
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-4-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<body onload='doit()'>
+ <span>
+ One
+ <div id="target">Five</div>
+ Two
+ <div>Three</div>
+ Four
+ </span>
+</body>
--- a/layout/reftests/ib-split/remove-from-split-inline-5-noib-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-5-noib-ref.html
@@ -1,20 +1,18 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- #one { border-right: none; }
- #three { border-left: none; }
- </style>
- </head>
- <body>
- <span id="one">
- One
- </span>
- <div>Two</div>
- <span id="three">
- Three
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<style>
+ body > span { border: 3px solid blue }
+ #one { border-right: none; }
+ #three { border-left: none; }
+</style>
+<span id="one">
+ One
+</span>
+<div>Two</div>
+<span id="three">
+ Three
+ Four
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-5-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-5-ref.html
@@ -1,16 +1,16 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body>
- <span>
- One
- <div>Two</div>
- Three
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-5-noib-ref.html">
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<span>
+ One
+ <div>Two</div>
+ Three
+ Four
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-5.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-5.html
@@ -1,28 +1,25 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body onload='doit()'>
- <span>
- One
- <div>Two</div>
- Three
- <div id="target">Five</div>
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-5-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<body onload='doit()'>
+ <span>
+ One
+ <div>Two</div>
+ Three
+ <div id="target">Five</div>
+ Four
+ </span>
+</body>
--- a/layout/reftests/ib-split/remove-from-split-inline-6-noib-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-6-noib-ref.html
@@ -1,20 +1,18 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- #one { border-right: none; }
- #four { border-left: none; }
- </style>
- </head>
- <body>
- <span id="one">
- One
- </span>
- <div>Two</div>
- <div>Three</div>
- <span id="four">
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<style>
+ body > span { border: 3px solid blue }
+ #one { border-right: none; }
+ #four { border-left: none; }
+</style>
+<span id="one">
+ One
+</span>
+<div>Two</div>
+<div>Three</div>
+<span id="four">
+ Four
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-6-ref.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-6-ref.html
@@ -1,16 +1,16 @@
<!DOCTYPE html>
-<html>
- <head>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body>
- <span>
- One
- <div>Two</div>
- <div>Three</div>
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-from-split-inline-6-noib-ref.html">
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<span>
+ One
+ <div>Two</div>
+ <div>Three</div>
+ Four
+</span>
--- a/layout/reftests/ib-split/remove-from-split-inline-6.html
+++ b/layout/reftests/ib-split/remove-from-split-inline-6.html
@@ -1,28 +1,25 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- <style>
- body > span { border: 3px solid blue }
- </style>
- </head>
- <body onload='doit()'>
- <span>
- One
- <div>Two</div>
- <span id="target">Five</span>
- <div>Three</div>
- Four
- </span>
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
+<link rel="match" href="remove-from-split-inline-6-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<style>
+ body > span { border: 3px solid blue }
+</style>
+<body onload='doit()'>
+ <span>
+ One
+ <div>Two</div>
+ <span id="target">Five</span>
+ <div>Three</div>
+ Four
+ </span>
+</body>
--- a/layout/reftests/ib-split/remove-split-inline-1-ref.html
+++ b/layout/reftests/ib-split/remove-split-inline-1-ref.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
-<html>
- <body>
- One
- Two
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+One
+Two
--- a/layout/reftests/ib-split/remove-split-inline-1.html
+++ b/layout/reftests/ib-split/remove-split-inline-1.html
@@ -1,25 +1,22 @@
<!DOCTYPE html>
-<html>
- <head>
- <title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
- <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
- <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
- <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level"/>
- <meta name="flags" content="dom" />
- <script>
- function doit() {
- var target = document.getElementById("target");
- target.remove();
- }
- </script>
- </head>
- <body onload='doit()'>
- One
- <span id="target">
- Three
- <div>Four</div>
- Five
- </span>
- Two
- </body>
-</html>
+<meta charset="utf-8">
+<title>CSS 2.1 Test Suite: handling of blocks inside inlines</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+<link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level">
+<link rel="match" href="remove-split-inline-1-ref.html">
+<script>
+function doit() {
+ var target = document.getElementById("target");
+ target.remove();
+}
+</script>
+<body onload='doit()'>
+ One
+ <span id="target">
+ Three
+ <div>Four</div>
+ Five
+ </span>
+ Two
+</body>