Chromium Code Reviews Chromium Code Reviews
Issue 107663012:
Android now uses Harfbuzz-NG. No need to keep code specific to the old version of Harfbuzz around! (Closed)
Base URL: https://skia.googlesource.com/skia.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 | 8 |
| 9 #ifndef SkTypeface_android_DEFINED | 9 #ifndef SkTypeface_android_DEFINED |
| 10 #define SkTypeface_android_DEFINED | 10 #define SkTypeface_android_DEFINED |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 83 * inclusive while the upper bound is exclusive. | 83 * inclusive while the upper bound is exclusive. |
| 84 */ | 84 */ |
| 85 SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origType face, | 85 SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origType face, |
| 86 const SkPaintOptionsAndroid& options, | 86 const SkPaintOptionsAndroid& options, |
| 87 int* lowerBounds = NULL, int* upperBounds = NULL); | 87 int* lowerBounds = NULL, int* upperBounds = NULL); |
| 88 | 88 |
| 89 #endif // #ifdef SK_BUILD_FOR_ANDROID | 89 #endif // #ifdef SK_BUILD_FOR_ANDROID |
| 90 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 90 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 91 | 91 |
| 92 #include "SkPaintOptionsAndroid.h" | 92 #include "SkPaintOptionsAndroid.h" |
| 93 #include "../harfbuzz/src/harfbuzz-shaper.h" | |
| 94 #include "../harfbuzz_ng/src/hb.h" | 93 #include "../harfbuzz_ng/src/hb.h" |
|
reed1
2013/12/18 19:11:36
man do I hate paths in includes
djsollen
2013/12/18 19:14:01
Agreed. I'll try to work with android to see if I
| |
| 95 | 94 |
| 96 /** | 95 /** |
| 97 * Return a new typeface for a fallback script. If the script is | 96 * Return a new typeface for a fallback script. If the script is |
| 98 * not valid, or can not map to a font, returns null. | 97 * not valid, or can not map to a font, returns null. |
| 99 * @param script The harfbuzz script id. | 98 * @param script The harfbuzz script id. |
| 100 * @param style The font style, for example bold | 99 * @param style The font style, for example bold |
| 101 * @param elegant true if we want the web friendly elegant version of the fon t | 100 * @param elegant true if we want the web friendly elegant version of the fon t |
| 102 * @return reference to the matching typeface. Caller must call | 101 * @return reference to the matching typeface. Caller must call |
| 103 * unref() when they are done. | 102 * unref() when they are done. |
| 104 */ | 103 */ |
| 105 SK_API SkTypeface* SkCreateTypefaceForScriptNG(hb_script_t script, SkTypeface::S tyle style, | 104 SK_API SkTypeface* SkCreateTypefaceForScript(hb_script_t script, SkTypeface::Sty le style, |
| 106 SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid:: kDefault_Variant); | |
| 107 | |
| 108 SK_API SkTypeface* SkCreateTypefaceForScript(HB_Script script, SkTypeface::Style style, | |
| 109 SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid:: kDefault_Variant); | 105 SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid:: kDefault_Variant); |
| 110 | 106 |
| 111 #endif // #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 107 #endif // #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 112 #endif // #ifndef SkTypeface_android_DEFINED | 108 #endif // #ifndef SkTypeface_android_DEFINED |
| OLD | NEW |
