Fix the color issue in CMYK jpeg images.

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 435 matching lines @@
         jpeg_calc_output_dimensions(&info_);
         decoder_->SetDecodedSize(info_.output_width, info_.output_height);
 
         decoder_->SetOrientation(ReadImageOrientation(Info()));
 
         // Allow color management of the decoded RGBA pixels if possible.
         if (!decoder_->IgnoresColorSpace()) {
           JOCTET* profile = nullptr;
           unsigned profile_length = 0;
           if (read_icc_profile(Info(), &profile, &profile_length)) {
+            // Default set to ICC type to RGB
+            SkColorSpace::ICCTypeFlag icc_type = SkColorSpace::kRGB_ICCTypeFlag;
+
+            // Update ICC type to CMYK JPEG image
+            if (info_.out_color_space == JCS_CMYK)
+              icc_type = SkColorSpace::kCMYK_ICCTypeFlag;
+
             Decoder()->SetEmbeddedColorProfile(reinterpret_cast<char*>(profile),
-                                               profile_length);
+                                               profile_length, icc_type);
             free(profile);
           }
           if (Decoder()->ColorTransform()) {
             override_color_space = JCS_UNKNOWN;
           }
         }
         if (override_color_space == JCS_YCbCr) {
           info_.out_color_space = JCS_YCbCr;
           info_.raw_data_out = TRUE;
           uv_size_ = ComputeYUVSize(
@@ skipping 375 matching lines @@
     int y = info->output_scanline;
     // Request one scanline: returns 0 or 1 scanlines.
     if (jpeg_read_scanlines(info, samples, 1) != 1)
       return false;
 
     ImageFrame::PixelData* pixel = buffer.GetAddr(0, y);
     for (int x = 0; x < width; ++pixel, ++x)
       SetPixel<colorSpace>(pixel, samples, x);
 
     SkColorSpaceXform* xform = reader->Decoder()->ColorTransform();
-    if (JCS_RGB == colorSpace && xform) {
+    if (xform) {
       ImageFrame::PixelData* row = buffer.GetAddr(0, y);
       xform->apply(XformColorFormat(), row, XformColorFormat(), row, width,
                    kOpaque_SkAlphaType);
     }
   }
 
   buffer.SetPixelsChanged(true);
   return true;
 }
 
@@ skipping 144 matching lines @@
   // has failed.
   if (!reader_->Decode(only_size) && IsAllDataReceived())
     SetFailed();
 
   // If decoding is done or failed, we don't need the JPEGImageReader anymore.
   if (IsComplete(this, only_size) || Failed())
     reader_.reset();
 }
 
 }  // namespace blink