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

Unified Diff: src/sfnt/SkOTTable_OS_2_V3.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_V2.h ('k') | src/sfnt/SkOTTable_OS_2_V4.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sfnt/SkOTTable_OS_2_V3.h
diff --git a/src/sfnt/SkOTTable_OS_2_V3.h b/src/sfnt/SkOTTable_OS_2_V3.h
index 00df2891f14053786955ba33fd37de472607d15e..e77c46606b3a4d63ed06cbf672f9449065e38b40 100644
--- a/src/sfnt/SkOTTable_OS_2_V3.h
+++ b/src/sfnt/SkOTTable_OS_2_V3.h
@@ -12,7 +12,6 @@
#include "SkIBMFamilyClass.h"
#include "SkOTTableTypes.h"
#include "SkPanose.h"
-#include "SkTypedEnum.h"
#pragma pack(push, 1)
@@ -22,33 +21,31 @@ struct SkOTTableOS2_V3 {
SK_OT_SHORT xAvgCharWidth;
struct WeightClass {
- SK_TYPED_ENUM(Value, SK_OT_USHORT,
- ((Thin, SkTEndian_SwapBE16(100)))
- ((ExtraLight, SkTEndian_SwapBE16(200)))
- ((Light, SkTEndian_SwapBE16(300)))
- ((Normal, SkTEndian_SwapBE16(400)))
- ((Medium, SkTEndian_SwapBE16(500)))
- ((SemiBold, SkTEndian_SwapBE16(600)))
- ((Bold, SkTEndian_SwapBE16(700)))
- ((ExtraBold, SkTEndian_SwapBE16(800)))
- ((Black, SkTEndian_SwapBE16(900)))
- SK_SEQ_END,
- SK_SEQ_END)
+ enum Value : SK_OT_USHORT {
+ Thin = SkTEndian_SwapBE16(100),
+ ExtraLight = SkTEndian_SwapBE16(200),
+ Light = SkTEndian_SwapBE16(300),
+ Normal = SkTEndian_SwapBE16(400),
+ Medium = SkTEndian_SwapBE16(500),
+ SemiBold = SkTEndian_SwapBE16(600),
+ Bold = SkTEndian_SwapBE16(700),
+ ExtraBold = SkTEndian_SwapBE16(800),
+ Black = SkTEndian_SwapBE16(900),
+ };
SK_OT_USHORT 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)))
- SK_SEQ_END,
- (value)SK_SEQ_END)
+ 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),
+ } value;
} usWidthClass;
union Type {
struct Field {
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_V2.h ('k') | src/sfnt/SkOTTable_OS_2_V4.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698