Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""

This reverts commit 81957ccb58db76c172e195dc3e31eba85d3e4ac9

1 files changed, 20 insertions, 0 deletions

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 30ff663..1715013 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -665,6 +665,25 @@ public:
         @param locale set the paint's locale value for drawing text.
     */
     void    setTextLocale(const SkString& locale);
+
+
+    enum FontVariant {
+       kDefault_Variant, // Currently setting yourself to Default gives you Compact Variant
+       kCompact_Variant,
+       kElegant_Variant,
+       kLast_Variant = kElegant_Variant,
+    };
+
+    /** Return the font variant
+        @return the font variant used by this paint object
+    */
+    FontVariant getFontVariant() const { return fFontVariant; }
+
+
+    /** Set the font variant
+      @param fontVariant set the paint's font variant for choosing fonts
+    */
+    void setFontVariant(FontVariant fontVariant);
 #endif
 
     /** Return the paint's text size.
@@ -906,6 +925,7 @@ private:
     unsigned        fHinting : 2;
 #ifdef SK_BUILD_FOR_ANDROID
     SkString        fTextLocale;
+    FontVariant     fFontVariant;
 #endif
 
     SkDrawCacheProc    getDrawCacheProc() const;