Revert "[PDF] Fix font embedding restrictions."

include/pdf/SkPDFDocument.h

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFDocument_DEFINED
@@ skipping 51 matching lines @@
     SK_API bool setPage(int pageNumber, SkPDFDevice* pdfDevice);
 
     /** Append the passed pdf device to the document as a new page.  Returns
      *  true if successful.  Will fail if the document has already been emitted.
      *
      *  @param pdfDevice The page to add to this document.
      */
     SK_API bool appendPage(SkPDFDevice* pdfDevice);
 
     /** Get the count of unique font types used in the document.
-     * DEPRECATED.
-     */
-    SK_API void getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 2]) const;
-
-    /** Get the count of unique font types used in the document.
      */
     SK_API void getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 1],
-        int* notSubsettableCount,
-        int* notEmbedddableCount) const;
+        int counts[SkAdvancedTypefaceMetrics::kNotEmbeddable_Font + 1]) const;
 
 private:
     SkAutoTDelete<SkPDFCatalog> fCatalog;
     int64_t fXRefFileOffset;
 
     SkTDArray<SkPDFPage*> fPages;
     SkTDArray<SkPDFDict*> fPageTree;
     SkPDFDict* fDocCatalog;
     SkTSet<SkPDFObject*>* fFirstPageResources;
     SkTSet<SkPDFObject*>* fOtherPageResources;
@@ skipping 11 matching lines @@
     size_t headerSize();
 
     /** Output the PDF footer to the passed stream.
      *  @param stream    The writable output stream to send the footer to.
      *  @param objCount  The number of objects in the PDF.
      */
     void emitFooter(SkWStream* stream, int64_t objCount);
 };
 
 #endif