OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "CrashHandler.h" | 8 #include "CrashHandler.h" |
9 #include "DMJsonWriter.h" | 9 #include "DMJsonWriter.h" |
10 #include "DMSrcSink.h" | 10 #include "DMSrcSink.h" |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 break; | 353 break; |
354 } | 354 } |
355 | 355 |
356 switch (dstColorType) { | 356 switch (dstColorType) { |
357 case CodecSrc::kGrayscale_Always_DstColorType: | 357 case CodecSrc::kGrayscale_Always_DstColorType: |
358 folder.append("_kGray8"); | 358 folder.append("_kGray8"); |
359 break; | 359 break; |
360 case CodecSrc::kIndex8_Always_DstColorType: | 360 case CodecSrc::kIndex8_Always_DstColorType: |
361 folder.append("_kIndex8"); | 361 folder.append("_kIndex8"); |
362 break; | 362 break; |
| 363 case CodecSrc::kNonNative8888_Always_DstColorType: |
| 364 folder.append("_kNonNative"); |
| 365 break; |
363 default: | 366 default: |
364 break; | 367 break; |
365 } | 368 } |
366 | 369 |
367 switch (dstAlphaType) { | 370 switch (dstAlphaType) { |
368 case kOpaque_SkAlphaType: | 371 case kOpaque_SkAlphaType: |
369 folder.append("_opaque"); | 372 folder.append("_opaque"); |
370 break; | 373 break; |
371 case kPremul_SkAlphaType: | 374 case kPremul_SkAlphaType: |
372 folder.append("_premul"); | 375 folder.append("_premul"); |
(...skipping 25 matching lines...) Expand all Loading... |
398 break; | 401 break; |
399 } | 402 } |
400 | 403 |
401 switch (dstColorType) { | 404 switch (dstColorType) { |
402 case CodecSrc::kGrayscale_Always_DstColorType: | 405 case CodecSrc::kGrayscale_Always_DstColorType: |
403 folder.append("_kGray8"); | 406 folder.append("_kGray8"); |
404 break; | 407 break; |
405 case CodecSrc::kIndex8_Always_DstColorType: | 408 case CodecSrc::kIndex8_Always_DstColorType: |
406 folder.append("_kIndex8"); | 409 folder.append("_kIndex8"); |
407 break; | 410 break; |
| 411 case CodecSrc::kNonNative8888_Always_DstColorType: |
| 412 folder.append("_kNonNative"); |
| 413 break; |
408 default: | 414 default: |
409 break; | 415 break; |
410 } | 416 } |
411 | 417 |
412 switch (dstAlphaType) { | 418 switch (dstAlphaType) { |
413 case kOpaque_SkAlphaType: | 419 case kOpaque_SkAlphaType: |
414 folder.append("_opaque"); | 420 folder.append("_opaque"); |
415 break; | 421 break; |
416 case kPremul_SkAlphaType: | 422 case kPremul_SkAlphaType: |
417 folder.append("_premul"); | 423 folder.append("_premul"); |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 case SkEncodedFormat::kDNG_SkEncodedFormat: | 502 case SkEncodedFormat::kDNG_SkEncodedFormat: |
497 break; | 503 break; |
498 default: | 504 default: |
499 nativeModes.push_back(CodecSrc::kScanline_Mode); | 505 nativeModes.push_back(CodecSrc::kScanline_Mode); |
500 nativeModes.push_back(CodecSrc::kStripe_Mode); | 506 nativeModes.push_back(CodecSrc::kStripe_Mode); |
501 break; | 507 break; |
502 } | 508 } |
503 | 509 |
504 SkTArray<CodecSrc::DstColorType> colorTypes; | 510 SkTArray<CodecSrc::DstColorType> colorTypes; |
505 colorTypes.push_back(CodecSrc::kGetFromCanvas_DstColorType); | 511 colorTypes.push_back(CodecSrc::kGetFromCanvas_DstColorType); |
| 512 colorTypes.push_back(CodecSrc::kNonNative8888_Always_DstColorType); |
506 switch (codec->getInfo().colorType()) { | 513 switch (codec->getInfo().colorType()) { |
507 case kGray_8_SkColorType: | 514 case kGray_8_SkColorType: |
508 colorTypes.push_back(CodecSrc::kGrayscale_Always_DstColorType); | 515 colorTypes.push_back(CodecSrc::kGrayscale_Always_DstColorType); |
509 if (kWBMP_SkEncodedFormat == codec->getEncodedFormat()) { | 516 if (kWBMP_SkEncodedFormat == codec->getEncodedFormat()) { |
510 colorTypes.push_back(CodecSrc::kIndex8_Always_DstColorType); | 517 colorTypes.push_back(CodecSrc::kIndex8_Always_DstColorType); |
511 } | 518 } |
512 break; | 519 break; |
513 case kIndex_8_SkColorType: | 520 case kIndex_8_SkColorType: |
514 colorTypes.push_back(CodecSrc::kIndex8_Always_DstColorType); | 521 colorTypes.push_back(CodecSrc::kIndex8_Always_DstColorType); |
515 break; | 522 break; |
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1496 Reporter* reporter, | 1503 Reporter* reporter, |
1497 GrContextFactory* fac
tory); | 1504 GrContextFactory* fac
tory); |
1498 } // namespace skiatest | 1505 } // namespace skiatest |
1499 | 1506 |
1500 #if !defined(SK_BUILD_FOR_IOS) | 1507 #if !defined(SK_BUILD_FOR_IOS) |
1501 int main(int argc, char** argv) { | 1508 int main(int argc, char** argv) { |
1502 SkCommandLineFlags::Parse(argc, argv); | 1509 SkCommandLineFlags::Parse(argc, argv); |
1503 return dm_main(); | 1510 return dm_main(); |
1504 } | 1511 } |
1505 #endif | 1512 #endif |
OLD | NEW |