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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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/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 1ec9d3849a7565dd4909c495ab4e97e887ab4023..068b92194729184c0332c1219b84517b8f2a340b 100644
--- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h
+++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h
@@ -44,9 +44,8 @@
#include "platform/image-decoders/gif/GIFImageDecoder.h"
#include "wtf/Allocator.h"
#include "wtf/Noncopyable.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
#include "wtf/Vector.h"
+#include <memory>
#define MAX_DICTIONARY_ENTRY_BITS 12
#define MAX_DICTIONARY_ENTRIES 4096 // 2^MAX_DICTIONARY_ENTRY_BITS
@@ -267,7 +266,7 @@ private:
unsigned m_delayTime; // Display time, in milliseconds, for this image in a multi-image GIF.
- OwnPtr<GIFLZWContext> m_lzwContext;
+ std::unique_ptr<GIFLZWContext> m_lzwContext;
Vector<GIFLZWBlock> m_lzwBlocks; // LZW blocks for this frame.
GIFColorMap m_localColorMap;
@@ -353,7 +352,7 @@ private:
GIFColorMap m_globalColorMap;
int m_loopCount; // Netscape specific extension block to control the number of animation loops a GIF renders.
- Vector<OwnPtr<GIFFrameContext>> m_frames;
+ Vector<std::unique_ptr<GIFFrameContext>> m_frames;
RefPtr<blink::SegmentReader> m_data;
bool m_parseCompleted;

Powered by Google App Engine
This is Rietveld 408576698