Add SkTypeface* parameter to SkScalerContext (and its callers)

trunk/include/core/SkFontHost.h

Index: trunk/include/core/SkFontHost.h
===================================================================
--- trunk/include/core/SkFontHost.h	(revision 8166)
+++ trunk/include/core/SkFontHost.h	(working copy)
@@ -110,12 +110,6 @@
     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
@@ -132,7 +126,7 @@
      *  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);

[bungeman-skia, 2013/03/15 16:12:44]

I know this is going away, but it seems like we should document that this
returns a ref, it isn't obvious from the name.

[reed1, 2013/03/15 17:46:44]

Done.

 
     
     ///// public HACK FOR FREETYPE -- will be fixed
@@ -224,22 +218,6 @@
 
     ///////////////////////////////////////////////////////////////////////////
 
-    /** 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.