commit 688afddfc5afa5b23f58f1e513c52f2f796f6622
author Hal Canary <halcanary@google.com> Wed Oct 17 14:57:53 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 17 21:24:54 2018 +0000
tree bd41af92f1a01f9e839be664bb2fc7f5c7ae2b67
parent 976a6b037340578fcdd5466cf09f1113ad826115

SkPDF: be smarter about checking to see if a new font is needed.

Change-Id: Iad58fccf475649246a4fc9e2dc933b9a73b786d6
Reviewed-on: https://skia-review.googlesource.com/c/163240
Commit-Queue: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/pdf/SkPDFDevice.cpp

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 052bab2..e3e5aaa 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -1069,6 +1069,24 @@
     }
 }
 
+static bool needs_new_font(SkPDFFont* font, SkGlyphID gid, SkGlyphCache* cache,
+                           SkAdvancedTypefaceMetrics::FontType fontType) {
+    if (!font || !font->hasGlyph(gid)) {
+        return true;
+    }
+    if (fontType == SkAdvancedTypefaceMetrics::kOther_Font) {
+        return false;
+    }
+    const SkGlyph& glyph = cache->getGlyphIDMetrics(gid);
+    if (glyph.isEmpty()) {
+        return false;
+    }
+
+    bool bitmapOnly = nullptr == cache->findPath(glyph);
+    bool convertedToType3 = (font->getType() == SkAdvancedTypefaceMetrics::kOther_Font);
+    return convertedToType3 != bitmapOnly;
+}
+
 void SkPDFDevice::internalDrawGlyphRun(const SkGlyphRun& glyphRun, SkPoint offset) {
 
     const SkGlyphID* glyphs = glyphRun.shuntGlyphsIDs().data();
@@ -1105,6 +1123,8 @@
     if (!metrics) {
         return;
     }
+    SkAdvancedTypefaceMetrics::FontType fontType = SkPDFFont::FontType(*metrics);
+
     const std::vector<SkUnichar>& glyphToUnicode = SkPDFFont::GetUnicodeMap(
         typeface, fDocument->canon());
 
@@ -1197,7 +1217,21 @@
                 if (gid > maxGlyphID) {
                     continue;
                 }
-                if (!font || !font->hasGlyph(gid)) {
+                SkPoint xy = glyphRun.positions()[index];
+                // Do a glyph-by-glyph bounds-reject if positions are absolute.
+                SkRect glyphBounds = get_glyph_bounds_device_space(
+                        gid, glyphCache.get(), textScaleX, textScaleY,
+                        xy + offset, this->ctm());
+                if (glyphBounds.isEmpty()) {
+                    if (!contains(clipStackBounds, {glyphBounds.x(), glyphBounds.y()})) {
+                        continue;
+                    }
+                } else {
+                    if (!clipStackBounds.intersects(glyphBounds)) {
+                        continue;  // reject glyphs as out of bounds
+                    }
+                }
+                if (needs_new_font(font, gid, glyphCache.get(), fontType)) {
                     // Not yet specified font or need to switch font.
                     sk_sp<SkPDFFont> newFont =
                             SkPDFFont::GetFontResource(
@@ -1218,22 +1252,7 @@
                     out->writeText(" Tf\n");
 
                 }
-                SkPoint xy = glyphRun.positions()[index];
-                // Do a glyph-by-glyph bounds-reject if positions are absolute.
-                SkRect glyphBounds = get_glyph_bounds_device_space(
-                        gid, glyphCache.get(), textScaleX, textScaleY,
-                        xy + offset, this->ctm());
-                if (glyphBounds.isEmpty()) {
-                    if (!contains(clipStackBounds, {glyphBounds.x(), glyphBounds.y()})) {
-                        continue;
-                    }
-                } else {
-                    if (!clipStackBounds.intersects(glyphBounds)) {
-                        continue;  // reject glyphs as out of bounds
-                    }
-                }
                 font->noteGlyphUsage(gid);
-
                 SkGlyphID encodedGlyph = font->multiByteGlyphs()
                                        ? gid : font->glyphToPDFFontEncoding(gid);
                 SkScalar advance = advanceScale * glyphCache->getGlyphIDAdvance(gid).fAdvanceX;