third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 068b92194729184c0332c1219b84517b8f2a340b..1ec9d3849a7565dd4909c495ab4e97e887ab4023 100644

--- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

+++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

@@ -44,8 +44,9 @@

#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

@@ -266,7 +267,7 @@ private:

unsigned m_delayTime; // Display time, in milliseconds, for this image in a multi-image GIF.

- std::unique_ptr<GIFLZWContext> m_lzwContext;

+ OwnPtr<GIFLZWContext> m_lzwContext;

Vector<GIFLZWBlock> m_lzwBlocks; // LZW blocks for this frame.

GIFColorMap m_localColorMap;

@@ -352,7 +353,7 @@ private:

GIFColorMap m_globalColorMap;

int m_loopCount; // Netscape specific extension block to control the number of animation loops a GIF renders.

- Vector<std::unique_ptr<GIFFrameContext>> m_frames;

+ Vector<OwnPtr<GIFFrameContext>> m_frames;

RefPtr<blink::SegmentReader> m_data;

bool m_parseCompleted;