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

Side by Side Diff: tools/sk_tool_utils_font.cpp

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 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 | « tests/skia_test.cpp ('k') | tools/skpdiff/SkDiffContext.h » ('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"
11 #include "SkOSFile.h" 10 #include "SkOSFile.h"
12 #include "SkTestScalerContext.h" 11 #include "SkTestScalerContext.h"
12 #include "SkThread.h"
13 #include "SkUtils.h" 13 #include "SkUtils.h"
14 #include "sk_tool_utils.h" 14 #include "sk_tool_utils.h"
15 15
16 namespace sk_tool_utils { 16 namespace sk_tool_utils {
17 17
18 #include "test_font_monospace.cpp" 18 #include "test_font_monospace.cpp"
19 #include "test_font_sans_serif.cpp" 19 #include "test_font_sans_serif.cpp"
20 #include "test_font_serif.cpp" 20 #include "test_font_serif.cpp"
21 #include "test_font_index.cpp" 21 #include "test_font_index.cpp"
22 22
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 break; 171 break;
172 } 172 }
173 } 173 }
174 fprintf(out, ";\n"); 174 fprintf(out, ";\n");
175 } 175 }
176 fclose(out); 176 fclose(out);
177 } 177 }
178 #endif 178 #endif
179 179
180 } 180 }
OLDNEW
« no previous file with comments | « tests/skia_test.cpp ('k') | tools/skpdiff/SkDiffContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698