| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #include "SkTypes.h" // Keep this before any #ifdef ... |
| 10 |
| 9 #ifdef SK_BUILD_FOR_MAC | 11 #ifdef SK_BUILD_FOR_MAC |
| 10 #import <ApplicationServices/ApplicationServices.h> | 12 #import <ApplicationServices/ApplicationServices.h> |
| 11 #endif | 13 #endif |
| 12 | 14 |
| 13 #ifdef SK_BUILD_FOR_IOS | 15 #ifdef SK_BUILD_FOR_IOS |
| 14 #include <CoreText/CoreText.h> | 16 #include <CoreText/CoreText.h> |
| 15 #include <CoreText/CTFontManager.h> | 17 #include <CoreText/CTFontManager.h> |
| 16 #include <CoreGraphics/CoreGraphics.h> | 18 #include <CoreGraphics/CoreGraphics.h> |
| 17 #include <CoreFoundation/CoreFoundation.h> | 19 #include <CoreFoundation/CoreFoundation.h> |
| 18 #endif | 20 #endif |
| (...skipping 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2284 } | 2286 } |
| 2285 return face; | 2287 return face; |
| 2286 } | 2288 } |
| 2287 }; | 2289 }; |
| 2288 | 2290 |
| 2289 /////////////////////////////////////////////////////////////////////////////// | 2291 /////////////////////////////////////////////////////////////////////////////// |
| 2290 | 2292 |
| 2291 SkFontMgr* SkFontMgr::Factory() { | 2293 SkFontMgr* SkFontMgr::Factory() { |
| 2292 return SkNEW(SkFontMgr_Mac); | 2294 return SkNEW(SkFontMgr_Mac); |
| 2293 } | 2295 } |
| OLD | NEW |