Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Side by Side Diff: tools/sk_tool_utils_font.cpp

Issue 1974783002: Revert of Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 11 matching lines...) Expand all
22 22
23 void release_portable_typefaces() { 23 void release_portable_typefaces() {
24 for (int index = 0; index < gTestFontsCount; ++index) { 24 for (int index = 0; index < gTestFontsCount; ++index) {
25 SkTestFontData& fontData = gTestFonts[index]; 25 SkTestFontData& fontData = gTestFonts[index];
26 SkSafeUnref(fontData.fFontCache); 26 SkSafeUnref(fontData.fFontCache);
27 } 27 }
28 } 28 }
29 29
30 SK_DECLARE_STATIC_MUTEX(gTestFontMutex); 30 SK_DECLARE_STATIC_MUTEX(gTestFontMutex);
31 31
32 sk_sp<SkTypeface> create_font(const char* name, SkTypeface::Style style) { 32 SkTypeface* create_font(const char* name, SkTypeface::Style style) {
33 SkTestFontData* fontData = nullptr; 33 SkTestFontData* fontData = nullptr;
34 const SubFont* sub; 34 const SubFont* sub;
35 if (name) { 35 if (name) {
36 for (int index = 0; index < gSubFontsCount; ++index) { 36 for (int index = 0; index < gSubFontsCount; ++index) {
37 sub = &gSubFonts[index]; 37 sub = &gSubFonts[index];
38 if (!strcmp(name, sub->fName) && sub->fStyle == style) { 38 if (!strcmp(name, sub->fName) && sub->fStyle == style) {
39 fontData = &sub->fFont; 39 fontData = &sub->fFont;
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 return sk_sp<SkTypeface>(fm->legacyCreateTypeface(name, 50 return fm->legacyCreateTypeface(name, SkFontStyle::FromOldStyle(styl e));
51 SkFontStyle::FromO ldStyle(style)));
52 } 51 }
53 } else { 52 } else {
54 sub = &gSubFonts[gDefaultFontIndex]; 53 sub = &gSubFonts[gDefaultFontIndex];
55 fontData = &sub->fFont; 54 fontData = &sub->fFont;
56 } 55 }
57 SkTestFont* font; 56 SkTestFont* font;
58 { 57 {
59 SkAutoMutexAcquire ac(gTestFontMutex); 58 SkAutoMutexAcquire ac(gTestFontMutex);
60 if (fontData->fFontCache) { 59 if (fontData->fFontCache) {
61 font = SkSafeRef(fontData->fFontCache); 60 font = SkSafeRef(fontData->fFontCache);
62 } else { 61 } else {
63 font = new SkTestFont(*fontData); 62 font = new SkTestFont(*fontData);
64 SkDEBUGCODE(font->fDebugName = sub->fName); 63 SkDEBUGCODE(font->fDebugName = sub->fName);
65 SkDEBUGCODE(font->fDebugStyle = sub->fStyle); 64 SkDEBUGCODE(font->fDebugStyle = sub->fStyle);
66 fontData->fFontCache = SkSafeRef(font); 65 fontData->fFontCache = SkSafeRef(font);
67 } 66 }
68 } 67 }
69 return sk_make_sp<SkTestTypeface>(font, SkFontStyle::FromOldStyle(style)); 68 return new SkTestTypeface(font, SkFontStyle::FromOldStyle(style));
70 } 69 }
71 70
72 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698