Use traits instead of table for color glyph detection.

src/ports/SkFontHost_mac.cpp

 
 /*
  * Copyright 2006 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.
  */
 
 #ifdef SK_BUILD_FOR_MAC
 #import <ApplicationServices/ApplicationServices.h>
@@ skipping 426 matching lines @@
 #define WEIGHT_THRESHOLD    ((SkFontStyle::kNormal_Weight + SkFontStyle::kBold_Weight)/2)
 
 class SkTypeface_Mac : public SkTypeface {
 public:
     SkTypeface_Mac(const SkFontStyle& fs, SkFontID fontID, bool isFixedPitch,
                    CTFontRef fontRef, const char requestedName[], bool isLocalStream)
         : SkTypeface(fs, fontID, isFixedPitch)
         , fRequestedName(requestedName)
         , fFontRef(fontRef) // caller has already called CFRetain for us
         , fIsLocalStream(isLocalStream)
-        , fHasSbixTable(false)
+        , fHasColorGlyphs(CTFontGetSymbolicTraits(fFontRef) & kCTFontColorGlyphsTrait)
     {
         SkASSERT(fontRef);
-
-        AutoCFRelease<CFArrayRef> tags(CTFontCopyAvailableTables(fFontRef,kCTFontTableOptionNoOptions));
-        if (tags) {
-            int count = SkToInt(CFArrayGetCount(tags));
-            for (int i = 0; i < count; ++i) {
-                uintptr_t tag = reinterpret_cast<uintptr_t>(CFArrayGetValueAtIndex(tags, i));
-                if ('sbix' == tag) {
-                    fHasSbixTable = true;
-                    break;
-                }
-            }
-        }
     }
 
     SkString fRequestedName;
     AutoCFRelease<CTFontRef> fFontRef;
 
 protected:
     int onGetUPEM() const SK_OVERRIDE;
     SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
     void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;
     SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
     int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const SK_OVERRIDE;
     SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
     void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
     void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
                                 SkAdvancedTypefaceMetrics::PerGlyphInfo,
                                 const uint32_t*, uint32_t) const SK_OVERRIDE;
     virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[],
                                 int glyphCount) const SK_OVERRIDE;
     int onCountGlyphs() const SK_OVERRIDE;
 
 private:
     bool fIsLocalStream;
-    bool fHasSbixTable;
+    bool fHasColorGlyphs;
 
     typedef SkTypeface INHERITED;
 };
 
 static SkTypeface* NewFromFontRef(CTFontRef fontRef, const char name[], bool isLocalStream) {
     SkASSERT(fontRef);
     bool isFixedPitch;
     SkFontStyle style = SkFontStyle(computeStyleBits(fontRef, &isFixedPitch));
     SkFontID fontID = CTFontRef_to_SkFontID(fontRef);
 
@@ skipping 1392 matching lines @@
             rec->fMaskFormat = SkMask::kLCD16_Format;
             rec->setHinting(SkPaint::kNormal_Hinting);
         } else {
             rec->fMaskFormat = SkMask::kA8_Format;
         }
     }
 
     // CoreText provides no information as to whether a glyph will be color or not.
     // Fonts may mix outlines and bitmaps, so information is needed on a glyph by glyph basis.
     // If a font contains an 'sbix' table, consider it to be a color font, and disable lcd.
-    if (fHasSbixTable) {
+    if (fHasColorGlyphs) {
         rec->fMaskFormat = SkMask::kARGB32_Format;
     }
 
     // Unhinted A8 masks (those not derived from LCD masks) must respect SK_GAMMA_APPLY_TO_A8.
     // All other masks can use regular gamma.
     if (SkMask::kA8_Format == rec->fMaskFormat && SkPaint::kNo_Hinting == hinting) {
 #ifndef SK_GAMMA_APPLY_TO_A8
         rec->ignorePreBlend();
 #endif
     } else {
@@ skipping 373 matching lines @@
         }
         return face;
     }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkNEW(SkFontMgr_Mac);
 }