Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: sky/engine/platform/fonts/skia/FontCacheSkia.cpp

Issue 1241673004: Minor sky/engine updates for Mac target (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Remove file added as a result of a bad merge Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ff036234a315f7712ed7cd60abcf77664847ba48..47b7ed3dd3887f7e11ab8a46b5178d881f4a22d2 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/ports/SkFontConfigInterface.h"
#endif
-#if !OS(WIN) && !OS(ANDROID) && !OS(IOS)
+#if !OS(WIN) && !OS(ANDROID) && !OS(IOS) && !OS(MACOSX)
// 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) && !OS(IOS)
+#if !OS(WIN) && !OS(ANDROID) && !OS(IOS) && !OS(MACOSX)
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.
« no previous file with comments | « sky/engine/platform/fonts/ios/FontPlatformDataIOS.cpp ('k') | sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698