Remove SK_FONTHOST_USES_FONTMGR.

include/core/SkTypeface.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkTypeface_DEFINED
@@ skipping 263 matching lines @@
 
     /**
      *  Return a stream for the contents of the font data, or NULL on failure.
      *  If ttcIndex is not null, it is set to the TrueTypeCollection index
      *  of this typeface within the stream, or 0 if the stream is not a
      *  collection.
      */
     SkStream* openStream(int* ttcIndex) const;
 
     /**
-     *  Search within this typeface's family for a best match to the
-     *  specified style, and return a ref to that typeface. Note: the
-     *  returned object could be this, if it is the best match, or it
-     *  could be a different typeface. Either way, the caller must balance
-     *  this call with unref() on the returned object.
-     *
-     *  Will never return NULL.
-     */
-    SkTypeface* refMatchingStyle(Style) const;

[bungeman-skia, 2013/11/08 20:55:55]

This is what I was discussing with you previously, that this should be removed
as it is the only place where the typeface should have a back pointer to whence
it came (which it may not even have). This was introduced just for FontHost,
which was the only user. This CL changes FontHost to just use the equivalent
method on the default FontMgr. 

-
-    /**
      *  Return a scalercontext for the given descriptor. If this fails, then
      *  if allowFailure is true, this returns NULL, else it returns a
      *  dummy scalercontext that will not crash, but will draw nothing.
      */
     SkScalerContext* createScalerContext(const SkDescriptor*,
                                          bool allowFailure = false) const;
 
     // PRIVATE / EXPERIMENTAL -- do not call
     void filterRec(SkScalerContextRec* rec) const {
         this->onFilterRec(rec);
@@ skipping 32 matching lines @@
     virtual int onGetUPEM() const = 0;
     virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
                                              int32_t adjustments[]) const;
 
     virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0;
 
     virtual int onGetTableTags(SkFontTableTag tags[]) const = 0;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const = 0;
 
-    virtual SkTypeface* onRefMatchingStyle(Style styleBits) const = 0;
-
 private:
     SkFontID    fUniqueID;
     Style       fStyle;
     bool        fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
     // just so deprecated fonthost can call protected methods
     friend class SkFontHost;
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif