CanvasRenderingContext2D.measureText() throws a TypeError.

rbri · rbri · commit 70014359564f · 2025-02-01T19:10:30.000+01:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="4.10.0" date="February xx, 2025" description="Bugfixes">
+            <action type="fix" dev="rbri">
+                CanvasRenderingContext2D.measureText() throws a TypeError.
+            </action>
             <action type="fix" dev="rbri">
                 HTMLTableElement/HTMLTableRowElement several fixes to throw the correct error.
             </action>
diff --git a/src/main/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java b/src/main/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java
@@ -563,8 +563,7 @@ public void lineTo(final double x, final double y) {
     @JsxFunction
     public TextMetrics measureText(final Object text) {
         if (text == null || JavaScriptEngine.isUndefined(text)) {
-            throw JavaScriptEngine.throwAsScriptRuntimeEx(
-                    new RuntimeException("Missing argument for CanvasRenderingContext2D.measureText()."));
+            throw JavaScriptEngine.typeError("Missing argument for CanvasRenderingContext2D.measureText().");
         }
 
         final String textValue = JavaScriptEngine.toString(text);
diff --git a/src/test/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java b/src/test/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
@@ -71,7 +71,7 @@ public void test() throws Exception {
             + "    ctx.closePath();\n"
             + "    ctx.rotate(1.234);\n"
             + "    log('done');\n"
-            + "  } catch(e) { log('exception'); }\n"
+            + "  } catch(e) { log(e.name); }\n"
             + "}\n"
             + "</script>\n"
             + "</head>\n"
@@ -112,7 +112,7 @@ public void methods() throws Exception {
             + "        log(methods[i]);\n"
             + "    }\n"
             + "    log(nbMethods + ' methods');\n"
-            + "  } catch(e) { log('exception'); }\n"
+            + "  } catch(e) { log(e.name); }\n"
             + "</script></body></html>";
 
         loadPageVerifyTextArea2(html);
@@ -772,7 +772,7 @@ public void drawImageDataUrlSvg() throws Exception {
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts({"exception", "0", "true", "true"})
+    @Alerts({"TypeError", "0", "true", "true"})
     public void measureText() throws Exception {
         final String html =
             "<html>\n"
@@ -785,7 +785,7 @@ public void measureText() throws Exception {
             + "          ctx = canvas.getContext('2d');\n"
             + "          try {\n"
             + "            log(ctx.measureText());\n"
-            + "          } catch(e) { log('exception'); }\n"
+            + "          } catch(e) { log(e.name); }\n"
 
             + "          var metrics = ctx.measureText('');\n"
             + "          log(metrics.width);\n"
@@ -936,7 +936,7 @@ public void globalAlpha() throws Exception {
             + "    log(ctx.globalAlpha);\n"
             + "    ctx.globalAlpha = null;\n"
             + "    log(ctx.globalAlpha);\n"
-            + "  } catch(e) { log('exception'); }\n"
+            + "  } catch(e) { log(e.name); }\n"
             + "}\n"
             + "</script>\n"
             + "</head>\n"
@@ -970,7 +970,7 @@ public void globalAlphaInvalid() throws Exception {
             + "    log(ctx.globalAlpha);\n"
             + "    ctx.globalAlpha = undefined;\n"
             + "    log(ctx.globalAlpha);\n"
-            + "  } catch(e) { log('exception'); }\n"
+            + "  } catch(e) { log(e.name); }\n"
             + "}\n"
             + "</script>\n"
             + "</head>\n"

Original file line number	Diff line number	Diff line change
`@@ -563,8 +563,7 @@ public void lineTo(final double x, final double y) {`
`563`	`563`	`@JsxFunction`
`564`	`564`	`public TextMetrics measureText(final Object text) {`
`565`	`565`	`if (text == null \|\| JavaScriptEngine.isUndefined(text)) {`
`566`		`- throw JavaScriptEngine.throwAsScriptRuntimeEx(`
`567`		`- new RuntimeException("Missing argument for CanvasRenderingContext2D.measureText()."));`
	`566`	`+ throw JavaScriptEngine.typeError("Missing argument for CanvasRenderingContext2D.measureText().");`
`568`	`567`	`}`
`569`	`568`
`570`	`569`	`final String textValue = JavaScriptEngine.toString(text);`