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

Unified Diff: third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp

Issue 2523943002: Explicitly specify target color space to ImageDecoder at creation (Closed)
Patch Set: Rebase Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
index bccdb1244e7ceaafb8a42fe53b86f94cb8c79778..c158bad702952b8962008d79bc3a613ed910826d 100644
--- a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
+++ b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
@@ -142,16 +142,19 @@ SkImageGenerator* DecodingImageGenerator::create(SkData* data) {
// don't really matter.
std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(
segmentReader, true, ImageDecoder::AlphaPremultiplied,
- ImageDecoder::ColorSpaceApplied);
+ ImageDecoder::ColorSpaceTransformed,
+ ImageDecoder::globalTargetColorSpace());
if (!decoder || !decoder->isSizeAvailable())
return nullptr;
const IntSize size = decoder->size();
- const SkImageInfo info = SkImageInfo::MakeN32(
- size.width(), size.height(), kPremul_SkAlphaType, decoder->colorSpace());
+ const SkImageInfo info =
+ SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType,
+ decoder->colorSpaceForSkImages());
RefPtr<ImageFrameGenerator> frame = ImageFrameGenerator::create(
- SkISize::Make(size.width(), size.height()), decoder->colorSpace(), false);
+ SkISize::Make(size.width(), size.height()), false,
+ decoder->colorSpaceOption(), decoder->targetColorSpace());
if (!frame)
return nullptr;

Powered by Google App Engine
This is Rietveld 408576698