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

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

Issue 1988783003: 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/window_capturer_null.cc
diff --git a/webrtc/modules/desktop_capture/window_capturer_null.cc b/webrtc/modules/desktop_capture/window_capturer_null.cc
index 5f32c3d71ccf4f51e2217205d4dcd8f680c94bec..3fe21cf7189322e1c1e5fb0d516ba531d8a1bfb6 100755
--- a/webrtc/modules/desktop_capture/window_capturer_null.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_null.cc
@@ -34,17 +34,13 @@ class WindowCapturerNull : public WindowCapturer {
void Capture(const DesktopRegion& region) override;
private:
- Callback* callback_;
+ Callback* callback_ = nullptr;
RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerNull);
};
-WindowCapturerNull::WindowCapturerNull()
- : callback_(NULL) {
-}
-
-WindowCapturerNull::~WindowCapturerNull() {
-}
+WindowCapturerNull::WindowCapturerNull() {}
+WindowCapturerNull::~WindowCapturerNull() {}
bool WindowCapturerNull::GetWindowList(WindowList* windows) {
// Not implemented yet.
@@ -70,7 +66,7 @@ void WindowCapturerNull::Start(Callback* callback) {
void WindowCapturerNull::Capture(const DesktopRegion& region) {
// Not implemented yet.
- callback_->OnCaptureCompleted(NULL);
+ callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
}
} // namespace
« no previous file with comments | « webrtc/modules/desktop_capture/window_capturer_mac.mm ('k') | webrtc/modules/desktop_capture/window_capturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698