Remove SkPreprocessorSeq.h and SkTypedEnum.h.

src/sfnt/SkOTTable_head.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkOTTable_head_DEFINED
 #define SkOTTable_head_DEFINED
 
 #include "SkEndian.h"
 #include "SkOTTableTypes.h"
-#include "SkTypedEnum.h"
 
 #pragma pack(push, 1)
 
 struct SkOTTableHead {
     static const SK_OT_CHAR TAG0 = 'h';
     static const SK_OT_CHAR TAG1 = 'e';
     static const SK_OT_CHAR TAG2 = 'a';
     static const SK_OT_CHAR TAG3 = 'd';
     static const SK_OT_ULONG TAG = SkOTTableTAG<SkOTTableHead>::value;
 
@@ skipping 85 matching lines @@
             static const SK_OT_USHORT OutlineMask = SkTEndian_SwapBE16(1 << 3);
             static const SK_OT_USHORT ShadowMask = SkTEndian_SwapBE16(1 << 4);
             static const SK_OT_USHORT CondensedMask = SkTEndian_SwapBE16(1 << 5);
             static const SK_OT_USHORT ExtendedMask = SkTEndian_SwapBE16(1 << 6);
 
             SK_OT_USHORT value;
         } raw;
     } macStyle;
     SK_OT_USHORT lowestRecPPEM;
     struct FontDirectionHint {
-        SK_TYPED_ENUM(Value, SK_OT_SHORT,
-            ((FullyMixedDirectionalGlyphs, SkTEndian_SwapBE16(0)))
-            ((OnlyStronglyLTR, SkTEndian_SwapBE16(1)))
-            ((StronglyLTR, SkTEndian_SwapBE16(2)))
-            ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16((uint16_t)-1))))
-            ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16((uint16_t)-2))))
-            SK_SEQ_END,
-        (value)SK_SEQ_END)
+        enum Value : SK_OT_SHORT {
+            FullyMixedDirectionalGlyphs = SkTEndian_SwapBE16(0),
+            OnlyStronglyLTR = SkTEndian_SwapBE16(1),
+            StronglyLTR = SkTEndian_SwapBE16(2),
+            OnlyStronglyRTL = static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16((uint16_t)-1)),
+            StronglyRTL = static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16((uint16_t)-2)),
+        } value;
     } fontDirectionHint;
     struct IndexToLocFormat {
-        SK_TYPED_ENUM(Value, SK_OT_SHORT,
-            ((ShortOffsets, SkTEndian_SwapBE16(0)))
-            ((LongOffsets, SkTEndian_SwapBE16(1)))
-            SK_SEQ_END,
-        (value)SK_SEQ_END)
+        enum Value : SK_OT_SHORT {
+            ShortOffsets = SkTEndian_SwapBE16(0),
+            LongOffsets = SkTEndian_SwapBE16(1),
+        } value;
     } indexToLocFormat;
     struct GlyphDataFormat {
-        SK_TYPED_ENUM(Value, SK_OT_SHORT,
-            ((CurrentFormat, SkTEndian_SwapBE16(0)))
-            SK_SEQ_END,
-        (value)SK_SEQ_END)
+        enum Value : SK_OT_SHORT {
+            CurrentFormat = SkTEndian_SwapBE16(0),
+        } value;
     } glyphDataFormat;
 };
 
 #pragma pack(pop)
 
 
 #include <stddef.h>
 static_assert(offsetof(SkOTTableHead, glyphDataFormat) == 52, "SkOTTableHead_glyphDataFormat_not_at_52");
 static_assert(sizeof(SkOTTableHead) == 54, "sizeof_SkOTTableHead_not_54");
 
 #endif