Bug 1778910 - Hook up rendering support for canvas2d fontVariantCaps,…

… and add WPT reftests. r=gfx-reviewers,lsalzman The behavior in some of these cases is open to debate, as the spec is quite unclear; see whatwg/html#8103. What I've implemented here gives the same rendering result as Chrome for these tests, so hopefully we can get this clarified in the spec as well. Differential Revision: https://phabricator.services.mozilla.com/D182567 UltraBlame original commit: def0a0be81f9f1d6b63720a27b69b34ebe15b4e2
marco-c · Jul 16, 2023 · c822cbe · c822cbe
1 parent f6be5f0
commit c822cbe
Show file tree

Hide file tree

Showing 10 changed files with 214 additions and 2 deletions.
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -3695,6 +3695,10 @@ void CanvasRenderingContext2D::SetFont(const nsACString& aFont,
 
 
 
+  SetFontVariantCaps(CanvasFontVariantCaps::Normal);
+
+
+
   UpdateSpacing();
 }
 
@@ -3752,6 +3756,38 @@ bool CanvasRenderingContext2D::SetFontInternal(const nsACString& aFont,
 
   resizedFont.kerning = CanvasToGfx(CurrentState().fontKerning);
 
+
+
+
+
+
+  switch (CurrentState().fontVariantCaps) {
+    case CanvasFontVariantCaps::Normal:
+
+      break;
+    case CanvasFontVariantCaps::Small_caps:
+      resizedFont.variantCaps = NS_FONT_VARIANT_CAPS_SMALLCAPS;
+      break;
+    case CanvasFontVariantCaps::All_small_caps:
+      resizedFont.variantCaps = NS_FONT_VARIANT_CAPS_ALLSMALL;
+      break;
+    case CanvasFontVariantCaps::Petite_caps:
+      resizedFont.variantCaps = NS_FONT_VARIANT_CAPS_PETITECAPS;
+      break;
+    case CanvasFontVariantCaps::All_petite_caps:
+      resizedFont.variantCaps = NS_FONT_VARIANT_CAPS_ALLPETITE;
+      break;
+    case CanvasFontVariantCaps::Unicase:
+      resizedFont.variantCaps = NS_FONT_VARIANT_CAPS_UNICASE;
+      break;
+    case CanvasFontVariantCaps::Titling_caps:
+      resizedFont.variantCaps = NS_FONT_VARIANT_CAPS_TITLING;
+      break;
+    default:
+      MOZ_ASSERT_UNREACHABLE("unknown caps value");
+      break;
+  }
+
   c->Document()->FlushUserFontSet();
 
   nsFontMetrics::Params params;
@@ -3857,8 +3893,42 @@ bool CanvasRenderingContext2D::SetFontInternalDisconnected(
   }
 
   fontStyle.size = QuantizeFontSize(size);
-  fontStyle.variantCaps =
-      smallCaps ? NS_FONT_VARIANT_CAPS_SMALLCAPS : NS_FONT_VARIANT_CAPS_NORMAL;
+
+
+
+
+
+
+  switch (CurrentState().fontVariantCaps) {
+    case CanvasFontVariantCaps::Normal:
+      fontStyle.variantCaps = smallCaps ? NS_FONT_VARIANT_CAPS_SMALLCAPS
+                                        : NS_FONT_VARIANT_CAPS_NORMAL;
+      break;
+    case CanvasFontVariantCaps::Small_caps:
+      fontStyle.variantCaps = NS_FONT_VARIANT_CAPS_SMALLCAPS;
+      break;
+    case CanvasFontVariantCaps::All_small_caps:
+      fontStyle.variantCaps = NS_FONT_VARIANT_CAPS_ALLSMALL;
+      break;
+    case CanvasFontVariantCaps::Petite_caps:
+      fontStyle.variantCaps = NS_FONT_VARIANT_CAPS_PETITECAPS;
+      break;
+    case CanvasFontVariantCaps::All_petite_caps:
+      fontStyle.variantCaps = NS_FONT_VARIANT_CAPS_ALLPETITE;
+      break;
+    case CanvasFontVariantCaps::Unicase:
+      fontStyle.variantCaps = NS_FONT_VARIANT_CAPS_UNICASE;
+      break;
+    case CanvasFontVariantCaps::Titling_caps:
+      fontStyle.variantCaps = NS_FONT_VARIANT_CAPS_TITLING;
+      break;
+    default:
+      MOZ_ASSERT_UNREACHABLE("unknown caps value");
+      break;
+  }
+
+  fontStyle.noFallbackVariantFeatures =
+      (fontStyle.variantCaps == NS_FONT_VARIANT_CAPS_NORMAL);
 
 
   gfxFontFeature setting{TRUETYPE_TAG('k', 'e', 'r', 'n'), 0};
@@ -3907,6 +3977,7 @@ bool CanvasRenderingContext2D::SetFontInternalDisconnected(
   SerializeFontForCanvas(list, fontStyle, CurrentState().font);
   CurrentState().fontFont = nsFont(StyleFontFamily{list, false, false},
                                    StyleCSSPixelLength::FromPixels(size));
+  CurrentState().fontFont.variantCaps = fontStyle.variantCaps;
   CurrentState().fontLanguage = nullptr;
   CurrentState().fontExplicitLanguage = false;
   return true;

diff --git a/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-1.html b/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-1.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<link rel="match" href="reference/fontVariantCaps-1-ref.html">
+<meta name="assert" content="text rendering respects the fontVariantCaps property">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "32px serif";
+ctx.fontVariantCaps = "small-caps";
+// This should render the same as font = "small-caps 32px serif".
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-2.html b/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-2.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<link rel="mismatch" href="reference/fontVariantCaps-2-ref.html">
+<meta name="assert" content="text rendering respects the fontVariantCaps property">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+// "mismatch" test, to verify that small-caps does change the rendering.
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-3.html b/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-3.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<link rel="match" href="reference/fontVariantCaps-3-ref.html">
+<meta name="assert" content="text rendering respects the fontVariantCaps property">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "32px serif";
+ctx.fontVariantCaps = "all-small-caps";
+// This should render the same as using font = "small-caps 32px serif"
+// with all the underlying text in lowercase.
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-4.html b/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-4.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<link rel="match" href="reference/fontVariantCaps-3-ref.html">
+<meta name="assert" content="text rendering respects the fontVariantCaps property">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+// fontVariantCaps overrides the small-caps setting from the font attribute
+// (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+ctx.fontVariantCaps = "all-small-caps";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-5.html b/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-5.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<link rel="match" href="reference/fontVariantCaps-1-ref.html">
+<meta name="assert" content="text rendering respects the fontVariantCaps property">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+// fontVariantCaps 'normal' does not override the setting from the font attribute.
+// (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+ctx.fontVariantCaps = "normal";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-6.html b/.../web-platform/tests/html/canvas/element/drawing-text-to-the-canvas/fontVariantCaps-6.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<link rel="match" href="reference/fontVariantCaps-2-ref.html">
+<meta name="assert" content="text rendering respects the fontVariantCaps property">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+// fontVariantCaps is reset when the font attribute is set.
+// (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+ctx.fontVariantCaps = "all-small-caps";
+ctx.font = "32px serif";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/...tests/html/canvas/element/drawing-text-to-the-canvas/reference/fontVariantCaps-1-ref.html b/...tests/html/canvas/element/drawing-text-to-the-canvas/reference/fontVariantCaps-1-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/...tests/html/canvas/element/drawing-text-to-the-canvas/reference/fontVariantCaps-2-ref.html b/...tests/html/canvas/element/drawing-text-to-the-canvas/reference/fontVariantCaps-2-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "32px serif";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/...tests/html/canvas/element/drawing-text-to-the-canvas/reference/fontVariantCaps-3-ref.html b/...tests/html/canvas/element/drawing-text-to-the-canvas/reference/fontVariantCaps-3-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+ctx.fillText("hello world", 20, 100);
+</script>