From 3abfb8855b7544d94709892e74a71046ee747b8e Mon Sep 17 00:00:00 2001 From: Fernando Serboncini Date: Fri, 19 Jul 2019 18:14:45 +0000 Subject: [PATCH] Bug 1561314 [wpt PR 17496] - Set default font size for OffscreenCanvas to 10px, a=testonly Automatic update from web-platform-tests Set default font size for OffscreenCanvas to 10px There's no hard standard on this, so we are matching the behavior of detached canvas. Bug: 977876 Change-Id: I84f8e32000f290d6826722863bb6fb16116e2f18 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1675911 Commit-Queue: Fernando Serboncini Reviewed-by: Yi Xu Cr-Commit-Position: refs/heads/master@{#672198} -- wpt-commits: 79f12a79675c0b084737d43b1af2cb85f97bbff9 wpt-pr: 17496 --- .../2d.text.font.relative_size.html | 30 +++++++++++++++++++ .../tests/2dcontext/tools/tests2dtext.yaml | 9 +++++- .../text/2d.text.font.relative_size.html | 25 ++++++++++++++++ .../text/2d.text.font.relative_size.worker.js | 21 +++++++++++++ .../tests/offscreen-canvas/tools/tests2d.yaml | 7 ++++- 5 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 testing/web-platform/tests/2dcontext/text-styles/2d.text.font.relative_size.html create mode 100644 testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.html create mode 100644 testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js diff --git a/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.relative_size.html b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.relative_size.html new file mode 100644 index 000000000000..1c0f7bc2b2a1 --- /dev/null +++ b/testing/web-platform/tests/2dcontext/text-styles/2d.text.font.relative_size.html @@ -0,0 +1,30 @@ + + +Canvas test: 2d.text.font.relative_size + + + + + + +

2d.text.font.relative_size

+

+ + +

Actual output:

+

FAIL (fallback content)

 + +
    + + diff --git a/testing/web-platform/tests/2dcontext/tools/tests2dtext.yaml b/testing/web-platform/tests/2dcontext/tools/tests2dtext.yaml index 0ee476d755dc..c57caee8f199 100644 --- a/testing/web-platform/tests/2dcontext/tools/tests2dtext.yaml +++ b/testing/web-platform/tests/2dcontext/tools/tests2dtext.yaml @@ -112,7 +112,14 @@ code: | @assert ctx.font === '10px sans-serif'; - +- name: 2d.text.font.relative_size + testing: + - 2d.text.font.relative_size + code: | + var canvas2 = document.createElement('canvas'); + var ctx2 = canvas2.getContext('2d'); + ctx2.font = '1em sans-serif'; + @assert ctx2.font === '10px sans-serif'; - name: 2d.text.align.valid testing: diff --git a/testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.html b/testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.html new file mode 100644 index 000000000000..75ce1053ae5c --- /dev/null +++ b/testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.html @@ -0,0 +1,25 @@ + + +OffscreenCanvas test: 2d.text.font.relative_size + + + + +

    2d.text.font.relative_size

    +

    + + + diff --git a/testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js b/testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js new file mode 100644 index 000000000000..34836a1c4f4d --- /dev/null +++ b/testing/web-platform/tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js @@ -0,0 +1,21 @@ +// DO NOT EDIT! This test has been generated by tools/gentest.py. +// OffscreenCanvas test in a worker:2d.text.font.relative_size +// Description: +// Note: + +importScripts("/resources/testharness.js"); +importScripts("/common/canvas-tests.js"); + +var t = async_test(""); +t.step(function() { + +var offscreenCanvas = new OffscreenCanvas(100, 50); +var ctx = offscreenCanvas.getContext('2d'); + +ctx.font = '1em sans-serif'; +_assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'"); + +t.done(); + +}); +done(); diff --git a/testing/web-platform/tests/offscreen-canvas/tools/tests2d.yaml b/testing/web-platform/tests/offscreen-canvas/tools/tests2d.yaml index 0aaad783101b..4bdf32db6c1b 100644 --- a/testing/web-platform/tests/offscreen-canvas/tools/tests2d.yaml +++ b/testing/web-platform/tests/offscreen-canvas/tools/tests2d.yaml @@ -9338,7 +9338,12 @@ code: | @assert ctx.font === '10px sans-serif'; - +- name: 2d.text.font.relative_size + testing: + - 2d.text.font.relative_size + code: | + ctx.font = '1em sans-serif'; + @assert ctx.font === '10px sans-serif'; - name: 2d.text.align.valid testing: