Handle font values that contain "var()" for OffscreenCanvas

This is an offscreen equivalent to Bug 1131922. The fix for that bug introduced CSSParser::ParseFont, which handles var() and CSS-wide keywords correctly. Use CSSParser::ParseFont for OffscreenCanvasRenderingContext2D as well. Fixed: 1233430 Change-Id: Ic2119c64dec428f3b34f7fc0c15c86b6bcfe9195 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3058649 Reviewed-by: Aaron Krajeski <[email protected]> Commit-Queue: Anders Hartvoll Ruud <[email protected]> Cr-Commit-Position: refs/heads/master@{#906604}
valerioadm · Jul 29, 2021 · e7d848c · e7d848c
1 parent 34cb7e9
commit e7d848c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/html/canvas/offscreen/text/2d.text.font.parse.invalid.html b/html/canvas/offscreen/text/2d.text.font.parse.invalid.html
@@ -51,6 +51,18 @@ <h1>2d.text.font.parse.invalid</h1>
 ctx.font = '10px inherit';
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 
+ctx.font = '20px serif';
+ctx.font = '10px revert';
+_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
+
+ctx.font = '20px serif';
+ctx.font = 'var(--x)';
+_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
+
+ctx.font = '20px serif';
+ctx.font = 'var(--x, 10px serif)';
+_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'");

diff --git a/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js b/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js
@@ -47,6 +47,18 @@ ctx.font = '20px serif';
 ctx.font = '10px inherit';
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 
+ctx.font = '20px serif';
+ctx.font = '10px revert';
+_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
+
+ctx.font = '20px serif';
+ctx.font = 'var(--x)';
+_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
+
+ctx.font = '20px serif';
+ctx.font = 'var(--x, 10px serif)';
+_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'");

diff --git a/html/canvas/tools/yaml/offscreen/text.yaml b/html/canvas/tools/yaml/offscreen/text.yaml
@@ -85,6 +85,18 @@
     ctx.font = '10px inherit';
     @assert ctx.font === '20px serif';
 
+    ctx.font = '20px serif';
+    ctx.font = '10px revert';
+    @assert ctx.font === '20px serif';
+
+    ctx.font = '20px serif';
+    ctx.font = 'var(--x)';
+    @assert ctx.font === '20px serif';
+
+    ctx.font = '20px serif';
+    ctx.font = 'var(--x, 10px serif)';
+    @assert ctx.font === '20px serif';
+
     ctx.font = '20px serif';
     ctx.font = '1em serif; background: green; margin: 10px';
     @assert ctx.font === '20px serif';