Re-enable DrMemory test for ICOImageDecoderTests.parseAndDecodeByteByByte.

third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

 /*
  * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "platform/image-decoders/FastSharedBufferReader.h"
 #include "platform/image-decoders/bmp/BMPImageReader.h"
 #include <memory>
 
 namespace blink {
 
 class PNGImageDecoder;
 
 // This class decodes the ICO and CUR image formats.
 class PLATFORM_EXPORT ICOImageDecoder final : public ImageDecoder {
+    WTF_MAKE_NONCOPYABLE(ICOImageDecoder);

[scroggo_chromium, 2016/06/24 21:36:24]

Weird that this wasn't here before...

 public:
     ICOImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBytes);
     ~ICOImageDecoder() override;
 
     // ImageDecoder:
     String filenameExtension() const override { return "ico"; }
     void onSetData(SegmentReader*) override;
     IntSize size() const override;
     IntSize frameSizeAtIndex(size_t) const override;
     bool setSize(unsigned width, unsigned height) override;
@@ skipping 23 matching lines @@
         IntPoint m_hotSpot;
         uint32_t m_imageOffset;
         uint32_t m_byteSize;
     };
 
     // Returns true if |a| is a preferable icon entry to |b|.
     // Larger sizes, or greater bitdepths at the same size, are preferable.
     static bool compareEntries(const IconDirectoryEntry& a, const IconDirectoryEntry& b);
 
     // ImageDecoder:
-    virtual void decodeSize() { decode(0, true); }
+    void decodeSize() override { decode(0, true); }
     size_t decodeFrameCount() override;
     void decode(size_t index) override { decode(index, false); }
 
     // TODO (scroggo): These functions are identical to functions in BMPImageReader. Share code?
     inline uint8_t readUint8(size_t offset) const
     {
         return m_fastReader.getOneByte(m_decodedOffset + offset);
     }
 
     inline uint16_t readUint16(int offset) const
@@ skipping 54 matching lines @@
     // BMPImageReader takes over this will not be updated further.
     size_t m_decodedOffset;
 
     // Which type of file (ICO/CUR) this is.
     FileType m_fileType;
 
     // The headers for the ICO.
     typedef Vector<IconDirectoryEntry> IconDirectoryEntries;
     IconDirectoryEntries m_dirEntries;
 
+    // Count of directory entries is parsed from header before initializing
+    // m_dirEntries. m_dirEntries is populated only when full header
+    // information including directory entries is available.
+    size_t m_dirEntriesCount;
+
     // The image decoders for the various frames.
     typedef Vector<std::unique_ptr<BMPImageReader>> BMPReaders;
     BMPReaders m_bmpReaders;
     typedef Vector<std::unique_ptr<PNGImageDecoder>> PNGDecoders;
     PNGDecoders m_pngDecoders;
 
     // Valid only while a BMPImageReader is decoding, this holds the size
     // for the particular entry being decoded.
     IntSize m_frameSize;
 };
 
 } // namespace blink
 
 #endif