| OLD | NEW |
| 1 #include "CrashHandler.h" | 1 #include "CrashHandler.h" |
| 2 #include "DMJsonWriter.h" | 2 #include "DMJsonWriter.h" |
| 3 #include "DMSrcSink.h" | 3 #include "DMSrcSink.h" |
| 4 #include "DMSrcSinkAndroid.h" |
| 4 #include "OverwriteLine.h" | 5 #include "OverwriteLine.h" |
| 5 #include "ProcStats.h" | 6 #include "ProcStats.h" |
| 6 #include "SkBBHFactory.h" | 7 #include "SkBBHFactory.h" |
| 7 #include "SkChecksum.h" | 8 #include "SkChecksum.h" |
| 8 #include "SkCommonFlags.h" | 9 #include "SkCommonFlags.h" |
| 9 #include "SkForceLinking.h" | 10 #include "SkForceLinking.h" |
| 10 #include "SkGraphics.h" | 11 #include "SkGraphics.h" |
| 11 #include "SkInstCnt.h" | 12 #include "SkInstCnt.h" |
| 12 #include "SkMD5.h" | 13 #include "SkMD5.h" |
| 13 #include "SkOSFile.h" | 14 #include "SkOSFile.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4, false, F
LAGS_gpu_threading); | 218 SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4, false, F
LAGS_gpu_threading); |
| 218 SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16, false, F
LAGS_gpu_threading); | 219 SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16, false, F
LAGS_gpu_threading); |
| 219 #if SK_ANGLE | 220 #if SK_ANGLE |
| 220 SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0, false, F
LAGS_gpu_threading); | 221 SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0, false, F
LAGS_gpu_threading); |
| 221 #endif | 222 #endif |
| 222 #if SK_MESA | 223 #if SK_MESA |
| 223 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0, false, F
LAGS_gpu_threading); | 224 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0, false, F
LAGS_gpu_threading); |
| 224 #endif | 225 #endif |
| 225 } | 226 } |
| 226 | 227 |
| 228 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 229 SINK("hwui", HWUISink); |
| 230 #endif |
| 231 |
| 227 if (FLAGS_cpu) { | 232 if (FLAGS_cpu) { |
| 228 SINK("565", RasterSink, kRGB_565_SkColorType); | 233 SINK("565", RasterSink, kRGB_565_SkColorType); |
| 229 SINK("8888", RasterSink, kN32_SkColorType); | 234 SINK("8888", RasterSink, kN32_SkColorType); |
| 230 SINK("pdf", PDFSink); | 235 SINK("pdf", PDFSink); |
| 231 SINK("skp", SKPSink); | 236 SINK("skp", SKPSink); |
| 232 SINK("svg", SVGSink); | 237 SINK("svg", SVGSink); |
| 233 SINK("null", NullSink); | 238 SINK("null", NullSink); |
| 234 } | 239 } |
| 235 #undef SINK | 240 #undef SINK |
| 236 return NULL; | 241 return NULL; |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 } | 565 } |
| 561 return 0; | 566 return 0; |
| 562 } | 567 } |
| 563 | 568 |
| 564 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 569 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
| 565 int main(int argc, char** argv) { | 570 int main(int argc, char** argv) { |
| 566 SkCommandLineFlags::Parse(argc, argv); | 571 SkCommandLineFlags::Parse(argc, argv); |
| 567 return dm_main(); | 572 return dm_main(); |
| 568 } | 573 } |
| 569 #endif | 574 #endif |
| OLD | NEW |