Temporary implementation of Canvas.MeasureText

11 files changed, 207 insertions, 125 deletions

diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 2a8f14295c0..1faf9878b53 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -24,6 +24,7 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlcanvaselement::{CanvasContext, HTMLCanvasElement};
 use crate::dom::imagedata::ImageData;
 use crate::dom::node::{Node, NodeDamage};
+use crate::dom::textmetrics::TextMetrics;
 use crate::unpremultiplytable::UNPREMULTIPLY_TABLE;
 use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg};
 use canvas_traits::canvas::{CompositionOrBlending, FillOrStrokeStyle, FillRule};
@@ -873,6 +874,15 @@ impl CanvasState {
         self.send_canvas_2d_msg(Canvas2dMsg::FillText(parsed_text, x, y, max_width));
     }
 
+    // https://html.spec.whatwg.org/multipage/#textmetrics
+    pub fn MeasureText(&self, global: &GlobalScope, _text: DOMString) -> DomRoot<TextMetrics> {
+        // FIXME: for now faking the implementation of MeasureText().
+        // See https://github.com/servo/servo/issues/5411#issuecomment-533776291
+        TextMetrics::new(
+            global, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+        )
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth
     pub fn LineWidth(&self) -> f64 {
         self.state.borrow().line_width
@@ -1671,6 +1681,11 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
         self.mark_as_dirty();
     }
 
+    // https://html.spec.whatwg.org/multipage/#textmetrics
+    fn MeasureText(&self, text: DOMString) -> DomRoot<TextMetrics> {
+        self.canvas_state.borrow().MeasureText(&self.global(), text)
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
     fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult {
         self.canvas_state
diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs
index 34777a20fe0..d698fcc709f 100644
--- a/components/script/dom/mod.rs
+++ b/components/script/dom/mod.rs
@@ -484,6 +484,7 @@ pub mod text;
 pub mod textcontrol;
 pub mod textdecoder;
 pub mod textencoder;
+pub mod textmetrics;
 pub mod texttrack;
 pub mod texttrackcue;
 pub mod texttrackcuelist;
diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs
index 461af3b882f..d18cd00df54 100644
--- a/components/script/dom/offscreencanvasrenderingcontext2d.rs
+++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs
@@ -23,6 +23,7 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::imagedata::ImageData;
 use crate::dom::offscreencanvas::OffscreenCanvas;
+use crate::dom::textmetrics::TextMetrics;
 use dom_struct::dom_struct;
 use euclid::default::Size2D;
 
@@ -244,6 +245,11 @@ impl OffscreenCanvasRenderingContext2DMethods for OffscreenCanvasRenderingContex
         self.canvas_state.borrow().FillText(text, x, y, max_width)
     }
 
+    // https://html.spec.whatwg.org/multipage/#textmetrics
+    fn MeasureText(&self, text: DOMString) -> DomRoot<TextMetrics> {
+        self.canvas_state.borrow().MeasureText(&self.global(), text)
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth
     fn LineWidth(&self) -> f64 {
         self.canvas_state.borrow().LineWidth()
diff --git a/components/script/dom/textmetrics.rs b/components/script/dom/textmetrics.rs
new file mode 100644
index 00000000000..867071bd0aa
--- /dev/null
+++ b/components/script/dom/textmetrics.rs
@@ -0,0 +1,158 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::Bindings::TextMetricsBinding;
+use crate::dom::bindings::codegen::Bindings::TextMetricsBinding::TextMetricsMethods;
+use crate::dom::bindings::num::Finite;
+use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
+
+#[dom_struct]
+pub struct TextMetrics {
+    reflector_: Reflector,
+    width: Finite<f64>,
+    actualBoundingBoxLeft: Finite<f64>,
+    actualBoundingBoxRight: Finite<f64>,
+    fontBoundingBoxAscent: Finite<f64>,
+    fontBoundingBoxDescent: Finite<f64>,
+    actualBoundingBoxAscent: Finite<f64>,
+    actualBoundingBoxDescent: Finite<f64>,
+    emHeightAscent: Finite<f64>,
+    emHeightDescent: Finite<f64>,
+    hangingBaseline: Finite<f64>,
+    alphabeticBaseline: Finite<f64>,
+    ideographicBaseline: Finite<f64>,
+}
+
+impl TextMetrics {
+    fn new_inherited(
+        width: f64,
+        actualBoundingBoxLeft: f64,
+        actualBoundingBoxRight: f64,
+        fontBoundingBoxAscent: f64,
+        fontBoundingBoxDescent: f64,
+        actualBoundingBoxAscent: f64,
+        actualBoundingBoxDescent: f64,
+        emHeightAscent: f64,
+        emHeightDescent: f64,
+        hangingBaseline: f64,
+        alphabeticBaseline: f64,
+        ideographicBaseline: f64,
+    ) -> TextMetrics {
+        TextMetrics {
+            reflector_: Reflector::new(),
+            width: Finite::wrap(width),
+            actualBoundingBoxLeft: Finite::wrap(actualBoundingBoxLeft),
+            actualBoundingBoxRight: Finite::wrap(actualBoundingBoxRight),
+            fontBoundingBoxAscent: Finite::wrap(fontBoundingBoxAscent),
+            fontBoundingBoxDescent: Finite::wrap(fontBoundingBoxDescent),
+            actualBoundingBoxAscent: Finite::wrap(actualBoundingBoxAscent),
+            actualBoundingBoxDescent: Finite::wrap(actualBoundingBoxDescent),
+            emHeightAscent: Finite::wrap(emHeightAscent),
+            emHeightDescent: Finite::wrap(emHeightDescent),
+            hangingBaseline: Finite::wrap(hangingBaseline),
+            alphabeticBaseline: Finite::wrap(alphabeticBaseline),
+            ideographicBaseline: Finite::wrap(ideographicBaseline),
+        }
+    }
+
+    pub fn new(
+        global: &GlobalScope,
+        width: f64,
+        actualBoundingBoxLeft: f64,
+        actualBoundingBoxRight: f64,
+        fontBoundingBoxAscent: f64,
+        fontBoundingBoxDescent: f64,
+        actualBoundingBoxAscent: f64,
+        actualBoundingBoxDescent: f64,
+        emHeightAscent: f64,
+        emHeightDescent: f64,
+        hangingBaseline: f64,
+        alphabeticBaseline: f64,
+        ideographicBaseline: f64,
+    ) -> DomRoot<TextMetrics> {
+        reflect_dom_object(
+            Box::new(TextMetrics::new_inherited(
+                width,
+                actualBoundingBoxLeft,
+                actualBoundingBoxRight,
+                fontBoundingBoxAscent,
+                fontBoundingBoxDescent,
+                actualBoundingBoxAscent,
+                actualBoundingBoxDescent,
+                emHeightAscent,
+                emHeightDescent,
+                hangingBaseline,
+                alphabeticBaseline,
+                ideographicBaseline,
+            )),
+            global,
+            TextMetricsBinding::Wrap,
+        )
+    }
+}
+
+impl TextMetricsMethods for TextMetrics {
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-width
+    fn Width(&self) -> Finite<f64> {
+        self.width
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-actualboundingboxleft
+    fn ActualBoundingBoxLeft(&self) -> Finite<f64> {
+        self.actualBoundingBoxLeft
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-actualboundingboxright
+    fn ActualBoundingBoxRight(&self) -> Finite<f64> {
+        self.actualBoundingBoxRight
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-fontboundingboxascent
+    fn FontBoundingBoxAscent(&self) -> Finite<f64> {
+        self.fontBoundingBoxAscent
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-fontboundingboxascent
+    fn FontBoundingBoxDescent(&self) -> Finite<f64> {
+        self.fontBoundingBoxDescent
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-actualboundingboxascent
+    fn ActualBoundingBoxAscent(&self) -> Finite<f64> {
+        self.actualBoundingBoxAscent
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-actualboundingboxdescent
+    fn ActualBoundingBoxDescent(&self) -> Finite<f64> {
+        self.actualBoundingBoxDescent
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-emheightascent
+    fn EmHeightAscent(&self) -> Finite<f64> {
+        self.emHeightAscent
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-emheightdescent
+    fn EmHeightDescent(&self) -> Finite<f64> {
+        self.emHeightDescent
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-hangingbaseline
+    fn HangingBaseline(&self) -> Finite<f64> {
+        self.hangingBaseline
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-alphabeticbaseline
+    fn AlphabeticBaseline(&self) -> Finite<f64> {
+        self.alphabeticBaseline
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#dom-textmetrics-ideographicbaseline
+    fn IdeographicBaseline(&self) -> Finite<f64> {
+        self.ideographicBaseline
+    }
+}
diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index 92e8b80d5ef..2da0372a9ba 100644
--- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -153,7 +153,8 @@ interface CanvasText {
                 optional unrestricted double maxWidth);
   //void strokeText(DOMString text, unrestricted double x, unrestricted double y,
   //                optional unrestricted double maxWidth);
-  //TextMetrics measureText(DOMString text);
+  [Pref="dom.canvas-text.enabled"]
+  TextMetrics measureText(DOMString text);
 };
 
 [Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject]
diff --git a/components/script/dom/webidls/TextMetrics.webidl b/components/script/dom/webidls/TextMetrics.webidl
new file mode 100644
index 00000000000..f3d90450824
--- /dev/null
+++ b/components/script/dom/webidls/TextMetrics.webidl
@@ -0,0 +1,23 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * 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"]
+interface TextMetrics {
+  // x-direction
+  readonly attribute double width; // advance width
+  readonly attribute double actualBoundingBoxLeft;
+  readonly attribute double actualBoundingBoxRight;
+
+  // y-direction
+  readonly attribute double fontBoundingBoxAscent;
+  readonly attribute double fontBoundingBoxDescent;
+  readonly attribute double actualBoundingBoxAscent;
+  readonly attribute double actualBoundingBoxDescent;
+  readonly attribute double emHeightAscent;
+  readonly attribute double emHeightDescent;
+  readonly attribute double hangingBaseline;
+  readonly attribute double alphabeticBaseline;
+  readonly attribute double ideographicBaseline;
+};
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index 379afb9cad1..259102e78f5 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -140,9 +140,6 @@
   [ApplicationCache interface: attribute onprogress]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "measureText(DOMString)" with the proper type]
-    expected: FAIL
-
   [SVGElement interface: attribute ondragleave]
     expected: FAIL
 
@@ -233,12 +230,6 @@
   [ElementInternals interface: operation setFormValue([object Object\],[object Object\],[object Object\], [object Object\],[object Object\],[object Object\])]
     expected: FAIL
 
-  [TextMetrics interface object length]
-    expected: FAIL
-
-  [CanvasRenderingContext2D interface: operation measureText(DOMString)]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "strokeText(DOMString, unrestricted double, unrestricted double, unrestricted double)" with the proper type]
     expected: FAIL
 
@@ -254,9 +245,6 @@
   [SVGElement interface: operation blur()]
     expected: FAIL
 
-  [TextMetrics interface: attribute ideographicBaseline]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation beginPath()]
     expected: FAIL
 
@@ -305,9 +293,6 @@
   [MessageEvent interface: new MessageEvent("message", { data: 5 }) must inherit property "ports" with the proper type]
     expected: FAIL
 
-  [TextMetrics interface: attribute emHeightDescent]
-    expected: FAIL
-
   [Location interface: window.location must have own property "ancestorOrigins"]
     expected: FAIL
 
@@ -428,9 +413,6 @@
   [MessageChannel interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxAscent]
-    expected: FAIL
-
   [ValidityState interface: document.createElement("input").validity must inherit property "tooShort" with the proper type]
     expected: FAIL
 
@@ -446,9 +428,6 @@
   [ImageBitmap interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [DataTransfer interface: attribute items]
     expected: FAIL
 
@@ -689,9 +668,6 @@
   [Path2D interface: operation rect(unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxDescent]
-    expected: FAIL
-
   [DataTransferItem interface object name]
     expected: FAIL
 
@@ -707,9 +683,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(unrestricted double, unrestricted double, CanvasFillRule)]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxLeft]
-    expected: FAIL
-
   [DataTransfer interface: attribute dropEffect]
     expected: FAIL
 
@@ -890,9 +863,6 @@
   [Navigator interface: operation unregisterProtocolHandler(DOMString, USVString)]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface object]
-    expected: FAIL
-
   [ValidityState interface: document.createElement("input").validity must inherit property "customError" with the proper type]
     expected: FAIL
 
@@ -1010,9 +980,6 @@
   [ApplicationCache interface: window.applicationCache must inherit property "onprogress" with the proper type]
     expected: FAIL
 
-  [TextMetrics interface: attribute hangingBaseline]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: operation setTransform(DOMMatrix2DInit)]
     expected: FAIL
 
@@ -1031,9 +998,6 @@
   [SVGElement interface: attribute onselect]
     expected: FAIL
 
-  [TextMetrics interface: attribute width]
-    expected: FAIL
-
   [ApplicationCache interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -1058,9 +1022,6 @@
   [External interface: operation IsSearchProviderInstalled()]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxRight]
-    expected: FAIL
-
   [SVGElement interface: attribute onkeydown]
     expected: FAIL
 
@@ -1082,9 +1043,6 @@
   [SharedWorker interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [TextMetrics interface: attribute fontBoundingBoxAscent]
-    expected: FAIL
-
   [MessageChannel interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -1100,9 +1058,6 @@
   [History interface: attribute scrollRestoration]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: calling measureText(DOMString) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
-    expected: FAIL
-
   [ImageBitmap interface: attribute height]
     expected: FAIL
 
@@ -1127,9 +1082,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [TextMetrics interface: attribute alphabeticBaseline]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation stroke(Path2D)]
     expected: FAIL
 
@@ -1151,9 +1103,6 @@
   [SVGElement interface: operation focus(FocusOptions)]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [ApplicationCache interface: window.applicationCache must inherit property "UNCACHED" with the proper type]
     expected: FAIL
 
@@ -1208,9 +1157,6 @@
   [WebSocket interface: new WebSocket("wss://nonexistent.web-platform.test") must inherit property "extensions" with the proper type]
     expected: FAIL
 
-  [TextMetrics interface: attribute fontBoundingBoxDescent]
-    expected: FAIL
-
   [ApplicationCache must be primary interface of window.applicationCache]
     expected: FAIL
 
@@ -1313,9 +1259,6 @@
   [ImageBitmapRenderingContext interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
   [DataTransfer interface: attribute effectAllowed]
     expected: FAIL
 
@@ -1490,12 +1433,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation clip(CanvasFillRule)]
     expected: FAIL
 
-  [TextMetrics interface: attribute emHeightAscent]
-    expected: FAIL
-
-  [TextMetrics interface object name]
-    expected: FAIL
-
   [External interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/dom/idlharness.worker.js.ini b/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
index 0cd3199c808..eab12bd98ed 100644
--- a/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
@@ -98,12 +98,6 @@
   [SharedWorker interface: existence and properties of interface object]
     expected: FAIL
 
-  [TextMetrics interface object length]
-    expected: FAIL
-
-  [TextMetrics interface: attribute emHeightAscent]
-    expected: FAIL
-
   [WorkerGlobalScope interface: self must inherit property "ononline" with the proper type]
     expected: FAIL
 
@@ -116,9 +110,6 @@
   [DedicatedWorkerGlobalScope interface: calling requestAnimationFrame(FrameRequestCallback) on self with too few arguments must throw TypeError]
     expected: FAIL
 
-  [TextMetrics interface: attribute ideographicBaseline]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation beginPath()]
     expected: FAIL
 
@@ -173,9 +164,6 @@
   [MessageChannel interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxAscent]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation bezierCurveTo(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
@@ -191,9 +179,6 @@
   [ImageBitmap interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [MessagePort interface: existence and properties of interface object]
     expected: FAIL
 
@@ -236,9 +221,6 @@
   [Path2D interface object length]
     expected: FAIL
 
-  [TextMetrics interface: attribute emHeightDescent]
-    expected: FAIL
-
   [WorkerGlobalScope interface: operation createImageBitmap(ImageBitmapSource, ImageBitmapOptions)]
     expected: FAIL
 
@@ -311,9 +293,6 @@
   [Path2D interface: operation rect(unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxDescent]
-    expected: FAIL
-
   [Path2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, boolean)]
     expected: FAIL
 
@@ -323,9 +302,6 @@
   [OffscreenCanvasRenderingContext2D interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxLeft]
-    expected: FAIL
-
   [DedicatedWorkerGlobalScope interface: internal [[SetPrototypeOf\]\] method of interface prototype object - setting to a new value via __proto__ should throw a TypeError]
     expected: FAIL
 
@@ -392,9 +368,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(Path2D, unrestricted double, unrestricted double, CanvasFillRule)]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface object]
-    expected: FAIL
-
   [DedicatedWorkerGlobalScope interface: self must inherit property "name" with the proper type]
     expected: FAIL
 
@@ -440,9 +413,6 @@
   [OffscreenCanvas interface object length]
     expected: FAIL
 
-  [TextMetrics interface: attribute hangingBaseline]
-    expected: FAIL
-
   [ImageBitmapRenderingContext interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -452,18 +422,9 @@
   [WorkerGlobalScope interface: attribute onoffline]
     expected: FAIL
 
-  [TextMetrics interface: attribute width]
-    expected: FAIL
-
   [Path2D interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [TextMetrics interface: attribute actualBoundingBoxRight]
-    expected: FAIL
-
-  [TextMetrics interface: attribute fontBoundingBoxAscent]
-    expected: FAIL
-
   [MessageChannel interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -485,9 +446,6 @@
   [SharedWorker interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [TextMetrics interface: attribute alphabeticBaseline]
-    expected: FAIL
-
   [DedicatedWorkerGlobalScope interface: internal [[SetPrototypeOf\]\] method of interface prototype object - setting to a new value via Object.setPrototypeOf should throw a TypeError]
     expected: FAIL
 
@@ -497,9 +455,6 @@
   [ImageBitmap interface: operation close()]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation fill(Path2D, CanvasFillRule)]
     expected: FAIL
 
@@ -527,9 +482,6 @@
   [MessageEvent interface: new MessageEvent("message", { data: 5 }) must inherit property "ports" with the proper type]
     expected: FAIL
 
-  [TextMetrics interface: attribute fontBoundingBoxDescent]
-    expected: FAIL
-
   [WorkerGlobalScope interface: attribute ononline]
     expected: FAIL
 
@@ -587,9 +539,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, boolean)]
     expected: FAIL
 
-  [TextMetrics interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
   [SharedWorker interface: attribute onerror]
     expected: FAIL
 
@@ -683,9 +632,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation clip(CanvasFillRule)]
     expected: FAIL
 
-  [TextMetrics interface object name]
-    expected: FAIL
-
   [MessageEvent interface: new MessageEvent("message", { data: 5 }) must inherit property "source" with the proper type]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini
index 8e9a35c833d..d62e99a8ea8 100644
--- a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini
+++ b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini
@@ -66,6 +66,3 @@
   [The IDBTransaction interface object should be exposed.]
     expected: FAIL
 
-  [The TextMetrics interface object should be exposed.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 8748adcf4f7..d2892091d3a 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -7658,9 +7658,6 @@
     ]
    ]
   },
-  "stub": {
-   "css/blockify_inline_element.html": []
-  },
   "support": {
    ".gitignore": [
     []
@@ -18963,7 +18960,7 @@
    "testharness"
   ],
   "mozilla/interfaces.js": [
-   "6f2a54524ef317a48d758f7e50f742fd9b3a93e4",
+   "26db0c23e544d38f02b9573ffaa44bf5dee8370a",
    "support"
   ],
   "mozilla/interfaces.worker.js": [
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.js b/tests/wpt/mozilla/tests/mozilla/interfaces.js
index 6f2a54524ef..26db0c23e54 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.js
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.js
@@ -38,6 +38,7 @@ function test_interfaces(interfaceNamesInGlobalScope) {
       "String",
       "Symbol",
       "SyntaxError",
+      "TextMetrics",
       "TypeError",
       "URIError",
       "Uint16Array",