Merge 104732 - [chromium] Color profiles are incorrect for images without premultiplied alpha

Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 140 matching lines @@
     notImplemented();
 #endif
 }
 
 void ImageFrame::setStatus(FrameStatus status)
 {
     m_status = status;
     if (m_status == FrameComplete) {
         m_bitmap.setDataComplete();  // Tell the bitmap it's done.
 #if PLATFORM(CHROMIUM) && OS(DARWIN)
-        if (m_colorProfile.isEmpty())
+        // resolveColorSpace() and callees assume that the alpha channel is
+        // premultiplied, so don't apply the color profile if it isn't.
+        if (m_colorProfile.isEmpty() || !m_premultiplyAlpha)
             return;
         RetainPtr<CGColorSpaceRef> cgColorSpace(AdoptCF, createColorSpace(m_colorProfile));
         resolveColorSpace(m_bitmap.bitmap(), cgColorSpace.get());
 #endif
     }
 }
 
 int ImageFrame::width() const
 {
     return m_bitmap.bitmap().width();
 }
 
 int ImageFrame::height() const
 {
     return m_bitmap.bitmap().height();
 }
 
 } // namespace WebCore