Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Unified Diff: src/sfnt/SkOTTable_post.h

Issue 2254513002: Remove SkPreprocessorSeq.h and SkTypedEnum.h. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sfnt/SkOTTable_name.h ('k') | src/sfnt/SkPanose.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sfnt/SkOTTable_post.h
diff --git a/src/sfnt/SkOTTable_post.h b/src/sfnt/SkOTTable_post.h
index 7461d5283eb556977cd93c4b09a3bfde200c4d3b..1af692983f815fa1173532ce0fb6ad9c20807591 100644
--- a/src/sfnt/SkOTTable_post.h
+++ b/src/sfnt/SkOTTable_post.h
@@ -10,7 +10,6 @@
#include "SkEndian.h"
#include "SkOTTableTypes.h"
-#include "SkTypedEnum.h"
#pragma pack(push, 1)
@@ -22,14 +21,13 @@ struct SkOTTablePostScript {
static const SK_OT_ULONG TAG = SkOTTableTAG<SkOTTablePostScript>::value;
struct Format {
- SK_TYPED_ENUM(Value, SK_OT_Fixed,
- ((version1, SkTEndian_SwapBE32(0x00010000)))
- ((version2, SkTEndian_SwapBE32(0x00020000)))
- ((version2_5, SkTEndian_SwapBE32(0x00025000)))
- ((version3, SkTEndian_SwapBE32(0x00030000)))
- ((version4, SkTEndian_SwapBE32(0x00040000)))
- SK_SEQ_END,
- SK_SEQ_END)
+ enum Value : SK_OT_Fixed {
+ version1 = SkTEndian_SwapBE32(0x00010000),
+ version2 = SkTEndian_SwapBE32(0x00020000),
+ version2_5 = SkTEndian_SwapBE32(0x00025000),
+ version3 = SkTEndian_SwapBE32(0x00030000),
+ version4 = SkTEndian_SwapBE32(0x00040000),
+ };
SK_OT_Fixed value;
} format;
SK_OT_Fixed italicAngle;
« no previous file with comments | « src/sfnt/SkOTTable_name.h ('k') | src/sfnt/SkPanose.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698