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

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

        Reviewed by Adam Barth.

        [chromium] JPEG corruption
        https://bugs.webkit.org/show_bug.cgi?id=53250

        This change adds a new script test that we can render a CMYK JPEG with a
        color profile correctly, i.e. we can render it without color corruption.

        * fast/images/cmyk-jpeg-with-color-profile-expected.txt: Added.
        * fast/images/cmyk-jpeg-with-color-profile.html: Added.
        * fast/images/resources/cmyk-jpeg.jpg: Added.
        * fast/images/script-tests/cmyk-jpeg-with-color-profile.js: Added.
        (image.onload):
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):

TBR=commit-queue@webkit.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78724