Remove SkScalerContext::getGlyphCount.

Ben Wagner · Skia Commit-Bot · commit ba158b9daf08 · 2020-12-16T22:24:53.000Z
Also remove the supporting SkScalerContext::generateGlyphCount. It was once a possibility that different strikes could have a different number of glyphs available. This generally does not happen, but if it did this would now be handled at the typeface level. Change-Id: I8db7f2726c565447c211a79fe3cdfec619a99a81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345129 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
@@ -328,7 +328,6 @@ class RemoteStrike final : public SkStrikeForGPU {
     void writeGlyphPath(const SkGlyph& glyph, Serializer* serializer) const;
     void ensureScalerContext();
 
-    const int fNumberOfGlyphs;
     const SkAutoDescriptor fDescriptor;
     const SkDiscardableHandleId fDiscardableHandleId;
 
@@ -364,8 +363,7 @@ RemoteStrike::RemoteStrike(
         const SkDescriptor& descriptor,
         std::unique_ptr<SkScalerContext> context,
         uint32_t discardableHandleId)
-        : fNumberOfGlyphs(context->getGlyphCount())
-        , fDescriptor{descriptor}
+        : fDescriptor{descriptor}
         , fDiscardableHandleId(discardableHandleId)
         , fRoundingSpec{context->isSubpixel(), context->computeAxisAlignmentForHText()}
         // N.B. context must come last because it is used above.
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
@@ -1163,9 +1163,6 @@ SkScalerContext* SkScalerContext::MakeEmptyContext(
                 : SkScalerContext(std::move(typeface), effects, desc) {}
 
     protected:
-        unsigned generateGlyphCount() override {
-            return 0;
-        }
         bool generateAdvance(SkGlyph* glyph) override {
             glyph->zeroMetrics();
             return true;
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
@@ -284,7 +284,6 @@ class SkScalerContext {
     // DEPRECATED
     bool isVertical() const { return false; }
 
-    unsigned    getGlyphCount() { return this->generateGlyphCount(); }
     SkGlyph     makeGlyph(SkPackedGlyphID);
     void        getImage(const SkGlyph&);
     bool SK_WARN_UNUSED_RESULT getPath(SkPackedGlyphID, SkPath*);
@@ -396,9 +395,6 @@ class SkScalerContext {
     /** Retrieves font metrics. */
     virtual void generateFontMetrics(SkFontMetrics*) = 0;
 
-    /** Returns the number of glyphs in the font. */
-    virtual unsigned generateGlyphCount() = 0;
-
     void forceGenerateImageFromPath() { fGenerateImageFromPath = true; }
     void forceOffGenerateImageFromPath() { fGenerateImageFromPath = false; }
 
diff --git a/src/core/SkTypeface_remote.cpp b/src/core/SkTypeface_remote.cpp
@@ -19,10 +19,6 @@ SkScalerContextProxy::SkScalerContextProxy(sk_sp<SkTypeface> tf,
         : SkScalerContext{std::move(tf), effects, desc}
         , fDiscardableManager{std::move(manager)} {}
 
-unsigned SkScalerContextProxy::generateGlyphCount()  {
-    SK_ABORT("Should never be called.");
-}
-
 bool SkScalerContextProxy::generateAdvance(SkGlyph* glyph) {
     return false;
 }
diff --git a/src/core/SkTypeface_remote.h b/src/core/SkTypeface_remote.h
@@ -28,7 +28,6 @@ class SkScalerContextProxy : public SkScalerContext {
                          sk_sp<SkStrikeClient::DiscardableHandleManager> manager);
 
 protected:
-    unsigned generateGlyphCount() override;
     bool generateAdvance(SkGlyph* glyph) override;
     void generateMetrics(SkGlyph* glyph) override;
     void generateImage(const SkGlyph& glyph) override;
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
@@ -535,7 +535,6 @@ class SkScalerContext_FreeType : public SkScalerContext_FreeType_Base {
     }
 
 protected:
-    unsigned generateGlyphCount() override;
     bool generateAdvance(SkGlyph* glyph) override;
     void generateMetrics(SkGlyph* glyph) override;
     void generateImage(const SkGlyph& glyph) override;
@@ -1097,10 +1096,6 @@ FT_Error SkScalerContext_FreeType::setupSize() {
     return 0;
 }
 
-unsigned SkScalerContext_FreeType::generateGlyphCount() {
-    return fFace->num_glyphs;
-}
-
 bool SkScalerContext_FreeType::generateAdvance(SkGlyph* glyph) {
    /* unhinted and light hinted text have linearly scaled advances
     * which are very cheap to compute with some font formats...
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
@@ -563,7 +563,6 @@ class SkScalerContext_GDI : public SkScalerContext {
     bool isValid() const;
 
 protected:
-    unsigned generateGlyphCount() override;
     bool generateAdvance(SkGlyph* glyph) override;
     void generateMetrics(SkGlyph* glyph) override;
     void generateImage(const SkGlyph& glyph) override;
@@ -594,7 +593,6 @@ class SkScalerContext_GDI : public SkScalerContext {
     HFONT        fSavefont;
     HFONT        fFont;
     SCRIPT_CACHE fSC;
-    int          fGlyphCount;
 
     /** The total matrix which also removes EM scale. */
     SkMatrix     fHiResMatrix;
@@ -639,7 +637,6 @@ SkScalerContext_GDI::SkScalerContext_GDI(sk_sp<LogFontTypeface> rawTypeface,
         , fSavefont(0)
         , fFont(0)
         , fSC(0)
-        , fGlyphCount(-1)
 {
     LogFontTypeface* typeface = static_cast<LogFontTypeface*>(this->getTypeface());
 
@@ -800,14 +797,6 @@ bool SkScalerContext_GDI::isValid() const {
     return fDDC && fFont;
 }
 
-unsigned SkScalerContext_GDI::generateGlyphCount() {
-    if (fGlyphCount < 0) {
-        fGlyphCount = calculateGlyphCount(
-                          fDDC, static_cast<const LogFontTypeface*>(this->getTypeface())->fLogFont);
-    }
-    return fGlyphCount;
-}
-
 bool SkScalerContext_GDI::generateAdvance(SkGlyph* glyph) {
     return false;
 }
diff --git a/src/ports/SkScalerContext_mac_ct.cpp b/src/ports/SkScalerContext_mac_ct.cpp
@@ -122,9 +122,6 @@ SkScalerContext_Mac::SkScalerContext_Mac(sk_sp<SkTypeface_Mac> typeface,
 
 {
     CTFontRef ctFont = (CTFontRef)this->getTypeface()->internal_private_getCTFontRef();
-    CFIndex numGlyphs = CTFontGetGlyphCount(ctFont);
-    SkASSERT(numGlyphs >= 1 && numGlyphs <= 0xFFFF);
-    fGlyphCount = SkToU16(numGlyphs);
 
     // CT on (at least) 10.9 will size color glyphs down from the requested size, but not up.
     // As a result, it is necessary to know the actual device size and request that.
@@ -268,10 +265,6 @@ CGRGBPixel* SkScalerContext_Mac::Offscreen::getCG(const SkScalerContext_Mac& con
     return image;
 }
 
-unsigned SkScalerContext_Mac::generateGlyphCount(void) {
-    return fGlyphCount;
-}
-
 bool SkScalerContext_Mac::generateAdvance(SkGlyph* glyph) {
     return false;
 }
diff --git a/src/ports/SkScalerContext_mac_ct.h b/src/ports/SkScalerContext_mac_ct.h
@@ -44,7 +44,6 @@ class SkScalerContext_Mac : public SkScalerContext {
     SkScalerContext_Mac(sk_sp<SkTypeface_Mac>, const SkScalerContextEffects&, const SkDescriptor*);
 
 protected:
-    unsigned generateGlyphCount(void) override;
     bool generateAdvance(SkGlyph* glyph) override;
     void generateMetrics(SkGlyph* glyph) override;
     void generateImage(const SkGlyph& glyph) override;
@@ -106,7 +105,6 @@ class SkScalerContext_Mac : public SkScalerContext {
     CGAffineTransform fInvTransform;
 
     SkUniqueCFRef<CGFontRef> fCGFont;
-    uint16_t fGlyphCount;
     const bool fDoSubPosition;
 
     friend class Offscreen;
diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp
@@ -382,10 +382,6 @@ SkScalerContext_DW::SkScalerContext_DW(sk_sp<DWriteFontTypeface> typefaceRef,
 SkScalerContext_DW::~SkScalerContext_DW() {
 }
 
-unsigned SkScalerContext_DW::generateGlyphCount() {
-    return fGlyphCount;
-}
-
 bool SkScalerContext_DW::generateAdvance(SkGlyph* glyph) {
     glyph->fAdvanceX = 0;
     glyph->fAdvanceY = 0;
diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h
@@ -27,7 +27,6 @@ class SkScalerContext_DW : public SkScalerContext {
     ~SkScalerContext_DW() override;
 
 protected:
-    unsigned generateGlyphCount() override;
     bool generateAdvance(SkGlyph* glyph) override;
     void generateMetrics(SkGlyph* glyph) override;
     void generateImage(const SkGlyph& glyph) override;
diff --git a/src/utils/SkCustomTypeface.cpp b/src/utils/SkCustomTypeface.cpp
@@ -201,10 +201,6 @@ class SkUserScalerContext : public SkScalerContext {
     }
 
 protected:
-    unsigned generateGlyphCount() override {
-        return this->userTF()->glyphCount();
-    }
-
     bool generateAdvance(SkGlyph* glyph) override {
         const SkUserTypeface* tf = this->userTF();
         auto advance = fMatrix.mapXY(tf->fAdvances[glyph->getGlyphID()], 0);
diff --git a/tools/fonts/RandomScalerContext.cpp b/tools/fonts/RandomScalerContext.cpp
@@ -23,7 +23,6 @@ class RandomScalerContext : public SkScalerContext {
                         bool fFakeIt);
 
 protected:
-    unsigned generateGlyphCount() override;
     bool     generateAdvance(SkGlyph*) override;
     void     generateMetrics(SkGlyph*) override;
     void     generateImage(const SkGlyph&) override;
@@ -48,8 +47,6 @@ RandomScalerContext::RandomScalerContext(sk_sp<SkRandomTypeface>       face,
     fProxy->forceGenerateImageFromPath();
 }
 
-unsigned RandomScalerContext::generateGlyphCount() { return fProxy->getGlyphCount(); }
-
 bool RandomScalerContext::generateAdvance(SkGlyph* glyph) { return fProxy->generateAdvance(glyph); }
 
 void RandomScalerContext::generateMetrics(SkGlyph* glyph) {
diff --git a/tools/fonts/TestSVGTypeface.cpp b/tools/fonts/TestSVGTypeface.cpp
@@ -183,8 +183,6 @@ class SkTestSVGScalerContext : public SkScalerContext {
         return static_cast<TestSVGTypeface*>(this->getTypeface());
     }
 
-    unsigned generateGlyphCount() override { return this->getTestSVGTypeface()->countGlyphs(); }
-
     bool generateAdvance(SkGlyph* glyph) override {
         this->getTestSVGTypeface()->getAdvance(glyph);
 
diff --git a/tools/fonts/TestTypeface.cpp b/tools/fonts/TestTypeface.cpp
@@ -160,8 +160,6 @@ class SkTestScalerContext : public SkScalerContext {
         return static_cast<TestTypeface*>(this->getTypeface());
     }
 
-    unsigned generateGlyphCount() override { return this->getTestTypeface()->onCountGlyphs(); }
-
     bool generateAdvance(SkGlyph* glyph) override {
         this->getTestTypeface()->getAdvance(glyph);
 

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,6 @@ SkScalerContext_Mac::SkScalerContext_Mac(sk_sp<SkTypeface_Mac> typeface,`
`122`	`122`
`123`	`123`	`{`
`124`	`124`	`CTFontRef ctFont = (CTFontRef)this->getTypeface()->internal_private_getCTFontRef();`
`125`		`- CFIndex numGlyphs = CTFontGetGlyphCount(ctFont);`
`126`		`- SkASSERT(numGlyphs >= 1 && numGlyphs <= 0xFFFF);`
`127`		`- fGlyphCount = SkToU16(numGlyphs);`
`128`	`125`
`129`	`126`	`// CT on (at least) 10.9 will size color glyphs down from the requested size, but not up.`
`130`	`127`	`// As a result, it is necessary to know the actual device size and request that.`
`@@ -268,10 +265,6 @@ CGRGBPixel* SkScalerContext_Mac::Offscreen::getCG(const SkScalerContext_Mac& con`
`268`	`265`	`return image;`
`269`	`266`	`}`
`270`	`267`
`271`		`-unsigned SkScalerContext_Mac::generateGlyphCount(void) {`
`272`		`- return fGlyphCount;`
`273`		`-}`
`274`		`-`
`275`	`268`	`bool SkScalerContext_Mac::generateAdvance(SkGlyph* glyph) {`
`276`	`269`	`return false;`
`277`	`270`	`}`