| OLD | NEW |
|---|
| 1 #include "CrashHandler.h" | 1 #include "CrashHandler.h" |
| 2 // #include "OverwriteLine.h" | 2 // #include "OverwriteLine.h" |
| 3 #include "Resources.h" | 3 #include "Resources.h" |
| 4 #include "SkBitmap.h" | 4 #include "SkBitmap.h" |
| 5 #include "SkCanvas.h" | 5 #include "SkCanvas.h" |
| 6 #include "SkColor.h" | 6 #include "SkColor.h" |
| 7 #include "SkColorPriv.h" | 7 #include "SkColorPriv.h" |
| 8 #include "SkCommandLineFlags.h" | 8 #include "SkCommandLineFlags.h" |
| 9 #include "SkDevice.h" | 9 #include "SkDevice.h" |
| 10 #include "SkForceLinking.h" | |
| 11 #include "SkGraphics.h" | 10 #include "SkGraphics.h" |
| 12 #include "SkImageDecoder.h" | 11 #include "SkImageDecoder.h" |
| 13 #include "SkImageEncoder.h" | 12 #include "SkImageEncoder.h" |
| 14 #include "SkOSFile.h" | 13 #include "SkOSFile.h" |
| 15 #include "SkPathOpsDebug.h" | 14 #include "SkPathOpsDebug.h" |
| 16 #include "SkPicture.h" | 15 #include "SkPicture.h" |
| 17 #include "SkRTConf.h" | 16 #include "SkRTConf.h" |
| 18 #include "SkRunnable.h" | 17 #include "SkRunnable.h" |
| 19 #include "SkTSort.h" | 18 #include "SkTSort.h" |
| 20 #include "SkStream.h" | 19 #include "SkStream.h" |
| 21 #include "SkString.h" | 20 #include "SkString.h" |
| 22 #include "SkTArray.h" | 21 #include "SkTArray.h" |
| 23 #include "SkTDArray.h" | 22 #include "SkTDArray.h" |
| 24 #include "SkTaskGroup.h" | 23 #include "SkTaskGroup.h" |
| 25 #include "SkTemplates.h" | 24 #include "SkTemplates.h" |
| 26 #include "SkTime.h" | 25 #include "SkTime.h" |
| 27 | 26 |
| 28 __SK_FORCE_IMAGE_DECODER_LINKING; | |
| 29 | |
| 30 /* add local exceptions here */ | 27 /* add local exceptions here */ |
| 31 /* TODO : add command flag interface */ | 28 /* TODO : add command flag interface */ |
| 32 const struct SkipOverTest { | 29 const struct SkipOverTest { |
| 33 int directory; | 30 int directory; |
| 34 const char* filename; | 31 const char* filename; |
| 35 bool blamePathOps; | 32 bool blamePathOps; |
| 36 } skipOver[] = { | 33 } skipOver[] = { |
| 37 { 2, "http___www_groupon_sg_.skp", false}, // SkAAClip::Builder::addRun SkA
SSERT(fBounds.contains(x, y)); | 34 { 2, "http___www_groupon_sg_.skp", false}, // SkAAClip::Builder::addRun SkA
SSERT(fBounds.contains(x, y)); |
| 38 { 6, "http___www_googleventures_com_.skp", true}, // addTCoincident SkASSER
T(test->fT < 1); | 35 { 6, "http___www_googleventures_com_.skp", true}, // addTCoincident SkASSER
T(test->fT < 1); |
| 39 { 7, "http___www_foxsports_nl_.skp", true}, // (no repro on mac) addT SkASS
ERT(this != other || fVerb == SkPath::kCubic_Verb) | 36 { 7, "http___www_foxsports_nl_.skp", true}, // (no repro on mac) addT SkASS
ERT(this != other || fVerb == SkPath::kCubic_Verb) |
| (...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1097 } | 1094 } |
| 1098 SkGraphics::Term(); | 1095 SkGraphics::Term(); |
| 1099 return 0; | 1096 return 0; |
| 1100 } | 1097 } |
| 1101 | 1098 |
| 1102 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 1099 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
| 1103 int main(int argc, char * const argv[]) { | 1100 int main(int argc, char * const argv[]) { |
| 1104 return tool_main(argc, (char**) argv); | 1101 return tool_main(argc, (char**) argv); |
| 1105 } | 1102 } |
| 1106 #endif | 1103 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 670453002:
Remove image decoder and encoder autoregistration (Closed)
Base URL: https://skia.googlesource.com/skia.git@separate-image-decoder-01-skpicture