PDF: Now threadsafe!

src/pdf/SkPDFFontImpl.h

Index: src/pdf/SkPDFFontImpl.h
diff --git a/src/pdf/SkPDFFontImpl.h b/src/pdf/SkPDFFontImpl.h
index eaec8f90028d741ae98150d424b430441ea2e38f..255682235e4001feacfcf2b7e9e38a3951966396 100644
--- a/src/pdf/SkPDFFontImpl.h
+++ b/src/pdf/SkPDFFontImpl.h
@@ -28,7 +28,9 @@ private:
     typedef SkPDFDict INHERITED;
 #endif
 
-    SkPDFType0Font(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface);
+    SkPDFType0Font(SkPDFCanon* canon,
+                   const SkAdvancedTypefaceMetrics* info,
+                   SkTypeface* typeface);
 
     bool populate(const SkPDFGlyphSet* subset);
 };
@@ -41,7 +43,9 @@ public:
 private:
     friend class SkPDFType0Font;  // to access the constructor
 
-    SkPDFCIDFont(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface,
+    SkPDFCIDFont(SkPDFCanon* canon,
+                 const SkAdvancedTypefaceMetrics* info,
+                 SkTypeface* typeface,
                  const SkPDFGlyphSet* subset);
 
     bool populate(const SkPDFGlyphSet* subset);
@@ -57,8 +61,11 @@ public:
 private:
     friend class SkPDFFont;  // to access the constructor
 
-    SkPDFType1Font(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface,
-                   uint16_t glyphID, SkPDFDict* relatedFontDescriptor);
+    SkPDFType1Font(SkPDFCanon* canon,
+                   const SkAdvancedTypefaceMetrics* info,
+                   SkTypeface* typeface,
+                   uint16_t glyphID,
+                   SkPDFDict* relatedFontDescriptor);
 
     bool populate(int16_t glyphID);
     bool addFontDescriptor(int16_t defaultWidth);
@@ -74,8 +81,10 @@ public:
 private:
     friend class SkPDFFont;  // to access the constructor
 
-    SkPDFType3Font(const SkAdvancedTypefaceMetrics* info,
-                   SkTypeface* typeface, uint16_t glyphID);
+    SkPDFType3Font(SkPDFCanon* canon,
+                   const SkAdvancedTypefaceMetrics* info,
+                   SkTypeface* typeface,
+                   uint16_t glyphID);
 
     bool populate(uint16_t glyphID);
 };