Changeset 269177 in webkit


Ignore:
Timestamp:
Oct 29, 2020, 7:27:30 PM (4 years ago)
Author:
mmaxfield@apple.com
Message:

[GPU Process] Add tests for sbix and COLR fonts in canvas
​https://bugs.webkit.org/show_bug.cgi?id=218346

Reviewed by Simon Fraser.

Test all the relevant combinations of:
{CTM, no CTM} x
{line dash, no line dash} x
{color style, gradient style} x
{shadow, no shadow} x
{fill, stroke} x
{sbix, COLR}.

We actually care about the combinations because we have some codepaths (e.g. emulated shadows)
that only are triggered when 2 or more of the above are active.

Image orientation only works in http tests, so the sbix font is used in http/tests/.
See ​https://bugs.webkit.org/show_bug.cgi?id=217808 for more information.

  • fast/text/canvas-color-fonts/COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/COLR.html: Added.
  • fast/text/canvas-color-fonts/ctm-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/ctm-COLR.html: Added.
  • fast/text/canvas-color-fonts/fill-color-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/fill-color-COLR.html: Added.
  • fast/text/canvas-color-fonts/fill-color-shadow-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/fill-color-shadow-COLR.html: Added.
  • fast/text/canvas-color-fonts/fill-color-shadow-ctm-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/fill-color-shadow-ctm-COLR.html: Added.
  • fast/text/canvas-color-fonts/fill-gradient-COLR-2-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/fill-gradient-COLR-2.html: Added.
  • fast/text/canvas-color-fonts/fill-gradient-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/fill-gradient-COLR.html: Added.
  • fast/text/canvas-color-fonts/linedash-COLR-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/linedash-COLR.html: Added.
  • fast/text/canvas-color-fonts/linedash-outlines-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/linedash-outlines.html: Added.
  • fast/text/canvas-color-fonts/resources/Ahem-COLR.ttf: Added.
  • fast/text/canvas-color-fonts/stroke-color-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/stroke-color-COLR.html: Added.
  • fast/text/canvas-color-fonts/stroke-color-shadow-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/stroke-color-shadow-COLR.html: Added.
  • fast/text/canvas-color-fonts/stroke-color-shadow-ctm-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/stroke-color-shadow-ctm-COLR.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-2-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-2.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-3-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-3.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-4-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-4.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-5-expected-mismatch.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-5.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR-expected.html: Added.
  • fast/text/canvas-color-fonts/stroke-gradient-COLR.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-2-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-2.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-3-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-3.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-4-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-4.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/ctm-sbix.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-2-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-2.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-3-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-3.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-4-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-4.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/fill-color-sbix.html: Added.
  • http/tests/canvas/color-fonts/fill-color-shadow-ctm-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/fill-color-shadow-ctm-sbix.html: Added.
  • http/tests/canvas/color-fonts/fill-color-shadow-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/fill-color-shadow-sbix.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-2-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-2.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-3-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-3.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-4-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-4.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/fill-gradient-sbix.html: Added.
  • http/tests/canvas/color-fonts/linedash-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/linedash-sbix.html: Added.
  • http/tests/canvas/color-fonts/resources/Ahem-sbix.ttf: Added.
  • http/tests/canvas/color-fonts/resources/image1.jpg: Added.
  • http/tests/canvas/color-fonts/resources/image2.jpg: Added.
  • http/tests/canvas/color-fonts/stroke-color-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/stroke-color-sbix.html: Added.
  • http/tests/canvas/color-fonts/stroke-color-shadow-ctm-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/stroke-color-shadow-ctm-sbix.html: Added.
  • http/tests/canvas/color-fonts/stroke-color-shadow-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/stroke-color-shadow-sbix.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-2-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-2.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-3-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-3.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-4-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-4.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/stroke-gradient-sbix.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-2-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-2.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-3-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-3.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-4-expected-mismatch.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-4.html: Added.
  • http/tests/canvas/color-fonts/text-sbix-expected.html: Added.
  • http/tests/canvas/color-fonts/text-sbix.html: Added.
  • platform/mac/TestExpectations:
  • platform/win/TestExpectations:
Location:
trunk/LayoutTests
Files:
94 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r269176 r269177  
     12020-10-29  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [GPU Process] Add tests for sbix and COLR fonts in canvas
     4        https://bugs.webkit.org/show_bug.cgi?id=218346
     5
     6        Reviewed by Simon Fraser.
     7
     8        Test all the relevant combinations of:
     9        {CTM, no CTM} x
     10        {line dash, no line dash} x
     11        {color style, gradient style} x
     12        {shadow, no shadow} x
     13        {fill, stroke} x
     14        {sbix, COLR}.
     15
     16        We actually care about the combinations because we have some codepaths (e.g. emulated shadows)
     17        that only are triggered when 2 or more of the above are active.
     18
     19        Image orientation only works in http tests, so the sbix font is used in http/tests/.
     20        See https://bugs.webkit.org/show_bug.cgi?id=217808 for more information.
     21
     22        * fast/text/canvas-color-fonts/COLR-expected.html: Added.
     23        * fast/text/canvas-color-fonts/COLR.html: Added.
     24        * fast/text/canvas-color-fonts/ctm-COLR-expected.html: Added.
     25        * fast/text/canvas-color-fonts/ctm-COLR.html: Added.
     26        * fast/text/canvas-color-fonts/fill-color-COLR-expected.html: Added.
     27        * fast/text/canvas-color-fonts/fill-color-COLR.html: Added.
     28        * fast/text/canvas-color-fonts/fill-color-shadow-COLR-expected.html: Added.
     29        * fast/text/canvas-color-fonts/fill-color-shadow-COLR.html: Added.
     30        * fast/text/canvas-color-fonts/fill-color-shadow-ctm-COLR-expected.html: Added.
     31        * fast/text/canvas-color-fonts/fill-color-shadow-ctm-COLR.html: Added.
     32        * fast/text/canvas-color-fonts/fill-gradient-COLR-2-expected-mismatch.html: Added.
     33        * fast/text/canvas-color-fonts/fill-gradient-COLR-2.html: Added.
     34        * fast/text/canvas-color-fonts/fill-gradient-COLR-expected.html: Added.
     35        * fast/text/canvas-color-fonts/fill-gradient-COLR.html: Added.
     36        * fast/text/canvas-color-fonts/linedash-COLR-expected-mismatch.html: Added.
     37        * fast/text/canvas-color-fonts/linedash-COLR.html: Added.
     38        * fast/text/canvas-color-fonts/linedash-outlines-expected-mismatch.html: Added.
     39        * fast/text/canvas-color-fonts/linedash-outlines.html: Added.
     40        * fast/text/canvas-color-fonts/resources/Ahem-COLR.ttf: Added.
     41        * fast/text/canvas-color-fonts/stroke-color-COLR-expected.html: Added.
     42        * fast/text/canvas-color-fonts/stroke-color-COLR.html: Added.
     43        * fast/text/canvas-color-fonts/stroke-color-shadow-COLR-expected.html: Added.
     44        * fast/text/canvas-color-fonts/stroke-color-shadow-COLR.html: Added.
     45        * fast/text/canvas-color-fonts/stroke-color-shadow-ctm-COLR-expected.html: Added.
     46        * fast/text/canvas-color-fonts/stroke-color-shadow-ctm-COLR.html: Added.
     47        * fast/text/canvas-color-fonts/stroke-gradient-COLR-2-expected-mismatch.html: Added.
     48        * fast/text/canvas-color-fonts/stroke-gradient-COLR-2.html: Added.
     49        * fast/text/canvas-color-fonts/stroke-gradient-COLR-3-expected-mismatch.html: Added.
     50        * fast/text/canvas-color-fonts/stroke-gradient-COLR-3.html: Added.
     51        * fast/text/canvas-color-fonts/stroke-gradient-COLR-4-expected-mismatch.html: Added.
     52        * fast/text/canvas-color-fonts/stroke-gradient-COLR-4.html: Added.
     53        * fast/text/canvas-color-fonts/stroke-gradient-COLR-5-expected-mismatch.html: Added.
     54        * fast/text/canvas-color-fonts/stroke-gradient-COLR-5.html: Added.
     55        * fast/text/canvas-color-fonts/stroke-gradient-COLR-expected.html: Added.
     56        * fast/text/canvas-color-fonts/stroke-gradient-COLR.html: Added.
     57        * http/tests/canvas/color-fonts/ctm-sbix-2-expected-mismatch.html: Added.
     58        * http/tests/canvas/color-fonts/ctm-sbix-2.html: Added.
     59        * http/tests/canvas/color-fonts/ctm-sbix-3-expected-mismatch.html: Added.
     60        * http/tests/canvas/color-fonts/ctm-sbix-3.html: Added.
     61        * http/tests/canvas/color-fonts/ctm-sbix-4-expected-mismatch.html: Added.
     62        * http/tests/canvas/color-fonts/ctm-sbix-4.html: Added.
     63        * http/tests/canvas/color-fonts/ctm-sbix-expected.html: Added.
     64        * http/tests/canvas/color-fonts/ctm-sbix.html: Added.
     65        * http/tests/canvas/color-fonts/fill-color-sbix-2-expected-mismatch.html: Added.
     66        * http/tests/canvas/color-fonts/fill-color-sbix-2.html: Added.
     67        * http/tests/canvas/color-fonts/fill-color-sbix-3-expected-mismatch.html: Added.
     68        * http/tests/canvas/color-fonts/fill-color-sbix-3.html: Added.
     69        * http/tests/canvas/color-fonts/fill-color-sbix-4-expected-mismatch.html: Added.
     70        * http/tests/canvas/color-fonts/fill-color-sbix-4.html: Added.
     71        * http/tests/canvas/color-fonts/fill-color-sbix-expected.html: Added.
     72        * http/tests/canvas/color-fonts/fill-color-sbix.html: Added.
     73        * http/tests/canvas/color-fonts/fill-color-shadow-ctm-sbix-expected.html: Added.
     74        * http/tests/canvas/color-fonts/fill-color-shadow-ctm-sbix.html: Added.
     75        * http/tests/canvas/color-fonts/fill-color-shadow-sbix-expected.html: Added.
     76        * http/tests/canvas/color-fonts/fill-color-shadow-sbix.html: Added.
     77        * http/tests/canvas/color-fonts/fill-gradient-sbix-2-expected-mismatch.html: Added.
     78        * http/tests/canvas/color-fonts/fill-gradient-sbix-2.html: Added.
     79        * http/tests/canvas/color-fonts/fill-gradient-sbix-3-expected-mismatch.html: Added.
     80        * http/tests/canvas/color-fonts/fill-gradient-sbix-3.html: Added.
     81        * http/tests/canvas/color-fonts/fill-gradient-sbix-4-expected-mismatch.html: Added.
     82        * http/tests/canvas/color-fonts/fill-gradient-sbix-4.html: Added.
     83        * http/tests/canvas/color-fonts/fill-gradient-sbix-expected.html: Added.
     84        * http/tests/canvas/color-fonts/fill-gradient-sbix.html: Added.
     85        * http/tests/canvas/color-fonts/linedash-sbix-expected.html: Added.
     86        * http/tests/canvas/color-fonts/linedash-sbix.html: Added.
     87        * http/tests/canvas/color-fonts/resources/Ahem-sbix.ttf: Added.
     88        * http/tests/canvas/color-fonts/resources/image1.jpg: Added.
     89        * http/tests/canvas/color-fonts/resources/image2.jpg: Added.
     90        * http/tests/canvas/color-fonts/stroke-color-sbix-expected.html: Added.
     91        * http/tests/canvas/color-fonts/stroke-color-sbix.html: Added.
     92        * http/tests/canvas/color-fonts/stroke-color-shadow-ctm-sbix-expected.html: Added.
     93        * http/tests/canvas/color-fonts/stroke-color-shadow-ctm-sbix.html: Added.
     94        * http/tests/canvas/color-fonts/stroke-color-shadow-sbix-expected.html: Added.
     95        * http/tests/canvas/color-fonts/stroke-color-shadow-sbix.html: Added.
     96        * http/tests/canvas/color-fonts/stroke-gradient-sbix-2-expected-mismatch.html: Added.
     97        * http/tests/canvas/color-fonts/stroke-gradient-sbix-2.html: Added.
     98        * http/tests/canvas/color-fonts/stroke-gradient-sbix-3-expected-mismatch.html: Added.
     99        * http/tests/canvas/color-fonts/stroke-gradient-sbix-3.html: Added.
     100        * http/tests/canvas/color-fonts/stroke-gradient-sbix-4-expected-mismatch.html: Added.
     101        * http/tests/canvas/color-fonts/stroke-gradient-sbix-4.html: Added.
     102        * http/tests/canvas/color-fonts/stroke-gradient-sbix-expected.html: Added.
     103        * http/tests/canvas/color-fonts/stroke-gradient-sbix.html: Added.
     104        * http/tests/canvas/color-fonts/text-sbix-2-expected-mismatch.html: Added.
     105        * http/tests/canvas/color-fonts/text-sbix-2.html: Added.
     106        * http/tests/canvas/color-fonts/text-sbix-3-expected-mismatch.html: Added.
     107        * http/tests/canvas/color-fonts/text-sbix-3.html: Added.
     108        * http/tests/canvas/color-fonts/text-sbix-4-expected-mismatch.html: Added.
     109        * http/tests/canvas/color-fonts/text-sbix-4.html: Added.
     110        * http/tests/canvas/color-fonts/text-sbix-expected.html: Added.
     111        * http/tests/canvas/color-fonts/text-sbix.html: Added.
     112        * platform/mac/TestExpectations:
     113        * platform/win/TestExpectations:
     114
    11152020-10-29  Sam Weinig  <weinig@apple.com>
    2116

  • trunk/LayoutTests/platform/mac/TestExpectations

    r268952 r269177  
    22662266# rdar://70556068 REGRESSION: [ Big Sur ] fast/text/international/complex-character-based-fallback.html is a constant failure
    22672267[ BigSur+ ] fast/text/international/complex-character-based-fallback.html [ Pass Failure ]
     2268
     2269# Mojave doesn't support COLR fonts.
     2270webkit.org/b/218346 [ Mojave ] fast/text/canvas-color-fonts [ Pass ImageOnlyFailure ]

  • trunk/LayoutTests/platform/win/TestExpectations

    r268886 r269177  
    46034603
    46044604webkit.org/b/218040 svg/clip-path/clip-path-invalid.svg [ Pass Crash ]
     4605
     4606# Windows doesn't support color fonts.
     4607webkit.org/b/218346 fast/text/canvas-color-fonts [ Pass ImageOnlyFailure ]
     4608webkit.org/b/218346 http/tests/canvas/color-fonts [ Pass ImageOnlyFailure ]
Note: See TracChangeset for help on using the changeset viewer.