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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 } else { | 52 } else { |
53 sub = &gSubFonts[gDefaultFontIndex]; | 53 sub = &gSubFonts[gDefaultFontIndex]; |
54 fontData = &sub->fFont; | 54 fontData = &sub->fFont; |
55 } | 55 } |
56 SkTestFont* font; | 56 SkTestFont* font; |
57 { | 57 { |
58 SkAutoMutexAcquire ac(gTestFontMutex); | 58 SkAutoMutexAcquire ac(gTestFontMutex); |
59 if (fontData->fFontCache) { | 59 if (fontData->fFontCache) { |
60 font = SkSafeRef(fontData->fFontCache); | 60 font = SkSafeRef(fontData->fFontCache); |
61 } else { | 61 } else { |
62 font = SkNEW_ARGS(SkTestFont, (*fontData)); | 62 font = new SkTestFont(*fontData); |
63 SkDEBUGCODE(font->fDebugName = sub->fName); | 63 SkDEBUGCODE(font->fDebugName = sub->fName); |
64 SkDEBUGCODE(font->fDebugStyle = sub->fStyle); | 64 SkDEBUGCODE(font->fDebugStyle = sub->fStyle); |
65 fontData->fFontCache = SkSafeRef(font); | 65 fontData->fFontCache = SkSafeRef(font); |
66 } | 66 } |
67 } | 67 } |
68 return SkNEW_ARGS(SkTestTypeface, (font, SkFontStyle(style))); | 68 return new SkTestTypeface(font, SkFontStyle(style)); |
69 } | 69 } |
70 | 70 |
71 } | 71 } |
OLD | NEW |