@@ -53,7 +53,7 @@ class SharedGenerator final : public SkNVRefCnt<SharedGenerator> {
5353// /////////////////////////////////////////////////////////////////////////////
5454
5555SkImage_Lazy::Validator::Validator (sk_sp<SharedGenerator> gen, const SkIRect* subset,
56- const SkColorType* colorType, sk_sp<SkColorSpace> colorSpace)
56+ sk_sp<SkColorSpace> colorSpace)
5757 : fSharedGenerator(std::move(gen)) {
5858 if (!fSharedGenerator ) {
5959 return ;
@@ -84,13 +84,8 @@ SkImage_Lazy::Validator::Validator(sk_sp<SharedGenerator> gen, const SkIRect* su
8484
8585 fInfo = info.makeWH (subset->width (), subset->height ());
8686 fOrigin = SkIPoint::Make (subset->x (), subset->y ());
87- if (colorType || colorSpace) {
88- if (colorType) {
89- fInfo = fInfo .makeColorType (*colorType);
90- }
91- if (colorSpace) {
92- fInfo = fInfo .makeColorSpace (colorSpace);
93- }
87+ if (colorSpace) {
88+ fInfo = fInfo .makeColorSpace (colorSpace);
9489 fUniqueID = SkNextID::ImageID ();
9590 }
9691}
@@ -254,33 +249,30 @@ sk_sp<SkImage> SkImage_Lazy::onMakeSubset(const SkIRect& subset) const {
254249 SkASSERT (fInfo .bounds () != subset);
255250
256251 const SkIRect generatorSubset = subset.makeOffset (fOrigin .x (), fOrigin .y ());
257- const SkColorType colorType = fInfo .colorType ();
258- Validator validator (fSharedGenerator , &generatorSubset, &colorType, fInfo .refColorSpace ());
252+ Validator validator (fSharedGenerator , &generatorSubset, fInfo .refColorSpace ());
259253 return validator ? sk_sp<SkImage>(new SkImage_Lazy (&validator)) : nullptr ;
260254}
261255
262- sk_sp<SkImage> SkImage_Lazy::onMakeColorTypeAndColorSpace (SkColorType targetCT,
263- sk_sp<SkColorSpace> targetCS) const {
264- SkAutoExclusive autoAquire (fOnMakeColorTypeAndSpaceMutex );
265- if (fOnMakeColorTypeAndSpaceResult &&
266- targetCT == fOnMakeColorTypeAndSpaceResult ->colorType () &&
267- SkColorSpace::Equals (targetCS.get (), fOnMakeColorTypeAndSpaceResult ->colorSpace ())) {
268- return fOnMakeColorTypeAndSpaceResult ;
256+ sk_sp<SkImage> SkImage_Lazy::onMakeColorSpace (sk_sp<SkColorSpace> target) const {
257+ SkAutoExclusive autoAquire (fOnMakeColorSpaceMutex );
258+ if (fOnMakeColorSpaceTarget &&
259+ SkColorSpace::Equals (target.get (), fOnMakeColorSpaceTarget .get ())) {
260+ return fOnMakeColorSpaceResult ;
269261 }
270262 const SkIRect generatorSubset =
271263 SkIRect::MakeXYWH (fOrigin .x (), fOrigin .y (), fInfo .width (), fInfo .height ());
272- Validator validator (fSharedGenerator , &generatorSubset, &targetCT, targetCS );
264+ Validator validator (fSharedGenerator , &generatorSubset, target );
273265 sk_sp<SkImage> result = validator ? sk_sp<SkImage>(new SkImage_Lazy (&validator)) : nullptr ;
274266 if (result) {
275- fOnMakeColorTypeAndSpaceResult = result;
267+ fOnMakeColorSpaceTarget = target;
268+ fOnMakeColorSpaceResult = result;
276269 }
277270 return result;
278271}
279272
280273sk_sp<SkImage> SkImage::MakeFromGenerator (std::unique_ptr<SkImageGenerator> generator,
281274 const SkIRect* subset) {
282- SkImage_Lazy::Validator
283- validator (SharedGenerator::Make (std::move (generator)), subset, nullptr , nullptr );
275+ SkImage_Lazy::Validator validator (SharedGenerator::Make (std::move (generator)), subset, nullptr );
284276
285277 return validator ? sk_make_sp<SkImage_Lazy>(&validator) : nullptr ;
286278}
@@ -435,10 +427,9 @@ sk_sp<GrTextureProxy> SkImage_Lazy::lockTextureProxy(
435427 ScopedGenerator generator (fSharedGenerator );
436428 Generator_GrYUVProvider provider (generator);
437429
438- // The pixels in the texture will be in the generator's color space.
439- // If onMakeColorTypeAndColorSpace has been called then this will not match this image's
440- // color space. To correct this, apply a color space conversion from the generator's color
441- // space to this image's color space.
430+ // The pixels in the texture will be in the generator's color space. If onMakeColorSpace
431+ // has been called then this will not match this image's color space. To correct this, apply
432+ // a color space conversion from the generator's color space to this image's color space.
442433 SkColorSpace* generatorColorSpace = fSharedGenerator ->fGenerator ->getInfo ().colorSpace ();
443434 SkColorSpace* thisColorSpace = fInfo .colorSpace ();
444435
0 commit comments