Add SkTypeface* parameter to SkScalerContext (and its callers)

trunk/include/core/SkTypeface.h

Index: trunk/include/core/SkTypeface.h
===================================================================
--- trunk/include/core/SkTypeface.h	(revision 8166)
+++ trunk/include/core/SkTypeface.h	(working copy)
@@ -193,7 +193,10 @@
      */
     int getUnitsPerEm() const;
 
+    // Do we *have* to make these public :(
+    //
     SkStream* openStream(int* ttcIndex) const;
+    SkScalerContext* createScalerContext(const SkDescriptor* desc);

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

I agree about not making this one public, for sure. Exposing SkScalerContext and
SkDescriptor!?

 
 protected:
     /** uniqueID must be unique and non-zero
@@ -204,12 +207,13 @@
     friend class SkScalerContext;
     static SkTypeface* GetDefaultTypeface();
 
+    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0;

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

It seems implementations can return NULL, should we document that and state that
if they do they'll end up with an Empty?

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

Done.

+    virtual void onFilterRec(SkScalerContextRec*) const = 0;
+                                    
     virtual int onGetUPEM() const;
     virtual int onGetTableTags(SkFontTableTag tags[]) const;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const;
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const;
-    virtual void onFilterRec(SkScalerContextRec*) const;
     virtual void onGetFontDescriptor(SkFontDescriptor*) const;
 
 private: