Revert of Do not consolidate data in BMPImageDecoder

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

Index: Source/platform/image-decoders/ico/ICOImageDecoder.h
diff --git a/Source/platform/image-decoders/ico/ICOImageDecoder.h b/Source/platform/image-decoders/ico/ICOImageDecoder.h
index 5cc71c0c5e7c64a9f8cf3fc4025809c4e42bbae1..b504098c0f573919a7f99a8598b867c1a4247676 100644
--- a/Source/platform/image-decoders/ico/ICOImageDecoder.h
+++ b/Source/platform/image-decoders/ico/ICOImageDecoder.h
@@ -85,14 +85,12 @@ private:
 
     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.