From aa80f9139909b451d434093e0ef38266f56bda3e Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 9 Jul 2020 20:01:01 -0400
Subject: [PATCH] dom: Use pref macro for IDL conditional guards.

---
 components/config/prefs.rs                                    | 1 -
 components/script/dom/bindings/codegen/CodegenRust.py         | 2 +-
 components/script/dom/webidls/CanvasRenderingContext2D.webidl | 4 ++--
 components/script/dom/webidls/CompositionEvent.webidl         | 2 +-
 components/script/dom/webidls/CustomElementRegistry.webidl    | 2 +-
 components/script/dom/webidls/TextMetrics.webidl              | 2 +-
 resources/prefs.json                                          | 2 +-
 tests/wpt/metadata/html/canvas/__dir__.ini                    | 2 +-
 .../2d.text.draw.fill.maxWidth.NaN.html.ini                   | 4 ----
 .../2d.text.draw.fill.maxWidth.fontface.html.ini              | 4 ----
 .../2d.text.draw.fill.maxWidth.negative.html.ini              | 4 ----
 .../2d.text.draw.fill.maxWidth.small.html.ini                 | 4 ----
 .../2d.text.draw.fill.maxWidth.zero.html.ini                  | 4 ----
 .../2d.text.draw.fill.unaffected.html.ini                     | 4 ----
 .../drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini | 4 ----
 .../2d.text.draw.fontface.notinpage.html.ini                  | 4 ----
 .../2d.text.draw.fontface.repeat.html.ini                     | 4 ----
 .../element/manual/text-styles/canvas_text_font_001.htm.ini   | 2 --
 .../text-styles/2d.text.draw.space.collapse.start.html.ini    | 4 ----
 .../offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini    | 4 ----
 .../text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini         | 4 ----
 .../text/2d.text.draw.fill.maxWidth.negative.html.ini         | 4 ----
 .../text/2d.text.draw.fill.maxWidth.negative.worker.js.ini    | 4 ----
 .../offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini  | 4 ----
 .../text/2d.text.draw.fill.maxWidth.small.worker.js.ini       | 4 ----
 .../offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini   | 4 ----
 .../text/2d.text.draw.fill.maxWidth.zero.worker.js.ini        | 4 ----
 .../offscreen/text/2d.text.draw.fill.unaffected.html.ini      | 4 ----
 .../offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini | 4 ----
 .../extensions/oes-texture-float-with-canvas.html.ini         | 2 --
 .../extensions/oes-texture-half-float-with-canvas.html.ini    | 2 --
 .../canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini  | 2 --
 ...-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini | 2 --
 .../textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini     | 2 --
 .../canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini       | 2 --
 .../textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini   | 2 --
 .../canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini   | 2 --
 .../canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini   | 2 --
 38 files changed, 8 insertions(+), 109 deletions(-)
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/manual/text-styles/canvas_text_font_001.htm.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini

diff --git a/components/config/prefs.rs b/components/config/prefs.rs
index cab08d066da..2cd1359f9fd 100644
--- a/components/config/prefs.rs
+++ b/components/config/prefs.rs
@@ -134,7 +134,6 @@ mod gen {
                     }
                 },
                 canvas_text: {
-                    #[serde(rename = "dom.canvas-text.enabled")]
                     enabled: bool,
                 },
                 composition_event: {
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index b078a8dac8a..c80fec57b5b 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2662,7 +2662,7 @@ class CGConstructorEnabled(CGAbstractMethod):
         pref = iface.getExtendedAttribute("Pref")
         if pref:
             assert isinstance(pref, list) and len(pref) == 1
-            conditions.append('prefs::pref_map().get("%s").as_bool().unwrap_or(false)' % pref[0])
+            conditions.append('pref!(%s)' % pref[0])
 
         func = iface.getExtendedAttribute("Func")
         if func:
diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index 62669f4c2ba..6216ec50505 100644
--- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -148,12 +148,12 @@ interface mixin CanvasUserInterface {
 [Exposed=(PaintWorklet, Window, Worker)]
 interface mixin CanvasText {
   // text (see also the CanvasPathDrawingStyles and CanvasTextDrawingStyles interfaces)
-  [Pref="dom.canvas-text.enabled"]
+  [Pref="dom.canvas_text.enabled"]
   void fillText(DOMString text, unrestricted double x, unrestricted double y,
                 optional unrestricted double maxWidth);
   //void strokeText(DOMString text, unrestricted double x, unrestricted double y,
   //                optional unrestricted double maxWidth);
-  [Pref="dom.canvas-text.enabled"]
+  [Pref="dom.canvas_text.enabled"]
   TextMetrics measureText(DOMString text);
 };
 
diff --git a/components/script/dom/webidls/CompositionEvent.webidl b/components/script/dom/webidls/CompositionEvent.webidl
index 91bf7f45b3f..1ed323d26b3 100644
--- a/components/script/dom/webidls/CompositionEvent.webidl
+++ b/components/script/dom/webidls/CompositionEvent.webidl
@@ -8,7 +8,7 @@
  */
 
 // https://w3c.github.io/uievents/#idl-compositionevent
-[Exposed=Window, Pref="dom.compositionevent.enabled"]
+[Exposed=Window, Pref="dom.composition_event.enabled"]
 interface CompositionEvent : UIEvent {
   [Throws] constructor(DOMString type, optional CompositionEventInit eventInitDict = {});
   readonly attribute DOMString data;
diff --git a/components/script/dom/webidls/CustomElementRegistry.webidl b/components/script/dom/webidls/CustomElementRegistry.webidl
index 3ba49a2082c..be47962c067 100644
--- a/components/script/dom/webidls/CustomElementRegistry.webidl
+++ b/components/script/dom/webidls/CustomElementRegistry.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#customelementregistry
-[Exposed=Window, Pref="dom.customelements.enabled"]
+[Exposed=Window, Pref="dom.custom_elements.enabled"]
 interface CustomElementRegistry {
   [Throws, CEReactions]
   void define(DOMString name, CustomElementConstructor constructor_, optional ElementDefinitionOptions options = {});
diff --git a/components/script/dom/webidls/TextMetrics.webidl b/components/script/dom/webidls/TextMetrics.webidl
index f3d90450824..efba27450fe 100644
--- a/components/script/dom/webidls/TextMetrics.webidl
+++ b/components/script/dom/webidls/TextMetrics.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#textmetrics
-[Exposed=(PaintWorklet, Window, Worker), Pref="dom.canvas-text.enabled"]
+[Exposed=(PaintWorklet, Window, Worker), Pref="dom.canvas_text.enabled"]
 interface TextMetrics {
   // x-direction
   readonly attribute double width; // advance width
diff --git a/resources/prefs.json b/resources/prefs.json
index 364e25c5682..cdbae48705f 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -1,7 +1,7 @@
 {
   "dom.bluetooth.enabled": false,
   "dom.bluetooth.testing.enabled": false,
-  "dom.canvas-text.enabled": true,
+  "dom.canvas_text.enabled": true,
   "dom.compositionevent.enabled": false,
   "dom.customelements.enabled": true,
   "dom.document.dblclick_dist": 1,
diff --git a/tests/wpt/metadata/html/canvas/__dir__.ini b/tests/wpt/metadata/html/canvas/__dir__.ini
index fdab11dc1ac..03004f6efd7 100644
--- a/tests/wpt/metadata/html/canvas/__dir__.ini
+++ b/tests/wpt/metadata/html/canvas/__dir__.ini
@@ -1 +1 @@
-prefs: ["dom.canvas-text.enabled:false","dom.offscreen_canvas.enabled:true"]
+prefs: ["dom.offscreen_canvas.enabled:true"]
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html.ini
deleted file mode 100644
index 129f379a8aa..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.NaN.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html.ini
deleted file mode 100644
index 3e7da9f9a61..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.fontface.html]
-  [fillText works on @font-face fonts]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html.ini
deleted file mode 100644
index f21a4d447ca..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.negative.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html.ini
deleted file mode 100644
index 5dea18865be..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.small.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html.ini
deleted file mode 100644
index ab0f01f5495..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.zero.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html.ini
deleted file mode 100644
index 453fa7397e7..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.unaffected.html]
-  [fillText does not start a new path or subpath]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini
deleted file mode 100644
index 12e62113967..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fontface.html]
-  [Canvas test: 2d.text.draw.fontface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
deleted file mode 100644
index 21a787eebd0..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fontface.notinpage.html]
-  [@font-face fonts should work even if they are not used in the page]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html.ini
deleted file mode 100644
index b28e435ff8b..00000000000
--- a/tests/wpt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fontface.repeat.html]
-  [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/element/manual/text-styles/canvas_text_font_001.htm.ini b/tests/wpt/metadata/html/canvas/element/manual/text-styles/canvas_text_font_001.htm.ini
deleted file mode 100644
index 7b5158316c0..00000000000
--- a/tests/wpt/metadata/html/canvas/element/manual/text-styles/canvas_text_font_001.htm.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[canvas_text_font_001.htm]
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html.ini b/tests/wpt/metadata/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html.ini
deleted file mode 100644
index 2e400f45551..00000000000
--- a/tests/wpt/metadata/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.space.collapse.start.html]
-  [Space characters at the start of a line are collapsed (per CSS)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini
deleted file mode 100644
index 129f379a8aa..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.NaN.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini
deleted file mode 100644
index b74d15ded60..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.NaN.worker.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini
deleted file mode 100644
index f21a4d447ca..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.negative.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini
deleted file mode 100644
index 0081be79b32..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.negative.worker.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini
deleted file mode 100644
index 5dea18865be..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.small.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini
deleted file mode 100644
index 8bfdb470a8b..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.small.worker.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini
deleted file mode 100644
index ab0f01f5495..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.zero.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini
deleted file mode 100644
index 9bb2c2f7ada..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.maxWidth.zero.worker.html]
-  [fillText handles maxWidth correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini
deleted file mode 100644
index 453fa7397e7..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.unaffected.html]
-  [fillText does not start a new path or subpath]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini
deleted file mode 100644
index 4e4d06f908d..00000000000
--- a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.text.draw.fill.unaffected.worker.html]
-  [fillText does not start a new path or subpath]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
index d626ad99bb7..013126fae62 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
@@ -1,6 +1,4 @@
 [oes-texture-float-with-canvas.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #285: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
index 3c6c79ec476..77812c2e6fe 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
@@ -1,6 +1,4 @@
 [oes-texture-half-float-with-canvas.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #285: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
index e1f1f8b80a6..2360857b522 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-luminance-luminance-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #33: font missing]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
index 9deacd6d10c..b5aff79e5e4 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #245: font missing]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
index 799cd8608f1..a5a4a4bff64 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgb-rgb-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #399: font missing]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
index af807b06533..631a420b95a 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #273: font missing]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
index 3ce2011b7e0..ad03f9b4642 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgba-rgba-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #399: font missing]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
index 50cea6685a0..1a4791c5427 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #241: font missing]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
index 53d4ae45e62..765480fa4fa 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #241: font missing]
     expected: FAIL