File chromium-freetype-2.11.patch of Package chromium-ffmpeg-extra

File chromium-freetype-2.11.patch of Package chromium-ffmpeg-extra (Revision 18)

Currently displaying revision 18 , Show latest

diff -up chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
--- chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11	2021-09-02 08:49:18.996863417 -0400
+++ chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp	2021-09-02 08:56:07.716626801 -0400
@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,
             canvas->drawPaint(colrPaint);
             break;
         }
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
         case FT_COLR_PAINTFORMAT_TRANSFORM:
+#else
+        case FT_COLR_PAINTFORMAT_TRANSFORMED:
+#endif
         case FT_COLR_PAINTFORMAT_TRANSLATE:
         case FT_COLR_PAINTFORMAT_SCALE:
         case FT_COLR_PAINTFORMAT_ROTATE:
@@ -760,10 +764,17 @@ void colrv1_transform(SkCanvas* canvas,
     SkMatrix transform;
 
     switch (colrv1_paint.format) {
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
         case FT_COLR_PAINTFORMAT_TRANSFORM: {
             transform = ToSkMatrix(colrv1_paint.u.transform.affine);
             break;
         }
+#else
+        case FT_COLR_PAINTFORMAT_TRANSFORMED: {
+            transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
+            break;
+        }
+#endif
         case FT_COLR_PAINTFORMAT_TRANSLATE: {
             transform = SkMatrix::Translate(
                 SkFixedToScalar(colrv1_paint.u.translate.dx),
@@ -889,11 +900,18 @@ bool colrv1_traverse_paint(SkCanvas* can
             traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
                                                  FT_COLOR_NO_ROOT_TRANSFORM);
             break;
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
         case FT_COLR_PAINTFORMAT_TRANSFORM:
             colrv1_transform(canvas, face, paint);
             traverse_result = colrv1_traverse_paint(canvas, palette, face,
                                                     paint.u.transform.paint, visited_set);
             break;
+#else
+        case FT_COLR_PAINTFORMAT_TRANSFORMED:
+            colrv1_transform(canvas, face, paint);
+            traverse_result = colrv1_traverse_paint(canvas, palette, face,
+                                                    paint.u.transformed.paint, visited_set);
+#endif
         case FT_COLR_PAINTFORMAT_TRANSLATE:
             colrv1_transform(canvas, face, paint);
             traverse_result = colrv1_traverse_paint(canvas, palette, face,