OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "BenchLogger.h" | 8 #include "BenchLogger.h" |
9 #include "Timer.h" | 9 #include "Timer.h" |
10 #include "CopyTilesRenderer.h" | 10 #include "CopyTilesRenderer.h" |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 // TODO(borenet): We're disabling this for now, due to | 424 // TODO(borenet): We're disabling this for now, due to |
425 // write-protected Android devices. The very short-term | 425 // write-protected Android devices. The very short-term |
426 // solution is to ignore the fact that we have no log file. | 426 // solution is to ignore the fact that we have no log file. |
427 //exit(-1); | 427 //exit(-1); |
428 } | 428 } |
429 } | 429 } |
430 | 430 |
431 SkAutoTDelete<PictureJSONResultsWriter> jsonWriter; | 431 SkAutoTDelete<PictureJSONResultsWriter> jsonWriter; |
432 if (FLAGS_jsonLog.count() == 1) { | 432 if (FLAGS_jsonLog.count() == 1) { |
433 SkASSERT(FLAGS_builderName.count() == 1 && FLAGS_gitHash.count() == 1); | 433 SkASSERT(FLAGS_builderName.count() == 1 && FLAGS_gitHash.count() == 1); |
434 jsonWriter.reset(SkNEW(PictureJSONResultsWriter( | 434 jsonWriter.reset(new PictureJSONResultsWriter(FLAGS_jsonLog[0], FLAGS_bu
ilderName[0], |
435 FLAGS_jsonLog[0], | 435 FLAGS_buildNumber, FLAGS_t
imestamp, |
436 FLAGS_builderName[0], | 436 FLAGS_gitHash[0], FLAGS_gi
tNumber)); |
437 FLAGS_buildNumber, | |
438 FLAGS_timestamp, | |
439 FLAGS_gitHash[0], | |
440 FLAGS_gitNumber))); | |
441 gWriter.add(jsonWriter.get()); | 437 gWriter.add(jsonWriter.get()); |
442 } | 438 } |
443 | 439 |
444 gWriter.add(&gLogWriter); | 440 gWriter.add(&gLogWriter); |
445 | 441 |
446 | 442 |
447 SkAutoGraphics ag; | 443 SkAutoGraphics ag; |
448 | 444 |
449 sk_tools::PictureBenchmark benchmark; | 445 sk_tools::PictureBenchmark benchmark; |
450 | 446 |
(...skipping 25 matching lines...) Expand all Loading... |
476 | 472 |
477 gWriter.end(); | 473 gWriter.end(); |
478 return 0; | 474 return 0; |
479 } | 475 } |
480 | 476 |
481 #if !defined SK_BUILD_FOR_IOS | 477 #if !defined SK_BUILD_FOR_IOS |
482 int main(int argc, char * const argv[]) { | 478 int main(int argc, char * const argv[]) { |
483 return tool_main(argc, (char**) argv); | 479 return tool_main(argc, (char**) argv); |
484 } | 480 } |
485 #endif | 481 #endif |
OLD | NEW |