[PDF] Fix font embedding restrictions.

include/core/SkAdvancedTypefaceMetrics.h

Index: include/core/SkAdvancedTypefaceMetrics.h
diff --git a/include/core/SkAdvancedTypefaceMetrics.h b/include/core/SkAdvancedTypefaceMetrics.h
index e75365ba31ca013b6b52e1e5250c157eb950a4af..f457c0c8437a5a25df4e7dbd7b3592889a1c1f18 100755
--- a/include/core/SkAdvancedTypefaceMetrics.h
+++ b/include/core/SkAdvancedTypefaceMetrics.h
@@ -35,15 +35,21 @@ public:
         kCFF_Font,
         kTrueType_Font,
         kOther_Font,
-        kNotEmbeddable_Font
     };
     // The type of the underlying font program.  This field determines which
-    // of the following fields are valid.  If it is kOther_Font or
-    // kNotEmbeddable_Font, the per glyph information will never be populated.
+    // of the following fields are valid.  If it is kOther_Font the per glyph
+    // information will never be populated.
     FontType fType;
 
-    // fMultiMaster may be true for Type1_Font or CFF_Font.
-    bool fMultiMaster;
+    enum FontFlags {
+        kEmpty_Flag          = 0x0,  //!<No flags set

[reed1, 2013/12/06 14:22:10]

General skia convention is for the suffix to match (modulo plurals sometimes)
the enum name.

e.g.

kMultiMaster_FontFlag

[vandebo (ex-Chrome), 2013/12/09 17:56:06]

Done.

+        kMultiMaster_Flag    = 0x1,  //!<May be true for Type1_Font or CFF_Font.
+        kNotEmbeddable_Flag  = 0x2,  //!<May not be embedded.
+        kNotSubsettable_Flag = 0x4,  //!<May not be subset.
+    };
+    // Global font flags.
+    FontFlags fFlags;
+
     uint16_t fLastGlyphID; // The last valid glyph ID in the font.
     uint16_t fEmSize;  // The size of the em box (defines font units).