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

Side by Side Diff: bench/nanobench.cpp

Issue 2393643002: Resubmit issue 2221103002 to fix the iOS build by declaring the flag in (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | dm/DM.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 <ctype.h> 8 #include <ctype.h>
9 9
10 #include "nanobench.h" 10 #include "nanobench.h"
(...skipping 26 matching lines...) Expand all
37 #include "SkLeanWindows.h" 37 #include "SkLeanWindows.h"
38 #include "SkOSFile.h" 38 #include "SkOSFile.h"
39 #include "SkPictureRecorder.h" 39 #include "SkPictureRecorder.h"
40 #include "SkPictureUtils.h" 40 #include "SkPictureUtils.h"
41 #include "SkString.h" 41 #include "SkString.h"
42 #include "SkSurface.h" 42 #include "SkSurface.h"
43 #include "SkSVGDOM.h" 43 #include "SkSVGDOM.h"
44 #include "SkTaskGroup.h" 44 #include "SkTaskGroup.h"
45 #include "SkThreadUtils.h" 45 #include "SkThreadUtils.h"
46 #include "ThermalManager.h" 46 #include "ThermalManager.h"
47 #include "SkScan.h"
47 48
48 #include <stdlib.h> 49 #include <stdlib.h>
49 50
50 #ifndef SK_BUILD_FOR_WIN32 51 #ifndef SK_BUILD_FOR_WIN32
51 #include <unistd.h> 52 #include <unistd.h>
52 #endif 53 #endif
53 54
54 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK 55 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
55 #include "nanobenchAndroid.h" 56 #include "nanobenchAndroid.h"
56 #endif 57 #endif
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 SkDebugf("Can't parse %s from --useThermalManager.\n", FLAGS_useThermalM anager[0]); 1172 SkDebugf("Can't parse %s from --useThermalManager.\n", FLAGS_useThermalM anager[0]);
1172 exit(1); 1173 exit(1);
1173 } 1174 }
1174 ThermalManager tm(tmThreshold, tmSleepTimeMs, tmTimeoutMs); 1175 ThermalManager tm(tmThreshold, tmSleepTimeMs, tmTimeoutMs);
1175 #endif 1176 #endif
1176 1177
1177 if (FLAGS_keepAlive) { 1178 if (FLAGS_keepAlive) {
1178 start_keepalive(); 1179 start_keepalive();
1179 } 1180 }
1180 1181
1182 if (FLAGS_analyticAA) {
1183 GlobalAAConfig::getInstance().fUseAnalyticAA = true;
1184 }
1185
1181 int runs = 0; 1186 int runs = 0;
1182 BenchmarkStream benchStream; 1187 BenchmarkStream benchStream;
1183 while (Benchmark* b = benchStream.next()) { 1188 while (Benchmark* b = benchStream.next()) {
1184 SkAutoTDelete<Benchmark> bench(b); 1189 SkAutoTDelete<Benchmark> bench(b);
1185 if (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName())) { 1190 if (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName())) {
1186 continue; 1191 continue;
1187 } 1192 }
1188 1193
1189 if (!configs.empty()) { 1194 if (!configs.empty()) {
1190 log->bench(bench->getUniqueName(), bench->getSize().fX, bench->getSi ze().fY); 1195 log->bench(bench->getUniqueName(), bench->getSize().fX, bench->getSi ze().fY);
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 1352
1348 return 0; 1353 return 0;
1349 } 1354 }
1350 1355
1351 #if !defined SK_BUILD_FOR_IOS 1356 #if !defined SK_BUILD_FOR_IOS
1352 int main(int argc, char** argv) { 1357 int main(int argc, char** argv) {
1353 SkCommandLineFlags::Parse(argc, argv); 1358 SkCommandLineFlags::Parse(argc, argv);
1354 return nanobench_main(); 1359 return nanobench_main();
1355 } 1360 }
1356 #endif 1361 #endif
OLDNEW
« no previous file with comments | « no previous file | dm/DM.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698