| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkFontMgr.h" | 8 #include "SkFontMgr.h" |
| 9 #include "SkFontStyle.h" | 9 #include "SkFontStyle.h" |
| 10 #include "SkFontConfigInterface.h" | 10 #include "SkFontConfigInterface.h" |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 } | 317 } |
| 318 | 318 |
| 319 SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERR
IDE { | 319 SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERR
IDE { |
| 320 SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path)); | 320 SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path)); |
| 321 return stream.get() ? this->createFromStream(stream.detach(), ttcIndex)
: NULL; | 321 return stream.get() ? this->createFromStream(stream.detach(), ttcIndex)
: NULL; |
| 322 } | 322 } |
| 323 | 323 |
| 324 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], | 324 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], |
| 325 unsigned styleBits) const SK_OVER
RIDE { | 325 unsigned styleBits) const SK_OVER
RIDE { |
| 326 FCLocker lock; | 326 FCLocker lock; |
| 327 return FontConfigTypeface::LegacyCreateTypeface(NULL, familyName, | 327 return FontConfigTypeface::LegacyCreateTypeface(familyName, (SkTypeface:
:Style)styleBits); |
| 328 (SkTypeface::Style)styleBits); | |
| 329 } | 328 } |
| 330 }; | 329 }; |
| 331 | 330 |
| 332 SkFontMgr* SkFontMgr::Factory() { | 331 SkFontMgr* SkFontMgr::Factory() { |
| 333 SkFontConfigInterface* fci = RefFCI(); | 332 SkFontConfigInterface* fci = RefFCI(); |
| 334 return fci ? SkNEW_ARGS(SkFontMgr_fontconfig, (fci)) : NULL; | 333 return fci ? SkNEW_ARGS(SkFontMgr_fontconfig, (fci)) : NULL; |
| 335 } | 334 } |
| OLD | NEW |