Update libpng to 1.6.22

third_party/WebKit/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 20 matching lines @@
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #include "platform/image-decoders/png/PNGImageDecoder.h"
 
-#include "platform/Histogram.h"
 #include "png.h"
 #include "wtf/Threading.h"

[RyanSturm, 2016/06/03 21:55:31]

You shouldn't need wtf/threading.h since you removed the
DEFINE_THREAD_SAFE_STATIC_LOCAL

[msarett, 2016/06/06 14:18:16]

Thanks! Done.

 
 #if !defined(PNG_LIBPNG_VER_MAJOR) || !defined(PNG_LIBPNG_VER_MINOR)
 #error version error: compile against a versioned libpng.
 #endif
 #if USE(QCMSLIB)
 #include "qcms.h"
 #endif
 
 #if PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)
 #define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
@@ skipping 120 matching lines @@
 {
 }
 
 void PNGImageDecoder::headerAvailable()
 {
     png_structp png = m_reader->pngPtr();
     png_infop info = m_reader->infoPtr();
     png_uint_32 width = png_get_image_width(png, info);
     png_uint_32 height = png_get_image_height(png, info);
 
-    DEFINE_THREAD_SAFE_STATIC_LOCAL(blink::CustomCountHistogram,
-        dimensionsLocationHistogram,
-        new blink::CustomCountHistogram("Blink.DecodedImage.EffectiveDimensionsLocation.PNG", 0, 50000, 50));
-    dimensionsLocationHistogram.count(m_reader->getReadOffset() - png->current_buffer_size - 1);
-
     // Protect against large PNGs. See http://bugzil.la/251381 for more details.
     const unsigned long maxPNGSize = 1000000UL;
     if (width > maxPNGSize || height > maxPNGSize) {
         longjmp(JMPBUF(png), 1);
         return;
     }
 
     // Set the image size now that the image header is available.
     if (!setSize(width, height)) {
         longjmp(JMPBUF(png), 1);
@@ skipping 37 matching lines @@
         } else {
             char* profileName = nullptr;
             int compressionType = 0;
 #if (PNG_LIBPNG_VER < 10500)
             png_charp profile = nullptr;
 #else
             png_bytep profile = nullptr;
 #endif
             png_uint_32 profileLength = 0;
             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
-                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+                setColorProfileAndTransform((char*) profile, profileLength, imageHasAlpha, false /* useSRGB */);
             }
         }
 #endif // PNG_iCCP_SUPPORTED
     }
 #endif // USE(QCMSLIB)
 
     if (!hasColorProfile()) {
         // Deal with gamma and keep it under our control.
         const double inverseGamma = 0.45455;
         const double defaultGamma = 2.2;
@@ skipping 184 matching lines @@
     // has failed.
     if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the PNGImageReader anymore.
     if (isComplete(this) || failed())
         m_reader.reset();
 }
 
 } // namespace blink