1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index a4f2ea681e..fba3e1e20d 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -12,11 +12,7 @@
 #include "SkMaskGamma.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
-
-#ifdef SK_BUILD_FOR_ANDROID
-    //For SkFontID
-    #include "SkTypeface.h"
-#endif
+#include "SkTypeface.h"
 
 struct SkGlyph;
 class SkDescriptor;
@@ -149,9 +145,11 @@ public:
     };
 
 
-    SkScalerContext(const SkDescriptor* desc);
+    SkScalerContext(SkTypeface*, const SkDescriptor*);
     virtual ~SkScalerContext();
 
+    SkTypeface* getTypeface() const { return fTypeface.get(); }
+
     SkMask::Format getMaskFormat() const {
         return (SkMask::Format)fRec.fMaskFormat;
     }
@@ -217,6 +215,10 @@ protected:
     void forceGenerateImageFromPath() { fGenerateImageFromPath = true; }
 
 private:
+    // never null
+    SkAutoTUnref<SkTypeface> fTypeface;
+    
+    // optional object, which may be null
     SkPathEffect*   fPathEffect;
     SkMaskFilter*   fMaskFilter;
     SkRasterizer*   fRasterizer;