Index: third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp |
diff --git a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp |
index d444caa0bf644e481d7a9f15e3952de5ec2c4397..8c9937064f0fc802c20bf2cb594b35de8c3a4a81 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp |
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp |
@@ -38,7 +38,6 @@ |
#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 remov
msarett
2016/06/06 14:18:16
Thanks! Done.
|
@@ -181,11 +180,6 @@ void PNGImageDecoder::headerAvailable() |
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) { |
@@ -243,7 +237,7 @@ void PNGImageDecoder::headerAvailable() |
#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 |