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

Unified Diff: Source/WebKit/chromium/src/WebImageSkia.cpp

Issue 11785017: Merge 138302 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebImageSkia.cpp
===================================================================
--- Source/WebKit/chromium/src/WebImageSkia.cpp (revision 138919)
+++ Source/WebKit/chromium/src/WebImageSkia.cpp (working copy)
@@ -50,7 +50,7 @@
WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize)
{
RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
- OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileApplied)));
+ OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored)));
if (!decoder)
return WebImage();
@@ -98,7 +98,7 @@
const size_t maxFrameCount = 8;
RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
- OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileApplied)));
+ OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored)));
if (!decoder)
return WebVector<WebImage>();
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698