remove SkFontHost::CreateScalerContext

include/core/SkFontHost.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 SkFontHost_DEFINED
@@ skipping 92 matching lines @@
 
     /** If Skia is running in a constrained environment and the typeface
      implementation is handle based, the typeface data may become
      unavailable asynchronously. If a font host or scaler context method is
      unable to access font data, it may call this function as a request to
      make the handle contained in the typeface useable.
      */
     static void EnsureTypefaceAccessible(const SkTypeface& typeface);
 
     /**
-     *  Return a subclass of SkScalarContext
-     *  DEPRECATED -- will be moved to SkTypeface
-     */
-    static SkScalerContext* CreateScalerContext(const SkDescriptor* desc);
-
-    /**
      *  DEPRECATED -- will be DESTROYED
      *
-     *  Given a "current" fontID, return the next logical fontID to use
+     *  Given a "current" fontID, return a ref to the next logical typeface
      *  when searching fonts for a given unicode value. Typically the caller
      *  will query a given font, and if a unicode value is not supported, they
      *  will call this, and if 0 is not returned, will search that font, and so
      *  on. This process must be finite, and when the fonthost sees a
-     *  font with no logical successor, it must return 0.
+     *  font with no logical successor, it must return NULL.
      *
      *  The original fontID is also provided. This is the initial font that was
      *  stored in the typeface of the caller. It is provided as an aid to choose
      *  the best next logical font. e.g. If the original font was bold or serif,
      *  but the 2nd in the logical chain was plain, then a subsequent call to
      *  get the 3rd can still inspect the original, and try to match its
      *  stylistic attributes.
      */
-    static SkFontID NextLogicalFont(SkFontID currFontID, SkFontID origFontID);
+    static SkTypeface* NextLogicalTypeface(SkFontID currFontID, SkFontID origFontID);
 
 
     ///// public HACK FOR FREETYPE -- will be fixed
 
     /** Return a new stream to read the font data, or null if the uniqueID does
      not match an existing typeface. .The caller must call stream->unref()
      when it is finished reading the data.
      */
     static SkStream* OpenStream(SkFontID uniqueID);
 
@@ skipping 71 matching lines @@
 
     /** Given a stream created by Serialize(), return a new typeface (like
         CreateTypeface) which is either an exact match to the one serialized
         or the best available typeface based on the data in the deserialized
         SkFontDescriptor.
      */
     static SkTypeface* Deserialize(SkStream*);
 
     ///////////////////////////////////////////////////////////////////////////
 
-    /** Given a filled-out rec, the fonthost may decide to modify it to reflect
-        what the host is actually capable of fulfilling. For example, if the
-        rec is requesting a level of hinting that, for this host, maps some
-        other level (e.g. kFull -> kNormal), it should update the rec to reflect
-        what will actually be done. This is an optimization so that the font
-        cache does not contain different recs (i.e. keys) that in reality map to
-        the same output.
-
-        A lazy (but valid) fonthost can do nothing in its FilterRec routine.
-
-        The provided typeface corresponds to the fFontID field.
-     */
-    static void FilterRec(SkScalerContextRec* rec, SkTypeface* typeface);
-
-    ///////////////////////////////////////////////////////////////////////////
-
     /** Retrieve detailed typeface metrics.  Used by the PDF backend.
         @param perGlyphInfo Indicate what glyph specific information (advances,
                             names, etc.) should be populated.
         @return The returned object has already been referenced.  NULL is
                 returned if the font is not found.
         @param glyphIDs  For per-glyph info, specify subset of the font by
                          giving glyph ids.  Each integer represents a glyph
                          id.  Passing NULL means all glyphs in the font.
         @param glyphIDsCount Number of elements in subsetGlyphIds. Ignored if
                              glyphIDs is NULL.
@@ skipping 40 matching lines @@
      */
     static size_t GetTableData(SkFontID fontID, SkFontTableTag tag,
                                size_t offset, size_t length, void* data);
 
     ///////////////////////////////////////////////////////////////////////////
 
     friend class SkTypeface;
 };
 
 #endif