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

Unified Diff: ppapi/proxy/video_decoder_resource.h

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nullptr 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
« no previous file with comments | « ppapi/proxy/video_capture_resource.cc ('k') | ppapi/proxy/video_decoder_resource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/video_decoder_resource.h
diff --git a/ppapi/proxy/video_decoder_resource.h b/ppapi/proxy/video_decoder_resource.h
index 8f66e4a7dfa76a67503fa05cb5865c81de22687d..f8ba17579bd56c07b3fd81b9e43c747afcb3530c 100644
--- a/ppapi/proxy/video_decoder_resource.h
+++ b/ppapi/proxy/video_decoder_resource.h
@@ -7,12 +7,12 @@
#include <stdint.h>
+#include <memory>
#include <queue>
#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "ppapi/proxy/connection.h"
#include "ppapi/proxy/plugin_resource.h"
@@ -85,12 +85,12 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource
private:
// Struct to hold a shared memory buffer.
struct ShmBuffer {
- ShmBuffer(scoped_ptr<base::SharedMemory> shm,
+ ShmBuffer(std::unique_ptr<base::SharedMemory> shm,
uint32_t size,
uint32_t shm_id);
~ShmBuffer();
- const scoped_ptr<base::SharedMemory> shm;
+ const std::unique_ptr<base::SharedMemory> shm;
void* addr;
// Index into shm_buffers_ vector, used as an id. This should map 1:1 to
// the index on the host side of the proxy.
« no previous file with comments | « ppapi/proxy/video_capture_resource.cc ('k') | ppapi/proxy/video_decoder_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698