Add profile support for radial gradient without highlight

Also fix big with JSON editor not loading from review.skia.org/923697 Bug: b/373892640 Change-Id: If9c6f59591f432c9ced9236efe5d8efe1161667e Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/926143 Reviewed-by: Florin Malita <[email protected]> Commit-Queue: Brandon Wilson <[email protected]>
google · Dec 2, 2024 · 667c4e9 · 667c4e9
1 parent 7c445c7
commit 667c4e9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/skottie/modules/skottie-compatibility-sk/schemas/low-power-lottie-profile.schema.ts b/skottie/modules/skottie-compatibility-sk/schemas/low-power-lottie-profile.schema.ts
@@ -469,8 +469,8 @@ export const lowPowerLottieProfileSchema =
               }
             }
           },
-          "no-gradient-fill-radial": {
-            "feature-code": "shape-fill-gradient-radial",
+          "no-gradient-fill-radial-highlight": {
+            "feature-code": "shape-fill-gradient-radial-highlight",
             "feature-link": "shape-fill-gradient",
             "not": {
               "type": "object",
@@ -480,6 +480,17 @@ export const lowPowerLottieProfileSchema =
                 },
                 "t": {
                   "const": 2
+                },
+                "h": {
+                  "not": {
+                    "type": "object",
+                    "properties": {
+                      "k": {
+                        "type": "number",
+                        "const": 0
+                      }
+                    }
+                  }
                 }
               }
             }
@@ -497,8 +508,8 @@ export const lowPowerLottieProfileSchema =
               }
             }
           },
-          "no-gradient-stroke-radial": {
-            "feature-code": "shape-stroke-gradient-radial",
+          "no-gradient-stroke-radial-highlight": {
+            "feature-code": "shape-stroke-gradient-radial-highlight",
             "feature-link": "shape-stroke-gradient",
             "not": {
               "type": "object",
@@ -508,6 +519,17 @@ export const lowPowerLottieProfileSchema =
                 },
                 "t": {
                   "const": 2
+                },
+                "h": {
+                  "not": {
+                    "type": "object",
+                    "properties": {
+                      "k": {
+                        "type": "number",
+                        "const": 0
+                      }
+                    }
+                  }
                 }
               }
             }
@@ -560,13 +582,13 @@ export const lowPowerLottieProfileSchema =
               "$ref": "#/$defs/features/shapes/types/no-stroke"
             },
             {
-              "$ref": "#/$defs/features/shapes/types/no-gradient-fill-radial"
+              "$ref": "#/$defs/features/shapes/types/no-gradient-fill-radial-highlight"
             },
             {
               "$ref": "#/$defs/features/shapes/types/no-gradient-stroke"
             },
             {
-              "$ref": "#/$defs/features/shapes/types/no-gradient-stroke-radial"
+              "$ref": "#/$defs/features/shapes/types/no-gradient-stroke-radial-highlight"
             },
             {
               "$ref": "#/$defs/features/shapes/types/only-supported-shape-transforms"

diff --git a/skottie/modules/skottie-sk/skottie-sk.ts b/skottie/modules/skottie-sk/skottie-sk.ts
@@ -100,11 +100,6 @@ interface BodymovinPlayer {
   destroy(): void;
 }
 
-interface LottieLibrary {
-  version: string;
-  loadAnimation(opts: Record<string, unknown>): BodymovinPlayer;
-}
-
 interface LoadedAsset {
   name: string;
   bytes?: ArrayBuffer;
@@ -1414,6 +1409,7 @@ export class SkottieSk extends ElementSk {
           new Ajv({
             allErrors: true,
             verbose: true,
+            strict: false,
           }),
       });
     }
@@ -1499,7 +1495,7 @@ export class SkottieSk extends ElementSk {
     }
   }
 
-  private onFrameChange(e: Event): void {
+  private onFrameChange(): void {
     if (this.playing) {
       this.playpause();
     }