components/webp_transcode/webp_decoder.h - Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr

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: components/webp_transcode/webp_decoder.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Build fix Created 4 years, 8 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

« components/variations/service/variations_service_unittest.cc ('K') | « components/webdata_services/web_data_service_wrapper.cc ('k') | components/webp_transcode/webp_decoder_unittest.mm » ('j') | components/wifi/fake_wifi_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/webp_transcode/webp_decoder.h

diff --git a/components/webp_transcode/webp_decoder.h b/components/webp_transcode/webp_decoder.h

index 1fa93f78c1be83b433e348210d9d02b96d755083..1cfd6ffad8a7c57b90a166f6939342ef969309ff 100644

--- a/components/webp_transcode/webp_decoder.h

+++ b/components/webp_transcode/webp_decoder.h

@@ -8,9 +8,10 @@

#import <Foundation/Foundation.h>

#include <stddef.h>

+#include <memory>

#include "base/mac/scoped_nsobject.h"

#include "base/memory/ref_counted.h"

-#include "base/memory/scoped_ptr.h"

#include "third_party/libwebp/webp/decode.h"

@class NSData;

@@ -66,7 +67,7 @@ class WebpDecoder : public base::RefCountedThreadSafe<WebpDecoder> {

scoped_refptr<WebpDecoder::Delegate> delegate_;

WebPDecoderConfig config_;

WebpDecoder::State state_;

- scoped_ptr<WebPIDecoder, WebPIDecoderDeleter> incremental_decoder_;

+ std::unique_ptr<WebPIDecoder, WebPIDecoderDeleter> incremental_decoder_;

base::scoped_nsobject<NSData> output_buffer_;

base::scoped_nsobject<NSMutableData> features_;

int has_alpha_;