| OLD | NEW |
|---|
| 1 /* |
| 2 * Copyright 2013 Google Inc. |
| 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. |
| 6 */ |
| 7 |
| 1 #include "CrashHandler.h" | 8 #include "CrashHandler.h" |
| 2 // #include "OverwriteLine.h" | 9 // #include "OverwriteLine.h" |
| 3 #include "Resources.h" | 10 #include "Resources.h" |
| 4 #include "SkBitmap.h" | 11 #include "SkBitmap.h" |
| 5 #include "SkCanvas.h" | 12 #include "SkCanvas.h" |
| 6 #include "SkColor.h" | 13 #include "SkColor.h" |
| 7 #include "SkColorPriv.h" | 14 #include "SkColorPriv.h" |
| 8 #include "SkCommandLineFlags.h" | 15 #include "SkCommandLineFlags.h" |
| 9 #include "SkDevice.h" | 16 #include "SkDevice.h" |
| 10 #include "SkForceLinking.h" | 17 #include "SkForceLinking.h" |
| (...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1092 while ((test = iter.next()) != NULL) { | 1099 while ((test = iter.next()) != NULL) { |
| 1093 SkAutoTDelete<Test> owned(test); | 1100 SkAutoTDelete<Test> owned(test); |
| 1094 if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) { | 1101 if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) { |
| 1095 test->run(); | 1102 test->run(); |
| 1096 } | 1103 } |
| 1097 } | 1104 } |
| 1098 SkGraphics::Term(); | 1105 SkGraphics::Term(); |
| 1099 return 0; | 1106 return 0; |
| 1100 } | 1107 } |
| 1101 | 1108 |
| 1102 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 1109 #if !defined(SK_BUILD_FOR_IOS) |
| 1103 int main(int argc, char * const argv[]) { | 1110 int main(int argc, char * const argv[]) { |
| 1104 return tool_main(argc, (char**) argv); | 1111 return tool_main(argc, (char**) argv); |
| 1105 } | 1112 } |
| 1106 #endif | 1113 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1036283002:
Remove all code related to NaCl (Closed)
Base URL: https://skia.googlesource.com/skia.git@master