third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.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/ico/ICOImageDecoder.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/GIFImageReader.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..7bfe240a00d5498ee9b815067c6fe99eafc3eec3 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

@@ -33,7 +33,6 @@

#include "platform/image-decoders/FastSharedBufferReader.h"

#include "platform/image-decoders/bmp/BMPImageReader.h"

-#include <memory>

namespace blink {

@@ -160,9 +159,9 @@ private:

IconDirectoryEntries m_dirEntries;

// The image decoders for the various frames.

- typedef Vector<std::unique_ptr<BMPImageReader>> BMPReaders;

+ typedef Vector<OwnPtr<BMPImageReader>> BMPReaders;

BMPReaders m_bmpReaders;

- typedef Vector<std::unique_ptr<PNGImageDecoder>> PNGDecoders;

+ typedef Vector<OwnPtr<PNGImageDecoder>> PNGDecoders;

PNGDecoders m_pngDecoders;

// Valid only while a BMPImageReader is decoding, this holds the size