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

Side by Side Diff: webrtc/modules/desktop_capture/shared_memory.h

Issue 1923133002: Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Don't remove #include "scoped_ptr.h" from .h files Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_
13 13
14 #include <stddef.h> 14 #include <stddef.h>
15 15
16 #if defined(WEBRTC_WIN) 16 #if defined(WEBRTC_WIN)
17 #include <windows.h> 17 #include <windows.h>
18 #endif 18 #endif
19 19
20 #include <memory>
21
20 #include "webrtc/base/constructormagic.h" 22 #include "webrtc/base/constructormagic.h"
21 #include "webrtc/base/scoped_ptr.h" 23 #include "webrtc/base/scoped_ptr.h"
22 #include "webrtc/typedefs.h" 24 #include "webrtc/typedefs.h"
23 25
24 namespace webrtc { 26 namespace webrtc {
25 27
26 // SharedMemory is a base class for shared memory. It stores all required 28 // SharedMemory is a base class for shared memory. It stores all required
27 // parameters of the buffer, but doesn't have any logic to allocate or destroy 29 // parameters of the buffer, but doesn't have any logic to allocate or destroy
28 // the actual buffer. DesktopCapturer consumers that need to use shared memory 30 // the actual buffer. DesktopCapturer consumers that need to use shared memory
29 // for video frames must extend this class with creation and destruction logic 31 // for video frames must extend this class with creation and destruction logic
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 private: 64 private:
63 RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemory); 65 RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemory);
64 }; 66 };
65 67
66 // Interface used to create SharedMemory instances. 68 // Interface used to create SharedMemory instances.
67 class SharedMemoryFactory { 69 class SharedMemoryFactory {
68 public: 70 public:
69 SharedMemoryFactory() {} 71 SharedMemoryFactory() {}
70 virtual ~SharedMemoryFactory() {} 72 virtual ~SharedMemoryFactory() {}
71 73
72 virtual rtc::scoped_ptr<SharedMemory> CreateSharedMemory(size_t size) = 0; 74 virtual std::unique_ptr<SharedMemory> CreateSharedMemory(size_t size) = 0;
73 75
74 private: 76 private:
75 RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemoryFactory); 77 RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemoryFactory);
76 }; 78 };
77 79
78 } // namespace webrtc 80 } // namespace webrtc
79 81
80 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ 82 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_
81 83
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698