Add SkTypeface* parameter to SkScalerContext (and its callers)

trunk/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 176 matching lines @@
     size_t getTableData(SkFontTableTag tag, size_t offset, size_t length,
                         void* data) const;
 
     /**
      *  Return the units-per-em value for this typeface, or zero if there is an
      *  error.
      */
     int getUnitsPerEm() const;
 
     SkStream* openStream(int* ttcIndex) const;
+    SkScalerContext* createScalerContext(const SkDescriptor*) const;
 
 protected:
     /** uniqueID must be unique and non-zero
     */
     SkTypeface(Style style, SkFontID uniqueID, bool isFixedWidth = false);
     virtual ~SkTypeface();
 
     friend class SkScalerContext;
     static SkTypeface* GetDefaultTypeface();
 
     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:
     SkFontID    fUniqueID;
     Style       fStyle;
     bool        fIsFixedWidth;
 
     friend class SkPaint;
+    friend class SkGlyphCache;  // GetDefaultTypeface
     // just so deprecated fonthost can call protected methods
     friend class SkFontHost;
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif