diff options
author | Billy Hewlett <billyh@google.com> | 2012-06-21 09:45:15 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-21 09:45:15 -0700 |
commit | 81957ccb58db76c172e195dc3e31eba85d3e4ac9 (patch) | |
tree | 513ecd82d2a8e3430628a98164b0366ffcc1c7e2 /include/core | |
parent | 421654d4bf3ca50e2247a7389851d2e8f4812564 (diff) | |
download | external_skia-81957ccb58db76c172e195dc3e31eba85d3e4ac9.zip external_skia-81957ccb58db76c172e195dc3e31eba85d3e4ac9.tar.gz external_skia-81957ccb58db76c172e195dc3e31eba85d3e4ac9.tar.bz2 |
Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"
This reverts commit 421654d4bf3ca50e2247a7389851d2e8f4812564
Diffstat (limited to 'include/core')
-rw-r--r-- | include/core/SkFontHost.h | 9 | ||||
-rw-r--r-- | include/core/SkPaint.h | 20 | ||||
-rw-r--r-- | include/core/SkScalerContext.h | 4 |
3 files changed, 1 insertions, 32 deletions
diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h index ace08d8..25c9ecb 100644 --- a/include/core/SkFontHost.h +++ b/include/core/SkFontHost.h @@ -154,15 +154,6 @@ public: */ static SkFontID NextLogicalFont(SkFontID currFontID, SkFontID origFontID); -#ifdef SK_BUILD_FOR_ANDROID - /* - * This Android-only version of NextLogicalFont allows us to pass in an - * entire Rec structure so that a caller can change fallback behavior - */ - static SkFontID NextLogicalFont(const SkScalerContext::Rec& rec); -#endif - - /////////////////////////////////////////////////////////////////////////// /** Given a filled-out rec, the fonthost may decide to modify it to reflect diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 1715013..30ff663 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -665,25 +665,6 @@ 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. @@ -925,7 +906,6 @@ private: unsigned fHinting : 2; #ifdef SK_BUILD_FOR_ANDROID SkString fTextLocale; - FontVariant fFontVariant; #endif SkDrawCacheProc getDrawCacheProc() const; diff --git a/include/core/SkScalerContext.h b/include/core/SkScalerContext.h index 33c3c3d..9bcf601 100644 --- a/include/core/SkScalerContext.h +++ b/include/core/SkScalerContext.h @@ -210,9 +210,6 @@ public: #ifdef SK_USE_COLOR_LUMINANCE uint32_t fLumBits; #endif -#ifdef SK_BUILD_FOR_ANDROID - SkPaint::FontVariant fFontVariant; -#endif uint8_t fMaskFormat; uint8_t fStrokeJoin; uint16_t fFlags; @@ -237,6 +234,7 @@ public: SkMask::Format getFormat() const { return static_cast<SkMask::Format>(fMaskFormat); } + #ifdef SK_USE_COLOR_LUMINANCE SkColor getLuminanceColor() const { return fLumBits; |