diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 19:49:27 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 19:49:27 +0000 |
| commit | 98000efa59ef82eaee8df04e4dd0c328439719a7 (patch) | |
| tree | 70224b92568211b254d6bd66dfb29f142c8477fd /include/ports/SkTypeface_android.h | |
| parent | 7af78e0d6ae874877a729a27e3f8008719b4d1c2 (diff) | |
Android now uses Harfbuzz-NG. No need to keep code specific to the old version of Harfbuzz around!
R=scroggo@google.com, reed@google.com, bungeman@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/107663012
git-svn-id: http://skia.googlecode.com/svn/trunk@12756 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/ports/SkTypeface_android.h')
| -rw-r--r-- | include/ports/SkTypeface_android.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h index 0996740031..2e04414f5a 100644 --- a/include/ports/SkTypeface_android.h +++ b/include/ports/SkTypeface_android.h @@ -90,7 +90,6 @@ SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origType #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK #include "SkPaintOptionsAndroid.h" -#include "../harfbuzz/src/harfbuzz-shaper.h" #include "../harfbuzz_ng/src/hb.h" /** @@ -102,10 +101,7 @@ SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origType * @return reference to the matching typeface. Caller must call * unref() when they are done. */ -SK_API SkTypeface* SkCreateTypefaceForScriptNG(hb_script_t script, SkTypeface::Style style, - SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid::kDefault_Variant); - -SK_API SkTypeface* SkCreateTypefaceForScript(HB_Script script, SkTypeface::Style style, +SK_API SkTypeface* SkCreateTypefaceForScript(hb_script_t script, SkTypeface::Style style, SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid::kDefault_Variant); #endif // #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |