Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(637)

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

Issue 2081013002: Re-enable DrMemory test for ICOImageDecoderTests.parseAndDecodeByteByByte. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit, comment. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h
diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h
index 0f875ffe6328a0940408ba4756d2c8053ba522f9..7a4c0cad43fc28b1ac82f09c45580263c265601a 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h
+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h
@@ -41,6 +41,7 @@ class PNGImageDecoder;
// This class decodes the ICO and CUR image formats.
class PLATFORM_EXPORT ICOImageDecoder final : public ImageDecoder {
+ WTF_MAKE_NONCOPYABLE(ICOImageDecoder);
public:
ICOImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBytes);
~ICOImageDecoder() override;
@@ -72,6 +73,12 @@ private:
struct IconDirectoryEntry {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
+ IconDirectoryEntry()
+ : m_bitCount(0)
+ , m_imageOffset(0)
+ , m_byteSize(0)
+ {
+ }
IntSize m_size;
uint16_t m_bitCount;
IntPoint m_hotSpot;
@@ -84,7 +91,7 @@ private:
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); }

Powered by Google App Engine
This is Rietveld 408576698