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

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

Issue 2030333003: Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.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
Index: webrtc/modules/desktop_capture/desktop_frame_win.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.cc b/webrtc/modules/desktop_capture/desktop_frame_win.cc
index 6adce92f39145319e46f9b92ce0fb23ce9aea7f1..624b729203b4fc8bbd45dfa4a74fc8cd756a135e 100644
--- a/webrtc/modules/desktop_capture/desktop_frame_win.cc
+++ b/webrtc/modules/desktop_capture/desktop_frame_win.cc
@@ -30,7 +30,7 @@
}
// static
-std::unique_ptr<DesktopFrameWin> DesktopFrameWin::Create(
+DesktopFrameWin* DesktopFrameWin::Create(
DesktopSize size,
SharedMemoryFactory* shared_memory_factory,
HDC hdc) {
@@ -60,9 +60,9 @@
return nullptr;
}
- return std::unique_ptr<DesktopFrameWin>(
- new DesktopFrameWin(size, bytes_per_row, reinterpret_cast<uint8_t*>(data),
- std::move(shared_memory), bitmap));
+ return new DesktopFrameWin(size, bytes_per_row,
+ reinterpret_cast<uint8_t*>(data),
+ std::move(shared_memory), bitmap);
}
} // namespace webrtc
« no previous file with comments | « webrtc/modules/desktop_capture/desktop_frame_win.h ('k') | webrtc/modules/desktop_capture/screen_capture_frame_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698