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 "SkAdvancedTypefaceMetrics.h" | 9 #include "SkAdvancedTypefaceMetrics.h" |
10 #include "SkBase64.h" | 10 #include "SkBase64.h" |
(...skipping 2362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2373 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); | 2373 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); |
2374 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; | 2374 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; |
2375 } | 2375 } |
2376 | 2376 |
2377 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { | 2377 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { |
2378 return create_from_stream(stream); | 2378 return create_from_stream(stream); |
2379 } | 2379 } |
2380 | 2380 |
2381 #endif | 2381 #endif |
2382 | 2382 |
2383 SkFontMgr* SkFontMgr::Factory() { | 2383 extern SkFontMgr* SkFontMgr_New_GDI(); |
| 2384 extern SkFontMgr* SkFontMgr_New_DirectWrite(); |
| 2385 |
| 2386 SkFontMgr* SkFontMgr_New_GDI() { |
2384 return SkNEW(SkFontMgrGDI); | 2387 return SkNEW(SkFontMgrGDI); |
2385 } | 2388 } |
| 2389 |
| 2390 |
| 2391 SkFontMgr* SkFontMgr::Factory() { |
| 2392 return SkFontMgr_New_GDI(); |
| 2393 } |
OLD | NEW |