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

Unified Diff: webrtc/modules/desktop_capture/desktop_frame.cc

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 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
Index: webrtc/modules/desktop_capture/desktop_frame.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame.cc b/webrtc/modules/desktop_capture/desktop_frame.cc
index 054427cb772425e9e58643ac5173b6f67887fbce..6bc7b2e38f646f85972926544cd0e35f29e21764 100644
--- a/webrtc/modules/desktop_capture/desktop_frame.cc
+++ b/webrtc/modules/desktop_capture/desktop_frame.cc
@@ -78,17 +78,18 @@ DesktopFrame* BasicDesktopFrame::CopyOf(const DesktopFrame& frame) {
}
// static
-rtc::scoped_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
+std::unique_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
DesktopSize size,
SharedMemoryFactory* shared_memory_factory) {
size_t buffer_size =
size.width() * size.height() * DesktopFrame::kBytesPerPixel;
- rtc::scoped_ptr<SharedMemory> shared_memory;
- shared_memory = shared_memory_factory->CreateSharedMemory(buffer_size);
+ std::unique_ptr<SharedMemory> shared_memory;
+ shared_memory = rtc::ScopedToUnique(
+ shared_memory_factory->CreateSharedMemory(buffer_size));
if (!shared_memory)
return nullptr;
- return rtc_make_scoped_ptr(new SharedMemoryDesktopFrame(
+ return std::unique_ptr<DesktopFrame>(new SharedMemoryDesktopFrame(
size, size.width() * DesktopFrame::kBytesPerPixel,
std::move(shared_memory)));
}
@@ -104,7 +105,7 @@ SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(DesktopSize size,
SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(
DesktopSize size,
int stride,
- rtc::scoped_ptr<SharedMemory> shared_memory)
+ std::unique_ptr<SharedMemory> shared_memory)
: DesktopFrame(size,
stride,
reinterpret_cast<uint8_t*>(shared_memory->data()),

Powered by Google App Engine
This is Rietveld 408576698