Update FontTools to 4.31.2 to gain access to iterSubTables. am: 0b59a54a78 am: 3e24ea754b am: 3886b0a80et_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release

Original change: https://android-review.googlesource.com/c/platform/external/fonttools/+/2043270

Change-Id: Ie02c14d6e2550eb53669c28030dcf2c938419d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 74 insertions, 48 deletions

diff --git a/Tests/colorLib/unbuilder_test.py b/Tests/colorLib/unbuilder_test.py
index 81169e03..35489680 100644
--- a/Tests/colorLib/unbuilder_test.py
+++ b/Tests/colorLib/unbuilder_test.py
@@ -12,7 +12,8 @@ TEST_COLOR_GLYPHS = {
                 "Format": int(ot.PaintFormat.PaintGlyph),
                 "Paint": {
                     "Format": int(ot.PaintFormat.PaintSolid),
-                    "Color": {"PaletteIndex": 2, "Alpha": 0.5},
+                    "PaletteIndex": 2,
+                    "Alpha": 0.5,
                 },
                 "Glyph": "glyph00011",
             },
@@ -24,25 +25,32 @@ TEST_COLOR_GLYPHS = {
                         "Extend": "repeat",
                         "ColorStop": [
                             {
-                                "StopOffset": (0.0, 0),
-                                "Color": {"PaletteIndex": 3, "Alpha": (1.0, 0)},
+                                "StopOffset": 0.0,
+                                "PaletteIndex": 3,
+                                "Alpha": 1.0,
+                                "VarIndexBase": 0,
                             },
                             {
-                                "StopOffset": (0.5, 0),
-                                "Color": {"PaletteIndex": 4, "Alpha": (1.0, 0)},
+                                "StopOffset": 0.5,
+                                "PaletteIndex": 4,
+                                "Alpha": 1.0,
+                                "VarIndexBase": 1,
                             },
                             {
-                                "StopOffset": (1.0, 0),
-                                "Color": {"PaletteIndex": 5, "Alpha": (1.0, 0)},
+                                "StopOffset": 1.0,
+                                "PaletteIndex": 5,
+                                "Alpha": 1.0,
+                                "VarIndexBase": 2,
                             },
                         ],
                     },
-                    "x0": (1, 0),
-                    "y0": (2, 0),
-                    "x1": (-3, 0),
-                    "y1": (-4, 0),
-                    "x2": (5, 0),
-                    "y2": (6, 0),
+                    "x0": 1,
+                    "y0": 2,
+                    "x1": -3,
+                    "y1": -4,
+                    "x2": 5,
+                    "y2": 6,
+                    "VarIndexBase": 0xFFFFFFFF,
                 },
                 "Glyph": "glyph00012",
             },
@@ -57,11 +65,13 @@ TEST_COLOR_GLYPHS = {
                             "ColorStop": [
                                 {
                                     "StopOffset": 0,
-                                    "Color": {"PaletteIndex": 6, "Alpha": 1.0},
+                                    "PaletteIndex": 6,
+                                    "Alpha": 1.0,
                                 },
                                 {
                                     "StopOffset": 1.0,
-                                    "Color": {"PaletteIndex": 7, "Alpha": 0.4},
+                                    "PaletteIndex": 7,
+                                    "Alpha": 0.4,
                                 },
                             ],
                         },
@@ -73,12 +83,13 @@ TEST_COLOR_GLYPHS = {
                         "r1": 12,
                     },
                     "Transform": {
-                        "xx": (-13.0, 0),
-                        "yx": (14.0, 0),
-                        "xy": (15.0, 0),
-                        "yy": (-17.0, 0),
-                        "dx": (18.0, 0),
-                        "dy": (19.0, 0),
+                        "xx": -13.0,
+                        "yx": 14.0,
+                        "xy": 15.0,
+                        "yy": -17.0,
+                        "dx": 18.0,
+                        "dy": 19.0,
+                        "VarIndexBase": 3,
                     },
                 },
                 "Glyph": "glyph00013",
@@ -93,21 +104,20 @@ TEST_COLOR_GLYPHS = {
                             "Format": int(ot.PaintFormat.PaintGlyph),
                             "Paint": {
                                 "Format": int(ot.PaintFormat.PaintSolid),
-                                "Color": {"PaletteIndex": 2, "Alpha": 0.5},
+                                "PaletteIndex": 2,
+                                "Alpha": 0.5,
                             },
                             "Glyph": "glyph00011",
                         },
-                        "xSkewAngle": (-11.0, 0),
-                        "ySkewAngle": (5.0, 0),
-                        "centerX": (253.0, 0),
-                        "centerY": (254.0, 0),
+                        "xSkewAngle": -11.0,
+                        "ySkewAngle": 5.0,
+                        "VarIndexBase": 4,
                     },
                     "angle": 45.0,
-                    "centerX": 255.0,
-                    "centerY": 256.0,
                 },
-                "dx": (257.0, 0),
-                "dy": (258.0, 0),
+                "dx": 257.0,
+                "dy": 258.0,
+                "VarIndexBase": 5,
             },
         ],
     },
@@ -143,11 +153,13 @@ TEST_COLOR_GLYPHS = {
                 "ColorStop": [
                     {
                         "StopOffset": 0.0,
-                        "Color": {"PaletteIndex": 3, "Alpha": 1.0},
+                        "PaletteIndex": 3,
+                        "Alpha": 1.0,
                     },
                     {
                         "StopOffset": 1.0,
-                        "Color": {"PaletteIndex": 5, "Alpha": 1.0},
+                        "PaletteIndex": 5,
+                        "Alpha": 1.0,
                     },
                 ],
             },
@@ -165,7 +177,9 @@ TEST_COLOR_GLYPHS = {
                 "Format": int(ot.PaintFormat.PaintGlyph),
                 "Paint": {
                     "Format": int(ot.PaintFormat.PaintVarSolid),
-                    "Color": {"PaletteIndex": 2, "Alpha": (0.5, 0)},
+                    "PaletteIndex": 2,
+                    "Alpha": 0.5,
+                    "VarIndexBase": 6,
                 },
                 "Glyph": "glyph00011",
             },
@@ -177,34 +191,46 @@ TEST_COLOR_GLYPHS = {
                         "Extend": "repeat",
                         "ColorStop": [
                             {
-                                "StopOffset": (0.0, 0),
-                                "Color": {"PaletteIndex": 3, "Alpha": (1.0, 0)},
+                                "StopOffset": 0.0,
+                                "PaletteIndex": 3,
+                                "Alpha": 1.0,
+                                "VarIndexBase": 7,
                             },
                             {
-                                "StopOffset": (0.5, 0),
-                                "Color": {"PaletteIndex": 4, "Alpha": (1.0, 0)},
+                                "StopOffset": 0.5,
+                                "PaletteIndex": 4,
+                                "Alpha": 1.0,
+                                "VarIndexBase": 8,
                             },
                             {
-                                "StopOffset": (1.0, 0),
-                                "Color": {"PaletteIndex": 5, "Alpha": (1.0, 0)},
+                                "StopOffset": 1.0,
+                                "PaletteIndex": 5,
+                                "Alpha": 1.0,
+                                "VarIndexBase": 9,
                             },
                         ],
                     },
-                    "x0": (1, 0),
-                    "y0": (2, 0),
-                    "x1": (-3, 0),
-                    "y1": (-4, 0),
-                    "x2": (5, 0),
-                    "y2": (6, 0),
+                    "x0": 1,
+                    "y0": 2,
+                    "x1": -3,
+                    "y1": -4,
+                    "x2": 5,
+                    "y2": 6,
+                    "VarIndexBase": 0xFFFFFFFF,
                 },
                 "Glyph": "glyph00012",
             },
         ],
-    },
+    }
 }
 
 
 def test_unbuildColrV1():
-    layersV1, baseGlyphsV1 = buildColrV1(TEST_COLOR_GLYPHS)
-    colorGlyphs = unbuildColrV1(layersV1, baseGlyphsV1)
+    layers, baseGlyphs = buildColrV1(TEST_COLOR_GLYPHS)
+    colorGlyphs = unbuildColrV1(layers, baseGlyphs)
     assert colorGlyphs == TEST_COLOR_GLYPHS
+
+def test_unbuildColrV1_noLayers():
+    _, baseGlyphsV1 = buildColrV1(TEST_COLOR_GLYPHS)
+    # Just looking to see we don't crash
+    unbuildColrV1(None, baseGlyphsV1)
\ No newline at end of file