OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 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 "Resources.h" | 8 #include "Resources.h" |
9 #include "SkFontMgr.h" | 9 #include "SkFontMgr.h" |
10 #include "SkMutex.h" | 10 #include "SkMutex.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 break; | 40 break; |
41 } | 41 } |
42 } | 42 } |
43 if (!fontData) { | 43 if (!fontData) { |
44 // Once all legacy callers to portable fonts are converted, replace
this with | 44 // Once all legacy callers to portable fonts are converted, replace
this with |
45 // SK_ABORT(); | 45 // SK_ABORT(); |
46 SkDebugf("missing %s %d\n", name, style); | 46 SkDebugf("missing %s %d\n", name, style); |
47 // If we called SkTypeface::CreateFromName() here we'd recurse infin
itely, | 47 // If we called SkTypeface::CreateFromName() here we'd recurse infin
itely, |
48 // so we reimplement its core logic here inline without the recursiv
e aspect. | 48 // so we reimplement its core logic here inline without the recursiv
e aspect. |
49 SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault()); | 49 SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault()); |
50 #ifdef SK_VERY_LEGACY_CREATE_TYPEFACE | |
51 return fm->legacyCreateTypeface(name, style); | |
52 #else | |
53 return fm->legacyCreateTypeface(name, SkFontStyle::FromOldStyle(styl
e)); | 50 return fm->legacyCreateTypeface(name, SkFontStyle::FromOldStyle(styl
e)); |
54 #endif | |
55 } | 51 } |
56 } else { | 52 } else { |
57 sub = &gSubFonts[gDefaultFontIndex]; | 53 sub = &gSubFonts[gDefaultFontIndex]; |
58 fontData = &sub->fFont; | 54 fontData = &sub->fFont; |
59 } | 55 } |
60 SkTestFont* font; | 56 SkTestFont* font; |
61 { | 57 { |
62 SkAutoMutexAcquire ac(gTestFontMutex); | 58 SkAutoMutexAcquire ac(gTestFontMutex); |
63 if (fontData->fFontCache) { | 59 if (fontData->fFontCache) { |
64 font = SkSafeRef(fontData->fFontCache); | 60 font = SkSafeRef(fontData->fFontCache); |
65 } else { | 61 } else { |
66 font = new SkTestFont(*fontData); | 62 font = new SkTestFont(*fontData); |
67 SkDEBUGCODE(font->fDebugName = sub->fName); | 63 SkDEBUGCODE(font->fDebugName = sub->fName); |
68 SkDEBUGCODE(font->fDebugStyle = sub->fStyle); | 64 SkDEBUGCODE(font->fDebugStyle = sub->fStyle); |
69 fontData->fFontCache = SkSafeRef(font); | 65 fontData->fFontCache = SkSafeRef(font); |
70 } | 66 } |
71 } | 67 } |
72 return new SkTestTypeface(font, SkFontStyle::FromOldStyle(style)); | 68 return new SkTestTypeface(font, SkFontStyle::FromOldStyle(style)); |
73 } | 69 } |
74 | 70 |
75 } | 71 } |
OLD | NEW |