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

Unified Diff: src/sfnt/SkOTTable_OS_2_VA.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_OS_2_V4.h ('k') | src/sfnt/SkOTTable_gasp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sfnt/SkOTTable_OS_2_VA.h
diff --git a/src/sfnt/SkOTTable_OS_2_VA.h b/src/sfnt/SkOTTable_OS_2_VA.h
index 1dc95b5af7ecf0160692646f59c87ef0e7d9b14d..63b904c5b0fd153e8db1ab16318c201cb8b9f3f0 100644
--- a/src/sfnt/SkOTTable_OS_2_VA.h
+++ b/src/sfnt/SkOTTable_OS_2_VA.h
@@ -12,7 +12,6 @@
#include "SkIBMFamilyClass.h"
#include "SkOTTableTypes.h"
#include "SkPanose.h"
-#include "SkTypedEnum.h"
#pragma pack(push, 1)
@@ -25,32 +24,32 @@ struct SkOTTableOS2_VA {
SK_OT_SHORT xAvgCharWidth;
struct WeightClass {
- SK_TYPED_ENUM(Value, SK_OT_USHORT,
- ((UltraLight, SkTEndian_SwapBE16(1)))
- ((ExtraLight, SkTEndian_SwapBE16(2)))
- ((Light, SkTEndian_SwapBE16(3)))
- ((SemiLight, SkTEndian_SwapBE16(4)))
- ((Medium, SkTEndian_SwapBE16(5)))
- ((SemiBold, SkTEndian_SwapBE16(6)))
- ((Bold, SkTEndian_SwapBE16(7)))
- ((ExtraBold, SkTEndian_SwapBE16(8)))
- ((UltraBold, SkTEndian_SwapBE16(9)))
+ enum Value : SK_OT_USHORT {
+ UltraLight = SkTEndian_SwapBE16(1),
+ ExtraLight = SkTEndian_SwapBE16(2),
+ Light = SkTEndian_SwapBE16(3),
+ SemiLight = SkTEndian_SwapBE16(4),
+ Medium = SkTEndian_SwapBE16(5),
+ SemiBold = SkTEndian_SwapBE16(6),
+ Bold = SkTEndian_SwapBE16(7),
+ ExtraBold = SkTEndian_SwapBE16(8),
+ UltraBold = SkTEndian_SwapBE16(9),
SK_SEQ_END,
- (value)SK_SEQ_END)
+ } value;
} usWeightClass;
struct WidthClass {
- SK_TYPED_ENUM(Value, SK_OT_USHORT,
- ((UltraCondensed, SkTEndian_SwapBE16(1)))
- ((ExtraCondensed, SkTEndian_SwapBE16(2)))
- ((Condensed, SkTEndian_SwapBE16(3)))
- ((SemiCondensed, SkTEndian_SwapBE16(4)))
- ((Medium, SkTEndian_SwapBE16(5)))
- ((SemiExpanded, SkTEndian_SwapBE16(6)))
- ((Expanded, SkTEndian_SwapBE16(7)))
- ((ExtraExpanded, SkTEndian_SwapBE16(8)))
- ((UltraExpanded, SkTEndian_SwapBE16(9)))
+ enum Value : SK_OT_USHORT {
+ UltraCondensed = SkTEndian_SwapBE16(1),
+ ExtraCondensed = SkTEndian_SwapBE16(2),
+ Condensed = SkTEndian_SwapBE16(3),
+ SemiCondensed = SkTEndian_SwapBE16(4),
+ Medium = SkTEndian_SwapBE16(5),
+ SemiExpanded = SkTEndian_SwapBE16(6),
+ Expanded = SkTEndian_SwapBE16(7),
+ ExtraExpanded = SkTEndian_SwapBE16(8),
+ UltraExpanded = SkTEndian_SwapBE16(9),
SK_SEQ_END,
- (value)SK_SEQ_END)
+ } value;
} usWidthClass;
union Type {
struct Field {
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_V4.h ('k') | src/sfnt/SkOTTable_gasp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698