| Index: sky/engine/platform/fonts/skia/FontCacheSkia.cpp
|
| diff --git a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp
|
| index 1663dfa2433dd01d58ff66026c27b11f432cd689..e94dcfc1c1575508417dc69ca598c803529d29c5 100644
|
| --- a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp
|
| +++ b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp
|
| @@ -49,7 +49,7 @@
|
| #include "third_party/skia/include/core/SkTypeface.h"
|
| #include "third_party/skia/include/ports/SkFontMgr.h"
|
|
|
| -#if !OS(WIN) && !OS(ANDROID)
|
| +#if !OS(WIN) && !OS(ANDROID) && !OS(IOS)
|
| // TODO(bungeman) remove this temporary code ASAP.
|
| // This namespace exists to ease transition of SkTypeface from using SkStream to SkStreamAsset.
|
| namespace tmp {
|
| @@ -215,7 +215,7 @@ PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescri
|
|
|
| PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDescription, const FontFaceCreationParams& creationParams, CString& name)
|
| {
|
| -#if !OS(WIN) && !OS(ANDROID)
|
| +#if !OS(WIN) && !OS(ANDROID) && !OS(IOS)
|
| if (creationParams.creationType() == CreateFontByFciIdAndTtcIndex) {
|
| // TODO(dro): crbug.com/381620 Use creationParams.ttcIndex() after
|
| // https://code.google.com/p/skia/issues/detail?id=1186 gets fixed.
|
|
|