Index: include/ports/SkTypeface_android.h |
diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h |
index 05921679649edf17213f96f47e098ac1b7a82071..e87fa4805a34452f6087ab08b5c627a0e59f6d10 100644 |
--- a/include/ports/SkTypeface_android.h |
+++ b/include/ports/SkTypeface_android.h |
@@ -11,60 +11,6 @@ |
#include "SkTypeface.h" |
-enum FallbackScripts { |
- kArabic_FallbackScript, |
- kArmenian_FallbackScript, |
- kBengali_FallbackScript, |
- kDevanagari_FallbackScript, |
- kEthiopic_FallbackScript, |
- kGeorgian_FallbackScript, |
- kHebrewRegular_FallbackScript, |
- kHebrewBold_FallbackScript, |
- kKannada_FallbackScript, |
- kMalayalam_FallbackScript, |
- kTamilRegular_FallbackScript, |
- kTamilBold_FallbackScript, |
- kThai_FallbackScript, |
- kTelugu_FallbackScript, |
- kFallbackScriptNumber |
-}; |
- |
-// This particular mapping will be removed after WebKit is updated to use the |
-// new mappings. No new caller should use the kTamil_FallbackScript but rather |
-// the more specific Tamil scripts in the standard enum. |
-#define kTamil_FallbackScript kTamilRegular_FallbackScript |
- |
-#define SkTypeface_ValidScript(s) (s >= 0 && s < kFallbackScriptNumber) |
- |
-/** |
- * Return a new typeface for a fallback script. If the script is |
- * not valid, or can not map to a font, returns null. |
- * @param script The script id. |
- * @return reference to the matching typeface. Caller must call |
- * unref() when they are done. |
- */ |
-SK_API SkTypeface* SkCreateTypefaceForScript(FallbackScripts script); |
- |
-/** |
- * Return the string representation for the fallback script on Android. |
- * If the script is not valid, returns null. |
- */ |
-SK_API const char* SkGetFallbackScriptID(FallbackScripts script); |
- |
-/** |
- * Return the fallback script enum for the ID on Android. |
- * If the ID is not valid, or can not map to a fallback |
- * script, returns kFallbackScriptNumber. |
- */ |
-SK_API FallbackScripts SkGetFallbackScriptFromID(const char* id); |
- |
-/** |
- * Return a new typeface of the font in the fallback font list containing |
- * the specified chararacter. If no typeface is found, returns null. |
- */ |
-SK_API SkTypeface* SkCreateFallbackTypefaceForChar(SkUnichar uni, |
- SkTypeface::Style style); |
- |
/** |
* Get the family name of the font in the fallback font list containing |
* the specified chararacter. if no font is found, returns false. |