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

Side by Side Diff: tools/sk_tool_utils_font.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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
« no previous file with comments | « tools/sk_tool_utils.cpp ('k') | tools/skdiff_image.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 12 matching lines...) Expand all
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 SkTypeface* create_font(const char* name, SkTypeface::Style style) { 32 SkTypeface* create_font(const char* name, SkTypeface::Style style) {
33 SkTestFontData* fontData = NULL; 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) {
(...skipping 18 matching lines...) Expand all
62 font = new 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 new SkTestTypeface(font, SkFontStyle(style)); 68 return new SkTestTypeface(font, SkFontStyle(style));
69 } 69 }
70 70
71 } 71 }
OLDNEW
« no previous file with comments | « tools/sk_tool_utils.cpp ('k') | tools/skdiff_image.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698