Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: dm/DMSrcSink.cpp

Issue 1830163002: https://codereview.chromium.org/1830973002 fixed this bug. Re-enable the (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « dm/DM.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 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 "DMSrcSink.h" 8 #include "DMSrcSink.h"
9 #include "SkAndroidCodec.h" 9 #include "SkAndroidCodec.h"
10 #include "SkCodec.h" 10 #include "SkCodec.h"
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 } 824 }
825 break; 825 break;
826 } 826 }
827 default: 827 default:
828 SkASSERT(false); 828 SkASSERT(false);
829 return "Invalid image generator mode"; 829 return "Invalid image generator mode";
830 } 830 }
831 831
832 // Test deferred decoding path on GPU 832 // Test deferred decoding path on GPU
833 if (fIsGpu) { 833 if (fIsGpu) {
834 // FIXME: The gpu backend does not draw kGray sources correctly. (skbug. com/4822)
835 // We have disabled these tests in DM.cpp.
836 SkASSERT(kGray_8_SkColorType != gen->getInfo().colorType());
837
838 sk_sp<SkImage> image(SkImage::MakeFromGenerator(gen.release(), nullptr)) ; 834 sk_sp<SkImage> image(SkImage::MakeFromGenerator(gen.release(), nullptr)) ;
839 if (!image) { 835 if (!image) {
840 return "Could not create image from codec image generator."; 836 return "Could not create image from codec image generator.";
841 } 837 }
842 canvas->drawImage(image, 0, 0); 838 canvas->drawImage(image, 0, 0);
843 return ""; 839 return "";
844 } 840 }
845 841
846 // Test various color and alpha types on CPU 842 // Test various color and alpha types on CPU
847 SkImageInfo decodeInfo = gen->getInfo().makeAlphaType(fDstAlphaType); 843 SkImageInfo decodeInfo = gen->getInfo().makeAlphaType(fDstAlphaType);
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1510 skr.visit(i, drawsAsSingletonPictures); 1506 skr.visit(i, drawsAsSingletonPictures);
1511 } 1507 }
1512 sk_sp<SkPicture> macroPic(macroRec.finishRecordingAsPicture()); 1508 sk_sp<SkPicture> macroPic(macroRec.finishRecordingAsPicture());
1513 1509
1514 canvas->drawPicture(macroPic); 1510 canvas->drawPicture(macroPic);
1515 return check_against_reference(bitmap, src, fSink); 1511 return check_against_reference(bitmap, src, fSink);
1516 }); 1512 });
1517 } 1513 }
1518 1514
1519 } // namespace DM 1515 } // namespace DM
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698