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

Side by Side Diff: dm/DM.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 | « bench/nanobench.cpp ('k') | gyp/core.gypi » ('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 2013 Google Inc. 2 * Copyright 2013 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 "DMJsonWriter.h" 8 #include "DMJsonWriter.h"
9 #include "DMSrcSink.h" 9 #include "DMSrcSink.h"
10 #include "DMSrcSinkAndroid.h" 10 #include "DMSrcSinkAndroid.h"
(...skipping 16 matching lines...) Expand all
27 #include "SkOSFile.h" 27 #include "SkOSFile.h"
28 #include "SkPM4fPriv.h" 28 #include "SkPM4fPriv.h"
29 #include "SkSpinlock.h" 29 #include "SkSpinlock.h"
30 #include "SkTHash.h" 30 #include "SkTHash.h"
31 #include "SkTaskGroup.h" 31 #include "SkTaskGroup.h"
32 #include "SkThreadUtils.h" 32 #include "SkThreadUtils.h"
33 #include "Test.h" 33 #include "Test.h"
34 #include "Timer.h" 34 #include "Timer.h"
35 #include "picture_utils.h" 35 #include "picture_utils.h"
36 #include "sk_tool_utils.h" 36 #include "sk_tool_utils.h"
37 #include "SkScan.h"
37 38
38 #ifdef SK_PDF_IMAGE_STATS 39 #ifdef SK_PDF_IMAGE_STATS
39 extern void SkPDFImageDumpStats(); 40 extern void SkPDFImageDumpStats();
40 #endif 41 #endif
41 42
42 #include "png.h" 43 #include "png.h"
43 44
44 #include <stdlib.h> 45 #include <stdlib.h>
45 46
46 #ifndef SK_BUILD_FOR_WIN32 47 #ifndef SK_BUILD_FOR_WIN32
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1268
1268 #undef PORTABLE_FONT_PREFIX 1269 #undef PORTABLE_FONT_PREFIX
1269 1270
1270 extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkFontStyle ) ; 1271 extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkFontStyle ) ;
1271 1272
1272 int dm_main(); 1273 int dm_main();
1273 int dm_main() { 1274 int dm_main() {
1274 setbuf(stdout, nullptr); 1275 setbuf(stdout, nullptr);
1275 setup_crash_handler(); 1276 setup_crash_handler();
1276 1277
1278 if (FLAGS_analyticAA) {
1279 GlobalAAConfig::getInstance().fUseAnalyticAA = true;
1280 }
1281
1277 if (FLAGS_verbose) { 1282 if (FLAGS_verbose) {
1278 gVLog = stderr; 1283 gVLog = stderr;
1279 } else if (!FLAGS_writePath.isEmpty()) { 1284 } else if (!FLAGS_writePath.isEmpty()) {
1280 sk_mkdir(FLAGS_writePath[0]); 1285 sk_mkdir(FLAGS_writePath[0]);
1281 gVLog = fopen(SkOSPath::Join(FLAGS_writePath[0], "verbose.log").c_str(), "w"); 1286 gVLog = fopen(SkOSPath::Join(FLAGS_writePath[0], "verbose.log").c_str(), "w");
1282 } 1287 }
1283 1288
1284 JsonWriter::DumpJson(); // It's handy for the bots to assume this is ~never missing. 1289 JsonWriter::DumpJson(); // It's handy for the bots to assume this is ~never missing.
1285 SkAutoGraphics ag; 1290 SkAutoGraphics ag;
1286 SkTaskGroup::Enabler enabled(FLAGS_threads); 1291 SkTaskGroup::Enabler enabled(FLAGS_threads);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 #endif 1426 #endif
1422 } 1427 }
1423 } // namespace skiatest 1428 } // namespace skiatest
1424 1429
1425 #if !defined(SK_BUILD_FOR_IOS) 1430 #if !defined(SK_BUILD_FOR_IOS)
1426 int main(int argc, char** argv) { 1431 int main(int argc, char** argv) {
1427 SkCommandLineFlags::Parse(argc, argv); 1432 SkCommandLineFlags::Parse(argc, argv);
1428 return dm_main(); 1433 return dm_main();
1429 } 1434 }
1430 #endif 1435 #endif
OLDNEW
« no previous file with comments | « bench/nanobench.cpp ('k') | gyp/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698