From 914368530ba622ff0117cd34bec058fb0d862155 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 4 Feb 2021 19:41:06 +0000
Subject: Issue #439 - Remove web-platform tests from the tree.

This removes a total of 23,936 files we would never use nor have the capacity
to properly maintain or keep up-to-date.
---
 .../tests/2dcontext/text-styles/.gitkeep           |  0
 .../text-styles/2d.text.align.default.html         | 27 -----------
 .../text-styles/2d.text.align.invalid.html         | 41 ----------------
 .../2dcontext/text-styles/2d.text.align.valid.html | 40 ----------------
 .../text-styles/2d.text.baseline.default.html      | 27 -----------
 .../text-styles/2d.text.baseline.invalid.html      | 41 ----------------
 .../text-styles/2d.text.baseline.valid.html        | 43 -----------------
 .../text-styles/2d.text.draw.baseline.bottom.html  | 48 -------------------
 .../text-styles/2d.text.draw.baseline.hanging.html | 48 -------------------
 .../2d.text.draw.baseline.ideographic.html         | 48 -------------------
 .../text-styles/2d.text.draw.baseline.middle.html  | 48 -------------------
 .../text-styles/2d.text.draw.baseline.top.html     | 48 -------------------
 .../2d.text.draw.space.collapse.end.html           | 44 -----------------
 .../2d.text.draw.space.collapse.other.html         | 43 -----------------
 .../2d.text.draw.space.collapse.space.html         | 43 -----------------
 .../2d.text.draw.space.collapse.start.html         | 43 -----------------
 .../text-styles/2d.text.font.default.html          | 27 -----------
 .../text-styles/2d.text.font.parse.basic.html      | 31 ------------
 .../text-styles/2d.text.font.parse.complex.html    | 28 -----------
 .../text-styles/2d.text.font.parse.invalid.html    | 56 ----------------------
 ...2d.text.font.parse.size.percentage.default.html | 30 ------------
 .../2d.text.font.parse.size.percentage.html        | 30 ------------
 .../text-styles/2d.text.font.parse.system.html     | 28 -----------
 .../text-styles/2d.text.measure.width.space.html   | 44 -----------------
 .../text-styles/canvas_text_font_001-ref.htm       | 22 ---------
 .../2dcontext/text-styles/canvas_text_font_001.htm | 33 -------------
 26 files changed, 961 deletions(-)
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/.gitkeep
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.align.invalid.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.align.valid.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.default.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.invalid.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.valid.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.bottom.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.hanging.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.ideographic.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.middle.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.top.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.end.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.other.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.space.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.start.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.default.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.basic.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.complex.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.invalid.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.default.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.system.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.measure.width.space.html
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001-ref.htm
 delete mode 100644 testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001.htm

(limited to 'testing/web-platform/tests/2dcontext/text-styles')

diff --git a/testing/web-platform/tests/2dcontext/text-styles/.gitkeep b/testing/web-platform/tests/2dcontext/text-styles/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html
deleted file mode 100644
index 6c3b5016a..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.default.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.align.default</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.align.default</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-_assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.invalid.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.invalid.html
deleted file mode 100644
index 36d3aaaf4..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.invalid.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.align.invalid</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.align.invalid</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.textAlign = 'start';
-ctx.textAlign = 'bogus';
-_assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
-ctx.textAlign = 'start';
-ctx.textAlign = 'END';
-_assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
-ctx.textAlign = 'start';
-ctx.textAlign = 'end ';
-_assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
-ctx.textAlign = 'start';
-ctx.textAlign = 'end\0';
-_assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.valid.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.valid.html
deleted file mode 100644
index 667f1bb0b..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.align.valid.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.align.valid</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.align.valid</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.textAlign = 'start';
-_assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
-ctx.textAlign = 'end';
-_assertSame(ctx.textAlign, 'end', "ctx.textAlign", "'end'");
-
-ctx.textAlign = 'left';
-_assertSame(ctx.textAlign, 'left', "ctx.textAlign", "'left'");
-
-ctx.textAlign = 'right';
-_assertSame(ctx.textAlign, 'right', "ctx.textAlign", "'right'");
-
-ctx.textAlign = 'center';
-_assertSame(ctx.textAlign, 'center', "ctx.textAlign", "'center'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.default.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.default.html
deleted file mode 100644
index b19bcc37e..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.default.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.baseline.default</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.baseline.default</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-_assertSame(ctx.textBaseline, 'alphabetic', "ctx.textBaseline", "'alphabetic'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.invalid.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.invalid.html
deleted file mode 100644
index 4cba62a14..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.invalid.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.baseline.invalid</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.baseline.invalid</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.textBaseline = 'top';
-ctx.textBaseline = 'bogus';
-_assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
-ctx.textBaseline = 'top';
-ctx.textBaseline = 'MIDDLE';
-_assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
-ctx.textBaseline = 'top';
-ctx.textBaseline = 'middle ';
-_assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
-ctx.textBaseline = 'top';
-ctx.textBaseline = 'middle\0';
-_assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.valid.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.valid.html
deleted file mode 100644
index e2a37b4ed..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.baseline.valid.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.baseline.valid</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.baseline.valid</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.textBaseline = 'top';
-_assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
-ctx.textBaseline = 'hanging';
-_assertSame(ctx.textBaseline, 'hanging', "ctx.textBaseline", "'hanging'");
-
-ctx.textBaseline = 'middle';
-_assertSame(ctx.textBaseline, 'middle', "ctx.textBaseline", "'middle'");
-
-ctx.textBaseline = 'alphabetic';
-_assertSame(ctx.textBaseline, 'alphabetic', "ctx.textBaseline", "'alphabetic'");
-
-ctx.textBaseline = 'ideographic';
-_assertSame(ctx.textBaseline, 'ideographic', "ctx.textBaseline", "'ideographic'");
-
-ctx.textBaseline = 'bottom';
-_assertSame(ctx.textBaseline, 'bottom', "ctx.textBaseline", "'bottom'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.bottom.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.bottom.html
deleted file mode 100644
index cde7e891d..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.bottom.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.baseline.bottom</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.baseline.bottom</h1>
-<p class="desc">textBaseline bottom is the bottom of the em square (not the bounding box)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("textBaseline bottom is the bottom of the em square (not the bounding box)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.textBaseline = 'bottom';
-    ctx.fillText('CC', 0, 50);
-    _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.hanging.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.hanging.html
deleted file mode 100644
index e5bdb98cc..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.hanging.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.baseline.hanging</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.baseline.hanging</h1>
-<p class="desc"></p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.textBaseline = 'hanging';
-    ctx.fillText('CC', 0, 12.5);
-    _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.ideographic.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.ideographic.html
deleted file mode 100644
index cc99e1ab4..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.ideographic.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.baseline.ideographic</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.baseline.ideographic</h1>
-<p class="desc"></p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.textBaseline = 'ideographic';
-    ctx.fillText('CC', 0, 31.25);
-    _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.middle.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.middle.html
deleted file mode 100644
index 6cdbb17e6..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.middle.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.baseline.middle</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.baseline.middle</h1>
-<p class="desc">textBaseline middle is the middle of the em square (not the bounding box)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("textBaseline middle is the middle of the em square (not the bounding box)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.textBaseline = 'middle';
-    ctx.fillText('CC', 0, 25);
-    _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.top.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.top.html
deleted file mode 100644
index 15c0c1f38..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.baseline.top.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.baseline.top</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.baseline.top</h1>
-<p class="desc">textBaseline top is the top of the em square (not the bounding box)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("textBaseline top is the top of the em square (not the bounding box)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.textBaseline = 'top';
-    ctx.fillText('CC', 0, 0);
-    _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.end.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.end.html
deleted file mode 100644
index 9ce607000..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.end.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.space.collapse.end</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.space.collapse.end</h1>
-<p class="desc">Space characters at the end of a line are collapsed (per CSS)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("Space characters at the end of a line are collapsed (per CSS)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.textAlign = 'right';
-    ctx.fillText('EE ', 100, 37.5);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.other.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.other.html
deleted file mode 100644
index 25275b5b5..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.other.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.space.collapse.other</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.space.collapse.other</h1>
-<p class="desc">Space characters are converted to U+0020, and collapsed (per CSS)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("Space characters are converted to U+0020, and collapsed (per CSS)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillText('E \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dEE', -100, 37.5);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.space.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.space.html
deleted file mode 100644
index 3069e7946..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.space.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.space.collapse.space</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.space.collapse.space</h1>
-<p class="desc">Space characters are converted to U+0020, and collapsed (per CSS)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("Space characters are converted to U+0020, and collapsed (per CSS)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillText('E  EE', -100, 37.5);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.start.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.start.html
deleted file mode 100644
index b3b05f436..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.draw.space.collapse.start.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.draw.space.collapse.start</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.draw.space.collapse.start</h1>
-<p class="desc">Space characters at the start of a line are collapsed (per CSS)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("Space characters at the start of a line are collapsed (per CSS)");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50px CanvasTest';
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillText(' EE', 0, 37.5);
-    _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-    _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.default.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.default.html
deleted file mode 100644
index e7405e350..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.default.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.default</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.default</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-_assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.basic.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.basic.html
deleted file mode 100644
index b4ae41cbc..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.basic.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.parse.basic</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.parse.basic</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '20px serif';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20PX   SERIF';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.complex.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.complex.html
deleted file mode 100644
index 51917f361..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.complex.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.parse.complex</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.parse.complex</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.font = 'small-caps italic 400 12px/2 Unknown Font, sans-serif';
-_assertSame(ctx.font, 'italic small-caps 12px "Unknown Font", sans-serif', "ctx.font", "'italic small-caps 12px \"Unknown Font\", sans-serif'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.invalid.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.invalid.html
deleted file mode 100644
index f65d680b0..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.invalid.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.parse.invalid</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.parse.invalid</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '20px serif';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = 'bogus';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = 'inherit';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = '10px {bogus}';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = '10px initial';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = '10px default';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = '10px inherit';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-ctx.font = '20px serif';
-ctx.font = '1em serif; background: green; margin: 10px';
-_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.default.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.default.html
deleted file mode 100644
index 21eebde0f..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.default.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.parse.size.percentage.default</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.parse.size.percentage.default</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-var canvas2 = document.createElement('canvas');
-var ctx2 = canvas2.getContext('2d');
-ctx2.font = '1000% serif';
-_assertSame(ctx2.font, '100px serif', "ctx2.font", "'100px serif'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.html
deleted file mode 100644
index 6a05e48cf..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.size.percentage.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.parse.size.percentage</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.parse.size.percentage</h1>
-<p class="desc"></p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" style="font-size: 144px" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
-
-ctx.font = '50% serif';
-_assertSame(ctx.font, '72px serif', "ctx.font", "'72px serif'");
-canvas.setAttribute('style', 'font-size: 100px');
-_assertSame(ctx.font, '72px serif', "ctx.font", "'72px serif'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.system.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.system.html
deleted file mode 100644
index bc86f5c15..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.parse.system.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.font.parse.system</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.text.font.parse.system</h1>
-<p class="desc">System fonts must be computed to explicit values</p>
-
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("System fonts must be computed to explicit values");
-_addTest(function(canvas, ctx) {
-
-ctx.font = 'message-box';
-_assertDifferent(ctx.font, 'message-box', "ctx.font", "'message-box'");
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.measure.width.space.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.measure.width.space.html
deleted file mode 100644
index dfa1dee1c..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/2d.text.measure.width.space.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.text.measure.width.space</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.measure.width.space</h1>
-<p class="desc">Space characters are converted to U+0020 and collapsed (per CSS)</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-var t = async_test("Space characters are converted to U+0020 and collapsed (per CSS)");
-_addTest(function(canvas, ctx) {
-
-deferTest();
-setTimeout(t.step_func_done(function () {
-    ctx.font = '50px CanvasTest';
-    _assertSame(ctx.measureText('A B').width, 150, "ctx.measureText('A B').width", "150");
-    _assertSame(ctx.measureText('A  B').width, 150, "ctx.measureText('A  B').width", "150");
-    _assertSame(ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width, 150, "ctx.measureText('A \\x09\\x0a\\x0c\\x0d  \\x09\\x0a\\x0c\\x0dB').width", "150");
-    _assert(ctx.measureText('A \x0b B').width >= 200, "ctx.measureText('A \\x0b B').width >= 200");
-
-    _assertSame(ctx.measureText(' AB').width, 100, "ctx.measureText(' AB').width", "100");
-    _assertSame(ctx.measureText('AB ').width, 100, "ctx.measureText('AB ').width", "100");
-}), 500);
-
-
-});
-</script>
-
diff --git a/testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001-ref.htm b/testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001-ref.htm
deleted file mode 100644
index 1a19757e0..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001-ref.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype HTML>
-<html>
-    <head>
-        <title>HTML5 Canvas Test:  Ignore property-independent style sheet syntax "inherit" in Text (reference)</title>
-        <script type="text/javascript">
-            function runTest()
-            {
-                var canvas = document.getElementById("canvas1");
-                var ctx = canvas.getContext("2d");
-
-                ctx.font = "40px Ahem";
-                ctx.fillText("Filler", 5, 50);
-                ctx.fillText("Filler", 5, 100);
-            }
-        </script>
-    </head>
-    <body onload="runTest()">
-        <p>Description:  Ignore "inherit" property-independent style sheet syntax without assigning a new font value.</p>
-        <p>Test passes if there are two identical black boxes below.</p>
-        <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
-    </body>
-</html>
diff --git a/testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001.htm b/testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001.htm
deleted file mode 100644
index 923ce71c0..000000000
--- a/testing/web-platform/tests/2dcontext/text-styles/canvas_text_font_001.htm
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype HTML>
-<html>
-    <head>
-        <title>HTML5 Canvas Test:  Ignore property-independent style sheet syntax "inherit" in Text</title>
-        <link rel="match" href="canvas_text_font_001-ref.htm" />
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com" />
-        <link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-font" />
-        <meta name="assert" content=":  Ignore 'inherit' property-independent style sheet syntax without assigning a new font value." />
-        <script type="text/javascript">
-            function runTest()
-            {
-                var canvas = document.getElementById("canvas1");
-                var ctx = canvas.getContext("2d");
-
-                // Assign a valid font.
-                ctx.font = "40px Ahem";
-
-                // Assign property-independent style sheet syntax 'inherit' as font (this must be ignored).
-                ctx.font = "20px inherit";
-                ctx.fillText("Filler", 5, 50);
-
-                // Assign a valid font which was used earlier.
-                ctx.font = "40px Ahem";
-                ctx.fillText("Filler", 5, 100);
-            }
-        </script>
-    </head>
-    <body onload="runTest()">
-        <p>Description:  Ignore "inherit" property-independent style sheet syntax without assigning a new font value.</p>
-        <p>Test passes if there are two identical black boxes below.</p>
-        <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
-    </body>
-</html>
-- 
cgit v1.2.3