| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 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 "CrashHandler.h" | 8 #include "CrashHandler.h" |
| 9 #include "OverwriteLine.h" | 9 #include "OverwriteLine.h" |
| 10 #include "Resources.h" | 10 #include "Resources.h" |
| 11 #include "SkAtomics.h" |
| 11 #include "SkCommonFlags.h" | 12 #include "SkCommonFlags.h" |
| 12 #include "SkGraphics.h" | 13 #include "SkGraphics.h" |
| 13 #include "SkOSFile.h" | 14 #include "SkOSFile.h" |
| 14 #include "SkRunnable.h" | 15 #include "SkRunnable.h" |
| 15 #include "SkTArray.h" | 16 #include "SkTArray.h" |
| 16 #include "SkTaskGroup.h" | 17 #include "SkTaskGroup.h" |
| 17 #include "SkTemplates.h" | 18 #include "SkTemplates.h" |
| 18 #include "SkThread.h" | |
| 19 #include "SkTime.h" | 19 #include "SkTime.h" |
| 20 #include "Test.h" | 20 #include "Test.h" |
| 21 | 21 |
| 22 #if SK_SUPPORT_GPU | 22 #if SK_SUPPORT_GPU |
| 23 #include "GrContext.h" | 23 #include "GrContext.h" |
| 24 #include "GrContextFactory.h" | 24 #include "GrContextFactory.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 using namespace skiatest; | 27 using namespace skiatest; |
| 28 | 28 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 SkDebugf("\n"); | 221 SkDebugf("\n"); |
| 222 return (status.failCount() == 0) ? 0 : 1; | 222 return (status.failCount() == 0) ? 0 : 1; |
| 223 } | 223 } |
| 224 | 224 |
| 225 #if !defined(SK_BUILD_FOR_IOS) | 225 #if !defined(SK_BUILD_FOR_IOS) |
| 226 int main(int argc, char** argv) { | 226 int main(int argc, char** argv) { |
| 227 SkCommandLineFlags::Parse(argc, argv); | 227 SkCommandLineFlags::Parse(argc, argv); |
| 228 return test_main(); | 228 return test_main(); |
| 229 } | 229 } |
| 230 #endif | 230 #endif |
| OLD | NEW |