Revert of Do not consolidate data in BMPImageDecoder

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 67 matching lines @@
     // 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); }
     size_t decodeFrameCount() override;
     void decode(size_t index) override { decode(index, false); }
 
     inline uint16_t readUint16(int offset) const
     {
-        // TODO (scroggo): This consolidates the data, meaning unnecessary copies.
-        return BMPImageReader::readUint16(&m_data->data()[m_decodedOffset + offset]);
+        return BMPImageReader::readUint16(m_data.get(), m_decodedOffset + offset);
     }
 
     inline uint32_t readUint32(int offset) const
     {
-        // TODO (scroggo): This consolidates the data, meaning unnecessary copies.
-        return BMPImageReader::readUint32(&m_data->data()[m_decodedOffset + offset]);
+        return BMPImageReader::readUint32(m_data.get(), m_decodedOffset + offset);
     }
 
     // If the desired PNGImageDecoder exists, gives it the appropriate data.
     void setDataForPNGDecoderAtIndex(size_t);
 
     // Decodes the entry at |index|.  If |onlySize| is true, stops decoding
     // after calculating the image size.  If decoding fails but there is no
     // more data coming, sets the "decode failure" flag.
     void decode(size_t index, bool onlySize);
 
@@ skipping 45 matching lines @@
     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