| 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 "OverwriteLine.h" | 4 #include "OverwriteLine.h" |
| 5 #include "ProcStats.h" | 5 #include "ProcStats.h" |
| 6 #include "SkBBHFactory.h" | 6 #include "SkBBHFactory.h" |
| 7 #include "SkChecksum.h" | 7 #include "SkChecksum.h" |
| 8 #include "SkCommonFlags.h" | 8 #include "SkCommonFlags.h" |
| 9 #include "SkForceLinking.h" | 9 #include "SkForceLinking.h" |
| 10 #include "SkGraphics.h" | 10 #include "SkGraphics.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 #if SK_MESA | 214 #if SK_MESA |
| 215 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0, false, F
LAGS_gpu_threading); | 215 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0, false, F
LAGS_gpu_threading); |
| 216 #endif | 216 #endif |
| 217 } | 217 } |
| 218 | 218 |
| 219 if (FLAGS_cpu) { | 219 if (FLAGS_cpu) { |
| 220 SINK("565", RasterSink, kRGB_565_SkColorType); | 220 SINK("565", RasterSink, kRGB_565_SkColorType); |
| 221 SINK("8888", RasterSink, kN32_SkColorType); | 221 SINK("8888", RasterSink, kN32_SkColorType); |
| 222 SINK("pdf", PDFSink); | 222 SINK("pdf", PDFSink); |
| 223 SINK("skp", SKPSink); | 223 SINK("skp", SKPSink); |
| 224 SINK("null", NullSink); | 224 SINK("svg", SVGSink); |
| 225 SINK("null", NullSink); |
| 225 } | 226 } |
| 226 #undef SINK | 227 #undef SINK |
| 227 return NULL; | 228 return NULL; |
| 228 } | 229 } |
| 229 | 230 |
| 230 static Sink* create_via(const char* tag, Sink* wrapped) { | 231 static Sink* create_via(const char* tag, Sink* wrapped) { |
| 231 #define VIA(t, via, ...) if (0 == strcmp(t, tag)) { return new via(__VA_ARGS__);
} | 232 #define VIA(t, via, ...) if (0 == strcmp(t, tag)) { return new via(__VA_ARGS__);
} |
| 232 VIA("pipe", ViaPipe, wrapped); | 233 VIA("pipe", ViaPipe, wrapped); |
| 233 VIA("serialize", ViaSerialization, wrapped); | 234 VIA("serialize", ViaSerialization, wrapped); |
| 234 VIA("tiles", ViaTiles, 256, 256, NULL, wrapped); | 235 VIA("tiles", ViaTiles, 256, 256, NULL, wrapped); |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 } | 545 } |
| 545 return 0; | 546 return 0; |
| 546 } | 547 } |
| 547 | 548 |
| 548 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 549 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
| 549 int main(int argc, char** argv) { | 550 int main(int argc, char** argv) { |
| 550 SkCommandLineFlags::Parse(argc, argv); | 551 SkCommandLineFlags::Parse(argc, argv); |
| 551 return dm_main(); | 552 return dm_main(); |
| 552 } | 553 } |
| 553 #endif | 554 #endif |
| OLD | NEW |