SkPDF: SkPDFFont class changes

src/core/SkAdvancedTypefaceMetrics.h

Index: src/core/SkAdvancedTypefaceMetrics.h
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h
index 1b490e0199300d6671dd428835900172a9f31a6b..7ee38e6050f3fc5a849986368fbc802a2a98a0c0 100644
--- a/src/core/SkAdvancedTypefaceMetrics.h
+++ b/src/core/SkAdvancedTypefaceMetrics.h
@@ -43,7 +43,7 @@ public:
 
     SkString fFontName;
 
-    enum FontType {
+    enum FontType : uint8_t {
         kType1_Font,
         kType1CID_Font,
         kCFF_Font,
@@ -55,20 +55,20 @@ public:
     // information will never be populated.
     FontType fType;
 
-    enum FontFlags {
+    enum FontFlags : uint8_t {
         kEmpty_FontFlag          = 0x0,  //!<No flags set
         kMultiMaster_FontFlag    = 0x1,  //!<May be true for Type1, CFF, or TrueType fonts.
         kNotEmbeddable_FontFlag  = 0x2,  //!<May not be embedded.
         kNotSubsettable_FontFlag = 0x4,  //!<May not be subset.
     };
     // Global font flags.
-    FontFlags fFlags;
+    uint8_t fFlags;

[bungeman-skia, 2016/08/15 16:49:58]

Seems less clear now, before I knew these were FontFlags, now it just happens
that it has the same underlying type. Of course, part of the issue is that these
are flags, not enumerations, which is always fighting against the language.

If we really need this to be an integer, then
skstd::underlying_type_t<FontFlags> should be the type. If we just need '|' and
'&' can we just provide those operators? Same goes for StyleFlags and fStyle
below. It's rather annoying that we don't have a nice template-y thing for
creating the appropriate operators.

Don't try to use std::underlying_type directly, Chromium currently can't rely on
it.

[hal.canary, 2016/08/15 18:05:23]

Done.

 
     uint16_t fLastGlyphID; // The last valid glyph ID in the font.
     uint16_t fEmSize;  // The size of the em box (defines font units).
 
     // These enum values match the values used in the PDF file format.
-    enum StyleFlags {
+    enum StyleFlags : uint32_t {
         kFixedPitch_Style  = 0x00001,

[bungeman-skia, 2016/08/15 16:49:58]

Not really needed, but while we're touching these, can these constants not be 5
digits? Would be nice if they were full 8.

Also, were the last three enum values here being effectively ignored due to
fStyle being uint16_t?

[hal.canary, 2016/08/15 18:05:23]

done.
they weren't ever set.

         kSerif_Style       = 0x00002,
         kScript_Style      = 0x00008,
@@ -77,7 +77,7 @@ public:
         kSmallCaps_Style   = 0x20000,
         kForceBold_Style   = 0x40000
     };
-    uint16_t fStyle;        // Font style characteristics.
+    uint32_t fStyle;        // Font style characteristics.
     int16_t fItalicAngle;   // Counterclockwise degrees from vertical of the
                             // dominant vertical stroke for an Italic face.
     // The following fields are all in font units.