Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2.

src/sfnt/SkOTTable_OS_2_V1.h

Index: src/sfnt/SkOTTable_OS_2_V1.h
===================================================================
--- src/sfnt/SkOTTable_OS_2_V1.h	(revision 13776)
+++ src/sfnt/SkOTTable_OS_2_V1.h	(working copy)
@@ -74,10 +74,10 @@
                 Reserved07)
         } field;
         struct Raw {
-            static const SK_OT_USHORT Installable = SkTEndian_SwapBE16(0);
-            static const SK_OT_USHORT RestrictedMask = SkTEndian_SwapBE16(1 << 1);
-            static const SK_OT_USHORT PreviewPrintMask = SkTEndian_SwapBE16(1 << 2);
-            static const SK_OT_USHORT EditableMask = SkTEndian_SwapBE16(1 << 3);
+            static const SK_OT_USHORT Installable = 0;
+            static const SK_OT_USHORT RestrictedMask = SkOTSetUSHORTBit<1>::value;
+            static const SK_OT_USHORT PreviewPrintMask = SkOTSetUSHORTBit<2>::value;
+            static const SK_OT_USHORT EditableMask = SkOTSetUSHORTBit<3>::value;
             SK_OT_USHORT value;
         } raw;
     } fsType;
@@ -261,80 +261,80 @@
         } field;
         struct Raw {
             struct l0 {
-                static const SK_OT_ULONG BasicLatinMask = SkTEndian_SwapBE32(1 << 0);
-                static const SK_OT_ULONG Latin1SupplementMask = SkTEndian_SwapBE32(1 << 1);
-                static const SK_OT_ULONG LatinExtendedAMask = SkTEndian_SwapBE32(1 << 2);
-                static const SK_OT_ULONG LatinExtendedBMask = SkTEndian_SwapBE32(1 << 3);
-                static const SK_OT_ULONG IPAExtensionsMask = SkTEndian_SwapBE32(1 << 4);
-                static const SK_OT_ULONG SpacingModifierLettersMask = SkTEndian_SwapBE32(1 << 5);
-                static const SK_OT_ULONG CombiningDiacriticalMarksMask = SkTEndian_SwapBE32(1 << 6);
-                static const SK_OT_ULONG BasicGreekMask = SkTEndian_SwapBE32(1 << 7);
-                static const SK_OT_ULONG GreekSymbolsAndCCopticMask = SkTEndian_SwapBE32(1 << 8);
-                static const SK_OT_ULONG CyrillicMask = SkTEndian_SwapBE32(1 << 9);
-                static const SK_OT_ULONG ArmenianMask = SkTEndian_SwapBE32(1 << 10);
-                static const SK_OT_ULONG BasicHebrewMask = SkTEndian_SwapBE32(1 << 11);
-                static const SK_OT_ULONG HebrewExtendedABMask = SkTEndian_SwapBE32(1 << 12);
-                static const SK_OT_ULONG BasicArabicMask = SkTEndian_SwapBE32(1 << 13);
-                static const SK_OT_ULONG ArabicExtendedMask = SkTEndian_SwapBE32(1 << 14);
-                static const SK_OT_ULONG DevanagariMask = SkTEndian_SwapBE32(1 << 15);
-                static const SK_OT_ULONG BengaliMask = SkTEndian_SwapBE32(1 << 16);
-                static const SK_OT_ULONG GurmukhiMask = SkTEndian_SwapBE32(1 << 17);
-                static const SK_OT_ULONG GujaratiMask = SkTEndian_SwapBE32(1 << 18);
-                static const SK_OT_ULONG OriyaMask = SkTEndian_SwapBE32(1 << 19);
-                static const SK_OT_ULONG TamilMask = SkTEndian_SwapBE32(1 << 20);
-                static const SK_OT_ULONG TeluguMask = SkTEndian_SwapBE32(1 << 21);
-                static const SK_OT_ULONG KannadaMask = SkTEndian_SwapBE32(1 << 22);
-                static const SK_OT_ULONG MalayalamMask = SkTEndian_SwapBE32(1 << 23);
-                static const SK_OT_ULONG ThaiMask = SkTEndian_SwapBE32(1 << 24);
-                static const SK_OT_ULONG LaoMask = SkTEndian_SwapBE32(1 << 25);
-                static const SK_OT_ULONG BasicGeorgianMask = SkTEndian_SwapBE32(1 << 26);
-                static const SK_OT_ULONG GeorgianExtendedMask = SkTEndian_SwapBE32(1 << 27);
-                static const SK_OT_ULONG HangulJamoMask = SkTEndian_SwapBE32(1 << 28);
-                static const SK_OT_ULONG LatinExtendedAdditionalMask = SkTEndian_SwapBE32(1 << 29);
-                static const SK_OT_ULONG GreekExtendedMask = SkTEndian_SwapBE32(1 << 30);
-                static const SK_OT_ULONG GeneralPunctuationMask = SkTEndian_SwapBE32(1 << 31);
+                static const SK_OT_ULONG BasicLatinMask = SkOTSetULONGBit<0>::value;
+                static const SK_OT_ULONG Latin1SupplementMask = SkOTSetULONGBit<1>::value;
+                static const SK_OT_ULONG LatinExtendedAMask = SkOTSetULONGBit<2>::value;
+                static const SK_OT_ULONG LatinExtendedBMask = SkOTSetULONGBit<3>::value;
+                static const SK_OT_ULONG IPAExtensionsMask = SkOTSetULONGBit<4>::value;
+                static const SK_OT_ULONG SpacingModifierLettersMask = SkOTSetULONGBit<5>::value;
+                static const SK_OT_ULONG CombiningDiacriticalMarksMask = SkOTSetULONGBit<6>::value;
+                static const SK_OT_ULONG BasicGreekMask = SkOTSetULONGBit<7>::value;
+                static const SK_OT_ULONG GreekSymbolsAndCCopticMask = SkOTSetULONGBit<8>::value;
+                static const SK_OT_ULONG CyrillicMask = SkOTSetULONGBit<9>::value;
+                static const SK_OT_ULONG ArmenianMask = SkOTSetULONGBit<10>::value;
+                static const SK_OT_ULONG BasicHebrewMask = SkOTSetULONGBit<11>::value;
+                static const SK_OT_ULONG HebrewExtendedABMask = SkOTSetULONGBit<12>::value;
+                static const SK_OT_ULONG BasicArabicMask = SkOTSetULONGBit<13>::value;
+                static const SK_OT_ULONG ArabicExtendedMask = SkOTSetULONGBit<14>::value;
+                static const SK_OT_ULONG DevanagariMask = SkOTSetULONGBit<15>::value;
+                static const SK_OT_ULONG BengaliMask = SkOTSetULONGBit<16>::value;
+                static const SK_OT_ULONG GurmukhiMask = SkOTSetULONGBit<17>::value;
+                static const SK_OT_ULONG GujaratiMask = SkOTSetULONGBit<18>::value;
+                static const SK_OT_ULONG OriyaMask = SkOTSetULONGBit<19>::value;
+                static const SK_OT_ULONG TamilMask = SkOTSetULONGBit<20>::value;
+                static const SK_OT_ULONG TeluguMask = SkOTSetULONGBit<21>::value;
+                static const SK_OT_ULONG KannadaMask = SkOTSetULONGBit<22>::value;
+                static const SK_OT_ULONG MalayalamMask = SkOTSetULONGBit<23>::value;
+                static const SK_OT_ULONG ThaiMask = SkOTSetULONGBit<24>::value;
+                static const SK_OT_ULONG LaoMask = SkOTSetULONGBit<25>::value;
+                static const SK_OT_ULONG BasicGeorgianMask = SkOTSetULONGBit<26>::value;
+                static const SK_OT_ULONG GeorgianExtendedMask = SkOTSetULONGBit<27>::value;
+                static const SK_OT_ULONG HangulJamoMask = SkOTSetULONGBit<28>::value;
+                static const SK_OT_ULONG LatinExtendedAdditionalMask = SkOTSetULONGBit<29>::value;
+                static const SK_OT_ULONG GreekExtendedMask = SkOTSetULONGBit<30>::value;
+                static const SK_OT_ULONG GeneralPunctuationMask = SkOTSetULONGBit<31>::value;
             };
             struct l1 {
-                static const SK_OT_ULONG SuperscriptsAndSubscriptsMask = SkTEndian_SwapBE32(1 << (32 - 32));
-                static const SK_OT_ULONG CurrencySymbolsMask = SkTEndian_SwapBE32(1 << (33 - 32));
-                static const SK_OT_ULONG CombiningDiacriticalMarksForSymbolsMask = SkTEndian_SwapBE32(1 << (34 - 32));
-                static const SK_OT_ULONG LetterlikeSymbolsMask = SkTEndian_SwapBE32(1 << (35 - 32));
-                static const SK_OT_ULONG NumberFormsMask = SkTEndian_SwapBE32(1 << (36 - 32));
-                static const SK_OT_ULONG ArrowsMask = SkTEndian_SwapBE32(1 << (37 - 32));
-                static const SK_OT_ULONG MathematicalOperatorsMask = SkTEndian_SwapBE32(1 << (38 - 32));
-                static const SK_OT_ULONG MiscellaneousTechnicalMask = SkTEndian_SwapBE32(1 << (39 - 32));
-                static const SK_OT_ULONG ControlPicturesMask = SkTEndian_SwapBE32(1 << (40 - 32));
-                static const SK_OT_ULONG OpticalCharacterRecognitionMask = SkTEndian_SwapBE32(1 << (41 - 32));
-                static const SK_OT_ULONG EnclosedAlphanumericsMask = SkTEndian_SwapBE32(1 << (42 - 32));
-                static const SK_OT_ULONG BoxDrawingMask = SkTEndian_SwapBE32(1 << (43 - 32));
-                static const SK_OT_ULONG BlockElementsMask = SkTEndian_SwapBE32(1 << (44 - 32));
-                static const SK_OT_ULONG GeometricShapesMask = SkTEndian_SwapBE32(1 << (45 - 32));
-                static const SK_OT_ULONG MiscellaneousSymbolsMask = SkTEndian_SwapBE32(1 << (46 - 32));
-                static const SK_OT_ULONG DingbatsMask = SkTEndian_SwapBE32(1 << (47 - 32));
-                static const SK_OT_ULONG CJKSymbolsAndPunctuationMask = SkTEndian_SwapBE32(1 << (48 - 32));
-                static const SK_OT_ULONG HiraganaMask = SkTEndian_SwapBE32(1 << (49 - 32));
-                static const SK_OT_ULONG KatakanaMask = SkTEndian_SwapBE32(1 << (50 - 32));
-                static const SK_OT_ULONG BopomofoMask = SkTEndian_SwapBE32(1 << (51 - 32));
-                static const SK_OT_ULONG HangulCompatibilityJamoMask = SkTEndian_SwapBE32(1 << (52 - 32));
-                static const SK_OT_ULONG CJKMiscellaneousMask = SkTEndian_SwapBE32(1 << (53 - 32));
-                static const SK_OT_ULONG EnclosedCJKLettersAndMonthsMask = SkTEndian_SwapBE32(1 << (54 - 32));
-                static const SK_OT_ULONG CJKCompatibilityMask = SkTEndian_SwapBE32(1 << (55 - 32));
-                static const SK_OT_ULONG HangulMask = SkTEndian_SwapBE32(1 << (56 - 32));
+                static const SK_OT_ULONG SuperscriptsAndSubscriptsMask = SkOTSetULONGBit<32 - 32>::value;
+                static const SK_OT_ULONG CurrencySymbolsMask = SkOTSetULONGBit<33 - 32>::value;
+                static const SK_OT_ULONG CombiningDiacriticalMarksForSymbolsMask = SkOTSetULONGBit<34 - 32>::value;
+                static const SK_OT_ULONG LetterlikeSymbolsMask = SkOTSetULONGBit<35 - 32>::value;
+                static const SK_OT_ULONG NumberFormsMask = SkOTSetULONGBit<36 - 32>::value;
+                static const SK_OT_ULONG ArrowsMask = SkOTSetULONGBit<37 - 32>::value;
+                static const SK_OT_ULONG MathematicalOperatorsMask = SkOTSetULONGBit<38 - 32>::value;
+                static const SK_OT_ULONG MiscellaneousTechnicalMask = SkOTSetULONGBit<39 - 32>::value;
+                static const SK_OT_ULONG ControlPicturesMask = SkOTSetULONGBit<40 - 32>::value;
+                static const SK_OT_ULONG OpticalCharacterRecognitionMask = SkOTSetULONGBit<41 - 32>::value;
+                static const SK_OT_ULONG EnclosedAlphanumericsMask = SkOTSetULONGBit<42 - 32>::value;
+                static const SK_OT_ULONG BoxDrawingMask = SkOTSetULONGBit<43 - 32>::value;
+                static const SK_OT_ULONG BlockElementsMask = SkOTSetULONGBit<44 - 32>::value;
+                static const SK_OT_ULONG GeometricShapesMask = SkOTSetULONGBit<45 - 32>::value;
+                static const SK_OT_ULONG MiscellaneousSymbolsMask = SkOTSetULONGBit<46 - 32>::value;
+                static const SK_OT_ULONG DingbatsMask = SkOTSetULONGBit<47 - 32>::value;
+                static const SK_OT_ULONG CJKSymbolsAndPunctuationMask = SkOTSetULONGBit<48 - 32>::value;
+                static const SK_OT_ULONG HiraganaMask = SkOTSetULONGBit<49 - 32>::value;
+                static const SK_OT_ULONG KatakanaMask = SkOTSetULONGBit<50 - 32>::value;
+                static const SK_OT_ULONG BopomofoMask = SkOTSetULONGBit<51 - 32>::value;
+                static const SK_OT_ULONG HangulCompatibilityJamoMask = SkOTSetULONGBit<52 - 32>::value;
+                static const SK_OT_ULONG CJKMiscellaneousMask = SkOTSetULONGBit<53 - 32>::value;
+                static const SK_OT_ULONG EnclosedCJKLettersAndMonthsMask = SkOTSetULONGBit<54 - 32>::value;
+                static const SK_OT_ULONG CJKCompatibilityMask = SkOTSetULONGBit<55 - 32>::value;
+                static const SK_OT_ULONG HangulMask = SkOTSetULONGBit<56 - 32>::value;
                 //Reserved
                 //Reserved
-                static const SK_OT_ULONG CJKUnifiedIdeographsMask = SkTEndian_SwapBE32(1 << (59 - 32));
-                static const SK_OT_ULONG PrivateUseAreaMask = SkTEndian_SwapBE32(1 << (60 - 32));
-                static const SK_OT_ULONG CJKCompatibilityIdeographsMask = SkTEndian_SwapBE32(1 << (61 - 32));
-                static const SK_OT_ULONG AlphabeticPresentationFormsMask = SkTEndian_SwapBE32(1 << (62 - 32));
-                static const SK_OT_ULONG ArabicPresentationFormsAMask = SkTEndian_SwapBE32(1 << (63 - 32));
+                static const SK_OT_ULONG CJKUnifiedIdeographsMask = SkOTSetULONGBit<59 - 32>::value;
+                static const SK_OT_ULONG PrivateUseAreaMask = SkOTSetULONGBit<60 - 32>::value;
+                static const SK_OT_ULONG CJKCompatibilityIdeographsMask = SkOTSetULONGBit<61 - 32>::value;
+                static const SK_OT_ULONG AlphabeticPresentationFormsMask = SkOTSetULONGBit<62 - 32>::value;
+                static const SK_OT_ULONG ArabicPresentationFormsAMask = SkOTSetULONGBit<63 - 32>::value;
             };
             struct l2 {
-                static const SK_OT_ULONG CombiningHalfMarksMask = SkTEndian_SwapBE32(1 << (64 - 64));
-                static const SK_OT_ULONG CJKCompatibilityFormsMask = SkTEndian_SwapBE32(1 << (65 - 64));
-                static const SK_OT_ULONG SmallFormVariantsMask = SkTEndian_SwapBE32(1 << (66 - 64));
-                static const SK_OT_ULONG ArabicPresentationFormsBMask = SkTEndian_SwapBE32(1 << (67 - 64));
-                static const SK_OT_ULONG HalfwidthAndFullwidthFormsMask = SkTEndian_SwapBE32(1 << (68 - 64));
-                static const SK_OT_ULONG SpecialsMask = SkTEndian_SwapBE32(1 << (69 - 64));
+                static const SK_OT_ULONG CombiningHalfMarksMask = SkOTSetULONGBit<64 - 64>::value;
+                static const SK_OT_ULONG CJKCompatibilityFormsMask = SkOTSetULONGBit<65 - 64>::value;
+                static const SK_OT_ULONG SmallFormVariantsMask = SkOTSetULONGBit<66 - 64>::value;
+                static const SK_OT_ULONG ArabicPresentationFormsBMask = SkOTSetULONGBit<67 - 64>::value;
+                static const SK_OT_ULONG HalfwidthAndFullwidthFormsMask = SkOTSetULONGBit<68 - 64>::value;
+                static const SK_OT_ULONG SpecialsMask = SkOTSetULONGBit<69 - 64>::value;
             };
             SK_OT_ULONG value[4];
         } raw;
@@ -364,13 +364,13 @@
                 Reserved07)
         } field;
         struct Raw {
-            static const SK_OT_USHORT ItalicMask = SkTEndian_SwapBE16(1 << 0);
-            static const SK_OT_USHORT UnderscoreMask = SkTEndian_SwapBE16(1 << 1);
-            static const SK_OT_USHORT NegativeMask = SkTEndian_SwapBE16(1 << 2);
-            static const SK_OT_USHORT OutlinedMask = SkTEndian_SwapBE16(1 << 3);
-            static const SK_OT_USHORT StrikeoutMask = SkTEndian_SwapBE16(1 << 4);
-            static const SK_OT_USHORT BoldMask = SkTEndian_SwapBE16(1 << 5);
-            static const SK_OT_USHORT RegularMask = SkTEndian_SwapBE16(1 << 6);
+            static const SK_OT_USHORT ItalicMask = SkOTSetUSHORTBit<0>::value;
+            static const SK_OT_USHORT UnderscoreMask = SkOTSetUSHORTBit<1>::value;
+            static const SK_OT_USHORT NegativeMask = SkOTSetUSHORTBit<2>::value;
+            static const SK_OT_USHORT OutlinedMask = SkOTSetUSHORTBit<3>::value;
+            static const SK_OT_USHORT StrikeoutMask = SkOTSetUSHORTBit<4>::value;
+            static const SK_OT_USHORT BoldMask = SkOTSetUSHORTBit<5>::value;
+            static const SK_OT_USHORT RegularMask = SkOTSetUSHORTBit<6>::value;
             SK_OT_USHORT value;
         } raw;
     } fsSelection;
@@ -469,41 +469,41 @@
         } field;
         struct Raw {
             struct l0 {
-                static const SK_OT_ULONG Latin1_1252Mask = SkTEndian_SwapBE32(1 << 0);
-                static const SK_OT_ULONG Latin2EasternEurope_1250Mask = SkTEndian_SwapBE32(1 << 1);
-                static const SK_OT_ULONG Cyrillic_1251Mask = SkTEndian_SwapBE32(1 << 2);
-                static const SK_OT_ULONG Greek_1253Mask = SkTEndian_SwapBE32(1 << 3);
-                static const SK_OT_ULONG Turkish_1254Mask = SkTEndian_SwapBE32(1 << 4);
-                static const SK_OT_ULONG Hebrew_1255Mask = SkTEndian_SwapBE32(1 << 5);
-                static const SK_OT_ULONG Arabic_1256Mask = SkTEndian_SwapBE32(1 << 6);
-                static const SK_OT_ULONG WindowsBaltic_1257Mask = SkTEndian_SwapBE32(1 << 7);
-                static const SK_OT_ULONG Thai_874Mask = SkTEndian_SwapBE32(1 << 16);
-                static const SK_OT_ULONG JISJapan_932Mask = SkTEndian_SwapBE32(1 << 17);
-                static const SK_OT_ULONG ChineseSimplified_936Mask = SkTEndian_SwapBE32(1 << 18);
-                static const SK_OT_ULONG KoreanWansung_949Mask = SkTEndian_SwapBE32(1 << 19);
-                static const SK_OT_ULONG ChineseTraditional_950Mask = SkTEndian_SwapBE32(1 << 20);
-                static const SK_OT_ULONG KoreanJohab_1361Mask = SkTEndian_SwapBE32(1 << 21);
-                static const SK_OT_ULONG MacintoshCharacterSetMask = SkTEndian_SwapBE32(1 << 29);
-                static const SK_OT_ULONG OEMCharacterSetMask = SkTEndian_SwapBE32(1 << 30);
-                static const SK_OT_ULONG SymbolCharacterSetMask = SkTEndian_SwapBE32(1 << 31);
+                static const SK_OT_ULONG Latin1_1252Mask = SkOTSetULONGBit<0>::value;
+                static const SK_OT_ULONG Latin2EasternEurope_1250Mask = SkOTSetULONGBit<1>::value;
+                static const SK_OT_ULONG Cyrillic_1251Mask = SkOTSetULONGBit<2>::value;
+                static const SK_OT_ULONG Greek_1253Mask = SkOTSetULONGBit<3>::value;
+                static const SK_OT_ULONG Turkish_1254Mask = SkOTSetULONGBit<4>::value;
+                static const SK_OT_ULONG Hebrew_1255Mask = SkOTSetULONGBit<5>::value;
+                static const SK_OT_ULONG Arabic_1256Mask = SkOTSetULONGBit<6>::value;
+                static const SK_OT_ULONG WindowsBaltic_1257Mask = SkOTSetULONGBit<7>::value;
+                static const SK_OT_ULONG Thai_874Mask = SkOTSetULONGBit<16>::value;
+                static const SK_OT_ULONG JISJapan_932Mask = SkOTSetULONGBit<17>::value;
+                static const SK_OT_ULONG ChineseSimplified_936Mask = SkOTSetULONGBit<18>::value;
+                static const SK_OT_ULONG KoreanWansung_949Mask = SkOTSetULONGBit<19>::value;
+                static const SK_OT_ULONG ChineseTraditional_950Mask = SkOTSetULONGBit<20>::value;
+                static const SK_OT_ULONG KoreanJohab_1361Mask = SkOTSetULONGBit<21>::value;
+                static const SK_OT_ULONG MacintoshCharacterSetMask = SkOTSetULONGBit<29>::value;
+                static const SK_OT_ULONG OEMCharacterSetMask = SkOTSetULONGBit<30>::value;
+                static const SK_OT_ULONG SymbolCharacterSetMask = SkOTSetULONGBit<31>::value;
             };
             struct l1 {
-                static const SK_OT_ULONG IBMGreek_869Mask = SkTEndian_SwapBE32(1 << (48 - 32));
-                static const SK_OT_ULONG MSDOSRussian_866Mask = SkTEndian_SwapBE32(1 << (49 - 32));
-                static const SK_OT_ULONG MSDOSNordic_865Mask = SkTEndian_SwapBE32(1 << (50 - 32));
-                static const SK_OT_ULONG Arabic_864Mask = SkTEndian_SwapBE32(1 << (51 - 32));
-                static const SK_OT_ULONG MSDOSCanadianFrench_863Mask = SkTEndian_SwapBE32(1 << (52 - 32));
-                static const SK_OT_ULONG Hebrew_862Mask = SkTEndian_SwapBE32(1 << (53 - 32));
-                static const SK_OT_ULONG MSDOSIcelandic_861Mask = SkTEndian_SwapBE32(1 << (54 - 32));
-                static const SK_OT_ULONG MSDOSPortuguese_860Mask = SkTEndian_SwapBE32(1 << (55 - 32));
-                static const SK_OT_ULONG IBMTurkish_857Mask = SkTEndian_SwapBE32(1 << (56 - 32));
-                static const SK_OT_ULONG IBMCyrillic_855Mask = SkTEndian_SwapBE32(1 << (57 - 32));
-                static const SK_OT_ULONG Latin2_852Mask = SkTEndian_SwapBE32(1 << (58 - 32));
-                static const SK_OT_ULONG MSDOSBaltic_775Mask = SkTEndian_SwapBE32(1 << (59 - 32));
-                static const SK_OT_ULONG Greek_737Mask = SkTEndian_SwapBE32(1 << (60 - 32));
-                static const SK_OT_ULONG Arabic_708Mask = SkTEndian_SwapBE32(1 << (61 - 32));
-                static const SK_OT_ULONG WELatin1_850Mask = SkTEndian_SwapBE32(1 << (62 - 32));
-                static const SK_OT_ULONG US_437Mask = SkTEndian_SwapBE32(1 << (63 - 32));
+                static const SK_OT_ULONG IBMGreek_869Mask = SkOTSetULONGBit<48 - 32>::value;
+                static const SK_OT_ULONG MSDOSRussian_866Mask = SkOTSetULONGBit<49 - 32>::value;
+                static const SK_OT_ULONG MSDOSNordic_865Mask = SkOTSetULONGBit<50 - 32>::value;
+                static const SK_OT_ULONG Arabic_864Mask = SkOTSetULONGBit<51 - 32>::value;
+                static const SK_OT_ULONG MSDOSCanadianFrench_863Mask = SkOTSetULONGBit<52 - 32>::value;
+                static const SK_OT_ULONG Hebrew_862Mask = SkOTSetULONGBit<53 - 32>::value;
+                static const SK_OT_ULONG MSDOSIcelandic_861Mask = SkOTSetULONGBit<54 - 32>::value;
+                static const SK_OT_ULONG MSDOSPortuguese_860Mask = SkOTSetULONGBit<55 - 32>::value;
+                static const SK_OT_ULONG IBMTurkish_857Mask = SkOTSetULONGBit<56 - 32>::value;
+                static const SK_OT_ULONG IBMCyrillic_855Mask = SkOTSetULONGBit<57 - 32>::value;
+                static const SK_OT_ULONG Latin2_852Mask = SkOTSetULONGBit<58 - 32>::value;
+                static const SK_OT_ULONG MSDOSBaltic_775Mask = SkOTSetULONGBit<59 - 32>::value;
+                static const SK_OT_ULONG Greek_737Mask = SkOTSetULONGBit<60 - 32>::value;
+                static const SK_OT_ULONG Arabic_708Mask = SkOTSetULONGBit<61 - 32>::value;
+                static const SK_OT_ULONG WELatin1_850Mask = SkOTSetULONGBit<62 - 32>::value;
+                static const SK_OT_ULONG US_437Mask = SkOTSetULONGBit<63 - 32>::value;
             };
             SK_OT_ULONG value[2];
         } raw;