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

Unified Diff: src/sfnt/SkOTTable_head.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_glyf.h ('k') | src/sfnt/SkOTTable_hhea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sfnt/SkOTTable_head.h
diff --git a/src/sfnt/SkOTTable_head.h b/src/sfnt/SkOTTable_head.h
index 52970b0f3b4be722fe7a21412e0be996182c958c..0011eead80449f0984f8145d1ecc1b00c3e005bb 100644
--- a/src/sfnt/SkOTTable_head.h
+++ b/src/sfnt/SkOTTable_head.h
@@ -10,7 +10,6 @@
#include "SkEndian.h"
#include "SkOTTableTypes.h"
-#include "SkTypedEnum.h"
#pragma pack(push, 1)
@@ -116,27 +115,24 @@ struct SkOTTableHead {
} 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;
};
« no previous file with comments | « src/sfnt/SkOTTable_glyf.h ('k') | src/sfnt/SkOTTable_hhea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698