Merge 138302

Source/WebKit/chromium/src/WebImageSkia.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
 using namespace WebCore;
 
 namespace WebKit {
 
 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();
 
     decoder->setData(buffer.get(), true);
     if (!decoder->isSizeAvailable())
         return WebImage();
 
     // Frames are arranged by decreasing size, then decreasing bit depth.
     // Pick the frame closest to |desiredSize|'s area without being smaller,
     // which has the highest bit depth.
@@ skipping 27 matching lines @@
 
     return WebImage(image->bitmap());
 }
 
 WebVector<WebImage> WebImage::framesFromData(const WebData& data)
 {
     // This is to protect from malicious images. It should be big enough that it's never hit in pracice.
     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>();
 
     decoder->setData(buffer.get(), true);
     if (!decoder->isSizeAvailable())
         return WebVector<WebImage>();
 
     // Frames are arranged by decreasing size, then decreasing bit depth.
     // Keep the first frame at every size, has the highest bit depth.
     const size_t frameCount = decoder->frameCount();
@@ skipping 47 matching lines @@
 {
     NativeImagePtr p;
     if (image.get() && (p = image->nativeImageForCurrentFrame()))
         assign(p->bitmap());
     else
         reset();
     return *this;
 }
 
 } // namespace WebKit