Ignore PNG gamma chunk when PNG images have a color profile

Source/platform/image-decoders/png/PNGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Portions are Copyright (C) 2001 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 353 matching lines @@
         // the color profile or we'd need to decode into a gray-scale image buffer and
         // hand that to CoreGraphics.
         ColorProfile colorProfile;
         readColorProfile(png, info, colorProfile);
         bool decodedImageHasAlpha = (colorType & PNG_COLOR_MASK_ALPHA) || trnsCount;
         m_reader->createColorTransform(colorProfile, decodedImageHasAlpha);
         m_hasColorProfile = !!m_reader->colorTransform();
     }
 #endif
 
-    // Deal with gamma and keep it under our control.
-    double gamma;
-    if (!m_ignoreGammaAndColorProfile && png_get_gAMA(png, info, &gamma)) {
-        if ((gamma <= 0.0) || (gamma > cMaxGamma)) {
-            gamma = cInverseGamma;
-            png_set_gAMA(png, info, gamma);
+    if (!m_hasColorProfile) {
+        // Deal with gamma and keep it under our control.
+        double gamma;
+        if (!m_ignoreGammaAndColorProfile && png_get_gAMA(png, info, &gamma)) {
+            if ((gamma <= 0.0) || (gamma > cMaxGamma)) {
+                gamma = cInverseGamma;
+                png_set_gAMA(png, info, gamma);
+            }
+            png_set_gamma(png, cDefaultGamma, gamma);
+        } else {
+            png_set_gamma(png, cDefaultGamma, cInverseGamma);
         }
-        png_set_gamma(png, cDefaultGamma, gamma);
-    } else
-        png_set_gamma(png, cDefaultGamma, cInverseGamma);
+    }
 
     // Tell libpng to send us rows for interlaced pngs.
     if (interlaceType == PNG_INTERLACE_ADAM7)
         png_set_interlace_handling(png);
 
     // Update our info now.
     png_read_update_info(png, info);
     channels = png_get_channels(png, info);
     ASSERT(channels == 3 || channels == 4);
 
@@ skipping 155 matching lines @@
     // has failed.
     if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
     // If we're done decoding the image, we don't need the PNGImageReader
     // anymore.  (If we failed, |m_reader| has already been cleared.)
     else if (isComplete())
         m_reader.clear();
 }
 
 } // namespace blink