| 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 | 9 |
| 10 #include "SkFontHost.h" | 10 #include "SkFontHost.h" |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 return SkNEW_ARGS(StreamTypeface, (style, false, NULL, stream, isFixedPi
tch)); | 510 return SkNEW_ARGS(StreamTypeface, (style, false, NULL, stream, isFixedPi
tch)); |
| 511 } else { | 511 } else { |
| 512 return NULL; | 512 return NULL; |
| 513 } | 513 } |
| 514 } | 514 } |
| 515 | 515 |
| 516 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { | 516 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { |
| 517 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); | 517 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); |
| 518 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; | 518 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; |
| 519 } | 519 } |
| 520 |
| 521 /////////////////////////////////////////////////////////////////////////////// |
| 522 |
| 523 #include "SkFontMgr.h" |
| 524 |
| 525 SkFontMgr* SkFontMgr::Factory() { |
| 526 // todo |
| 527 return NULL; |
| 528 } |
| OLD | NEW |