SkPDF: in-place font subsetting

src/pdf/SkPDFDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFDevice.h"
 #include "SkAnnotationKeys.h"
 #include "SkBitmapDevice.h"
@@ skipping 1135 matching lines @@
         SkDebugf("SkPDF: Font error.");
         out->writeText("ET\n%SkPDF: Font error.\n");
         return;
     }
     SkPDFFont* font = content.entry()->fState.fFont;
     GlyphPositioner glyphPositioner(out,
                                     paint.getTextSkewX(),
                                     font->multiByteGlyphs(),
                                     defaultPositioning,
                                     offset);
-    SkPDFGlyphSetMap* fontGlyphUsage = fDocument->getGlyphUsage();
     const SkGlyphID* const glyphsEnd = glyphs + glyphCount;
 
     while (glyphs < glyphsEnd) {
         font = content.entry()->fState.fFont;
         int stretch = font->multiByteGlyphs()
             ? SkToInt(glyphsEnd - glyphs)
             : font->glyphsToPDFFontEncodingCount(glyphs, SkToInt(glyphsEnd - glyphs));
         SkASSERT(glyphs + stretch <= glyphsEnd);
         if (stretch < 1) {
             SkASSERT(!font->multiByteGlyphs());
@@ skipping 10 matching lines @@
             // try again
             stretch = font->glyphsToPDFFontEncodingCount(glyphs,
                                                          SkToInt(glyphsEnd - glyphs));
             if (stretch < 1) {
                 SkDEBUGFAIL("PDF could not encode glyph.");
                 glyphPositioner.flush();
                 out->writeText("ET\n%SkPDF: Font encoding error.\n");
                 return;
             }
         }
-        fontGlyphUsage->noteGlyphUsage(font, glyphs, stretch);
+        font->noteGlyphUsage(glyphs, stretch);
         if (defaultPositioning) {
             (void)font->glyphsToPDFFontEncoding(glyphs, SkToInt(glyphsEnd - glyphs));
             while (stretch-- > 0) {
                 glyphPositioner.writeGlyph(0, 0, 0, *glyphs);
                 ++glyphs;
             }
         } else {
             while (stretch-- > 0) {
                 SkScalar advance = glyphCache->getGlyphIDAdvance(*glyphs).fAdvanceX;
                 SkScalar x = *pos++;
@@ skipping 113 matching lines @@
     for (SkPDFFont* font : fFontResources) {
         fonts.push(font);
     }
     return SkPDFResourceDict::Make(
             &fGraphicStateResources,
             &fShaderResources,
             &fXObjectResources,
             &fonts);
 }
 
-const SkTDArray<SkPDFFont*>& SkPDFDevice::getFontResources() const {
-    return fFontResources;
-}
-
 sk_sp<SkPDFArray> SkPDFDevice::copyMediaBox() const {
     auto mediaBox = sk_make_sp<SkPDFArray>();
     mediaBox->reserve(4);
     mediaBox->appendInt(0);
     mediaBox->appendInt(0);
     mediaBox->appendInt(fPageSize.width());
     mediaBox->appendInt(fPageSize.height());
     return mediaBox;
 }
 
@@ skipping 606 matching lines @@
 }
 
 int SkPDFDevice::getFontResourceIndex(SkTypeface* typeface, uint16_t glyphID) {
     sk_sp<SkPDFFont> newFont(
             SkPDFFont::GetFontResource(fDocument->canon(), typeface, glyphID));
     if (!newFont) {
         return -1;
     }
     int resourceIndex = fFontResources.find(newFont.get());
     if (resourceIndex < 0) {
+        fDocument->registerFont(newFont.get());
         resourceIndex = fFontResources.count();
-        fFontResources.push(newFont.get());
-        newFont.get()->ref();
+        fFontResources.push(newFont.release());
     }
     return resourceIndex;
 }
 
 static SkSize rect_to_size(const SkRect& r) {
     return SkSize::Make(r.width(), r.height());
 }
 
 static sk_sp<SkImage> color_filter(const SkImageBitmap& imageBitmap,
                                    SkColorFilter* colorFilter) {
@@ skipping 196 matching lines @@
 }
 
 sk_sp<SkSpecialImage> SkPDFDevice::makeSpecial(const SkImage* image) {
     return SkSpecialImage::MakeFromImage(SkIRect::MakeWH(image->width(), image->height()),
                                          image->makeNonTextureImage());
 }
 
 sk_sp<SkSpecialImage> SkPDFDevice::snapSpecial() {
     return nullptr;
 }