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 2373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2384 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); | 2384 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); |
2385 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; | 2385 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; |
2386 } | 2386 } |
2387 | 2387 |
2388 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { | 2388 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { |
2389 return create_from_stream(stream); | 2389 return create_from_stream(stream); |
2390 } | 2390 } |
2391 | 2391 |
2392 #endif | 2392 #endif |
2393 | 2393 |
2394 extern SkFontMgr* SkFontMgr_New_GDI(); | |
2395 SkFontMgr* SkFontMgr_New_GDI() { | 2394 SkFontMgr* SkFontMgr_New_GDI() { |
2396 return SkNEW(SkFontMgrGDI); | 2395 return SkNEW(SkFontMgrGDI); |
2397 } | 2396 } |
OLD | NEW |