[skottie] Add support for more font weights

Also shuffle the search order to better match use frequency.

Change-Id: I8ba7f5474f0937aecb75215a1129b439f89a7dbf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/216357
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>

Author: fmalita

modules/skottie/src/text/TextLayer.cpp

@@ -31,13 +31,30 @@ SkFontStyle FontStyle(const AnimationBuilder* abuilder, const char* style) {
         const char*               fName;
         const SkFontStyle::Weight fWeight;
     } gWeightMap[] = {
-        { "ExtraLight", SkFontStyle::kExtraLight_Weight },
-        { "Light"     , SkFontStyle::kLight_Weight      },
         { "Regular"   , SkFontStyle::kNormal_Weight     },
         { "Medium"    , SkFontStyle::kMedium_Weight     },
-        { "SemiBold"  , SkFontStyle::kSemiBold_Weight   },
         { "Bold"      , SkFontStyle::kBold_Weight       },
+        { "Light"     , SkFontStyle::kLight_Weight      },
+        { "Black"     , SkFontStyle::kBlack_Weight      },
+        { "Thin"      , SkFontStyle::kThin_Weight       },
+        { "Extra"     , SkFontStyle::kExtraBold_Weight  },
         { "ExtraBold" , SkFontStyle::kExtraBold_Weight  },
+        { "ExtraLight", SkFontStyle::kExtraLight_Weight },
+        { "ExtraBlack", SkFontStyle::kExtraBlack_Weight },
+        { "SemiBold"  , SkFontStyle::kSemiBold_Weight   },
+        { "Hairline"  , SkFontStyle::kThin_Weight       },
+        { "Normal"    , SkFontStyle::kNormal_Weight     },
+        { "Plain"     , SkFontStyle::kNormal_Weight     },
+        { "Standard"  , SkFontStyle::kNormal_Weight     },
+        { "Roman"     , SkFontStyle::kNormal_Weight     },
+        { "Heavy"     , SkFontStyle::kBlack_Weight      },
+        { "Demi"      , SkFontStyle::kSemiBold_Weight   },
+        { "DemiBold"  , SkFontStyle::kSemiBold_Weight   },
+        { "Ultra"     , SkFontStyle::kExtraBold_Weight  },
+        { "UltraBold" , SkFontStyle::kExtraBold_Weight  },
+        { "UltraBlack", SkFontStyle::kExtraBlack_Weight },
+        { "UltraHeavy", SkFontStyle::kExtraBlack_Weight },
+        { "UltraLight", SkFontStyle::kExtraLight_Weight },
     };
 
     SkFontStyle::Weight weight = SkFontStyle::kNormal_Weight;