| 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 "DMSrcSinkAndroid.h" |
| 5 #include "OverwriteLine.h" | 5 #include "OverwriteLine.h" |
| 6 #include "ProcStats.h" | 6 #include "ProcStats.h" |
| 7 #include "SkBBHFactory.h" | 7 #include "SkBBHFactory.h" |
| 8 #include "SkChecksum.h" | 8 #include "SkChecksum.h" |
| 9 #include "SkCommonFlags.h" | 9 #include "SkCommonFlags.h" |
| 10 #include "SkForceLinking.h" | 10 #include "SkForceLinking.h" |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 if (FLAGS_matrix.count() == 4) { | 251 if (FLAGS_matrix.count() == 4) { |
| 252 SkMatrix m; | 252 SkMatrix m; |
| 253 m.reset(); | 253 m.reset(); |
| 254 m.setScaleX((SkScalar)atof(FLAGS_matrix[0])); | 254 m.setScaleX((SkScalar)atof(FLAGS_matrix[0])); |
| 255 m.setSkewX ((SkScalar)atof(FLAGS_matrix[1])); | 255 m.setSkewX ((SkScalar)atof(FLAGS_matrix[1])); |
| 256 m.setSkewY ((SkScalar)atof(FLAGS_matrix[2])); | 256 m.setSkewY ((SkScalar)atof(FLAGS_matrix[2])); |
| 257 m.setScaleY((SkScalar)atof(FLAGS_matrix[3])); | 257 m.setScaleY((SkScalar)atof(FLAGS_matrix[3])); |
| 258 VIA("matrix", ViaMatrix, m, wrapped); | 258 VIA("matrix", ViaMatrix, m, wrapped); |
| 259 VIA("upright", ViaUpright, m, wrapped); | 259 VIA("upright", ViaUpright, m, wrapped); |
| 260 } | 260 } |
| 261 |
| 262 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 263 VIA("androidsdk", ViaAndroidSDK, wrapped); |
| 264 #endif |
| 265 |
| 261 #undef VIA | 266 #undef VIA |
| 262 return NULL; | 267 return NULL; |
| 263 } | 268 } |
| 264 | 269 |
| 265 static void gather_sinks() { | 270 static void gather_sinks() { |
| 266 for (int i = 0; i < FLAGS_config.count(); i++) { | 271 for (int i = 0; i < FLAGS_config.count(); i++) { |
| 267 const char* config = FLAGS_config[i]; | 272 const char* config = FLAGS_config[i]; |
| 268 SkTArray<SkString> parts; | 273 SkTArray<SkString> parts; |
| 269 SkStrSplit(config, "-", &parts); | 274 SkStrSplit(config, "-", &parts); |
| 270 | 275 |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 } | 570 } |
| 566 return 0; | 571 return 0; |
| 567 } | 572 } |
| 568 | 573 |
| 569 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 574 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
| 570 int main(int argc, char** argv) { | 575 int main(int argc, char** argv) { |
| 571 SkCommandLineFlags::Parse(argc, argv); | 576 SkCommandLineFlags::Parse(argc, argv); |
| 572 return dm_main(); | 577 return dm_main(); |
| 573 } | 578 } |
| 574 #endif | 579 #endif |
| OLD | NEW |