Home Explore Help
Sign In
noah
/
ungoogled-chromium-xdg-aur
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 17aa083731
Branches Tags
ungoogled-chrom...
/
chromium-freetype-2.11.patch

chromium-freetype-2.11.patch 2.2 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 
  1. --- a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
    2. 

  2. +++ b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
    3. 

  3. @@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,
    4. 

  4.              canvas->drawPaint(colrPaint);
    5. 

  5.              break;
    6. 

  6.          }
    7. 

  7. +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
    8. 

  8. +        case FT_COLR_PAINTFORMAT_TRANSFORM:
    9. 

  9. +#else
    10. 

  10.          case FT_COLR_PAINTFORMAT_TRANSFORMED:
    11. 

  11. +#endif
    12. 

  12.          case FT_COLR_PAINTFORMAT_TRANSLATE:
    13. 

  13.          case FT_COLR_PAINTFORMAT_ROTATE:
    14. 

  14.          case FT_COLR_PAINTFORMAT_SKEW:
    15. 

  15. @@ -759,10 +763,17 @@ void colrv1_transform(SkCanvas* canvas, FT_Face face, FT_COLR_Paint colrv1_paint
    16. 

  16.      SkMatrix transform;
    17. 

  17.  
    18. 

  18.      switch (colrv1_paint.format) {
    19. 

  19. +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
    20. 

  20. +        case FT_COLR_PAINTFORMAT_TRANSFORM: {
    21. 

  21. +            transform = ToSkMatrix(colrv1_paint.u.transform.affine);
    22. 

  22. +            break;
    23. 

  23. +        }
    24. 

  24. +#else
    25. 

  25.          case FT_COLR_PAINTFORMAT_TRANSFORMED: {
    26. 

  26.              transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
    27. 

  27.              break;
    28. 

  28.          }
    29. 

  29. +#endif
    30. 

  30.          case FT_COLR_PAINTFORMAT_TRANSLATE: {
    31. 

  31.              transform = SkMatrix::Translate(
    32. 

  32.                  SkFixedToScalar(colrv1_paint.u.translate.dx),
    33. 

  33. @@ -880,10 +891,17 @@ bool colrv1_traverse_paint(SkCanvas* canvas,
    34. 

  34.              traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
    35. 

  35.                                                   FT_COLOR_NO_ROOT_TRANSFORM);
    36. 

  36.              break;
    37. 

  37. +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
    38. 

  38. +        case FT_COLR_PAINTFORMAT_TRANSFORM:
    39. 

  39. +            colrv1_transform(canvas, face, paint);
    40. 

  40. +            traverse_result = colrv1_traverse_paint(canvas, palette, face,
    41. 

  41. +                                                    paint.u.transform.paint, visited_set);
    42. 

  42. +#else
    43. 

  43.          case FT_COLR_PAINTFORMAT_TRANSFORMED:
    44. 

  44.              colrv1_transform(canvas, face, paint);
    45. 

  45.              traverse_result = colrv1_traverse_paint(canvas, palette, face,
    46. 

  46.                                                      paint.u.transformed.paint, visited_set);
    47. 

  47. +#endif
    48. 

  48.              break;
    49. 

  49.          case FT_COLR_PAINTFORMAT_TRANSLATE:
    50. 

  50.              colrv1_transform(canvas, face, paint);
    51.