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 "SkCommonFlags.h" | 11 #include "SkCommonFlags.h" |
12 #include "SkGraphics.h" | 12 #include "SkGraphics.h" |
13 #include "SkOSFile.h" | 13 #include "SkOSFile.h" |
| 14 #include "SkRunnable.h" |
14 #include "SkTArray.h" | 15 #include "SkTArray.h" |
15 #include "SkTaskGroup.h" | 16 #include "SkTaskGroup.h" |
16 #include "SkTemplates.h" | 17 #include "SkTemplates.h" |
17 #include "SkTime.h" | 18 #include "SkTime.h" |
18 #include "Test.h" | 19 #include "Test.h" |
19 | 20 |
20 #if SK_SUPPORT_GPU | 21 #if SK_SUPPORT_GPU |
21 #include "GrContext.h" | 22 #include "GrContext.h" |
22 #include "GrContextFactory.h" | 23 #include "GrContextFactory.h" |
23 #endif | 24 #endif |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 SkDebugf("\n"); | 216 SkDebugf("\n"); |
216 return (failCount == 0) ? 0 : 1; | 217 return (failCount == 0) ? 0 : 1; |
217 } | 218 } |
218 | 219 |
219 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 220 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
220 int main(int argc, char** argv) { | 221 int main(int argc, char** argv) { |
221 SkCommandLineFlags::Parse(argc, argv); | 222 SkCommandLineFlags::Parse(argc, argv); |
222 return test_main(); | 223 return test_main(); |
223 } | 224 } |
224 #endif | 225 #endif |
OLD | NEW |