Merge 77724 - 2011-02-04 Hironori Bono <hbono@chromium.org>...

WebCore/ChangeLog

+2011-02-04  Hironori Bono  <hbono@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [chromium] JPEG corruption
+        https://bugs.webkit.org/show_bug.cgi?id=53250
+
+        Same as gray-scale JPEGs, we convert the colors of CMYK JPEGs with color
+        profiles from CMYK to RGB twice and it causes color corruption. This
+        change suppresses the color profiles for CMYK JPEGs same as gray-scale
+        ones.
+
+        Test: fast/images/cmyk-jpeg-with-color-profile.html
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (WebCore::JPEGImageReader::decode):
+
 2011-01-30  Kenichi Ishibashi  <bashi@google.com>
 
         Reviewed by Kent Tamura.
 
         Dangling form associated elements should not be registered on the document
         https://bugs.webkit.org/show_bug.cgi?id=53223
 
         Adds insertedIntoDocument() and remvoedFromDocument() to
         FormAssociatedElement class to register the element on the document
         if and only if it actually inserted into (removed from) the document.
@@ skipping 2796 matching lines @@
         (WebCore::ScriptCallFrame::buildInspectorObject):
         * inspector/ScriptCallFrame.h:
         (WebCore::ScriptCallFrame::sourceURL):
         * inspector/ScriptCallStack.h:
         * inspector/TimelineRecordFactory.cpp:
         (WebCore::TimelineRecordFactory::createGenericRecord):
         * inspector/front-end/ConsoleView.js:
         (WebInspector.ConsoleMessage.prototype._populateStackTraceTreeElement):
 
 == Rolled over to ChangeLog-2010-12-06 ==