Index: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h |
diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h |
index e715be73e4675a5bc3e20703510a6c6a007c116f..18170f5ff537b9f497a02859ac11b30ca506c760 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h |
+++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h |
@@ -43,6 +43,7 @@ |
#include "platform/SharedBuffer.h" |
#include "platform/image-decoders/FastSharedBufferReader.h" |
#include "platform/image-decoders/gif/GIFImageDecoder.h" |
+#include "wtf/Allocator.h" |
#include "wtf/Noncopyable.h" |
#include "wtf/OwnPtr.h" |
#include "wtf/PassOwnPtr.h" |
@@ -82,8 +83,9 @@ enum GIFState { |
struct GIFFrameContext; |
// LZW decoder state machine. |
-class GIFLZWContext { |
+class GIFLZWContext final { |
USING_FAST_MALLOC(GIFLZWContext); |
+ WTF_MAKE_NONCOPYABLE(GIFLZWContext); |
public: |
GIFLZWContext(blink::GIFImageDecoder* client, const GIFFrameContext* frameContext) |
: codesize(0) |
@@ -134,7 +136,7 @@ private: |
// Data structure for one LZW block. |
struct GIFLZWBlock { |
- USING_FAST_MALLOC(GIFLZWBlock); |
+ DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); |
public: |
GIFLZWBlock(size_t position, size_t size) |
: blockPosition(position) |
@@ -146,8 +148,8 @@ public: |
size_t blockSize; |
}; |
-class GIFColorMap { |
- USING_FAST_MALLOC(GIFColorMap); |
+class GIFColorMap final { |
+ DISALLOW_NEW(); |
public: |
typedef Vector<blink::ImageFrame::PixelData> Table; |
@@ -276,7 +278,7 @@ private: |
bool m_isDataSizeDefined; |
}; |
-class PLATFORM_EXPORT GIFImageReader { |
+class PLATFORM_EXPORT GIFImageReader final { |
USING_FAST_MALLOC(GIFImageReader); WTF_MAKE_NONCOPYABLE(GIFImageReader); |
public: |
GIFImageReader(blink::GIFImageDecoder* client = 0) |