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/window_capturer_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/window_capturer_win.cc
diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc
index c7c312a17e957b3d132ed00ec7ab6c2f4a1e3cf0..702324372bd60c6fbc2d17977c75866214bed014 100644
--- a/webrtc/modules/desktop_capture/window_capturer_win.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_win.cc
@@ -95,11 +95,11 @@
void Capture(const DesktopRegion& region) override;
private:
- Callback* callback_ = nullptr;
-
- // HWND and HDC for the currently selected window or nullptr if window is not
+ Callback* callback_;
+
+ // HWND and HDC for the currently selected window or NULL if window is not
// selected.
- HWND window_ = nullptr;
+ HWND window_;
DesktopSize previous_size_;
@@ -112,8 +112,13 @@
RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerWin);
};
-WindowCapturerWin::WindowCapturerWin() {}
-WindowCapturerWin::~WindowCapturerWin() {}
+WindowCapturerWin::WindowCapturerWin()
+ : callback_(NULL),
+ window_(NULL) {
+}
+
+WindowCapturerWin::~WindowCapturerWin() {
+}
bool WindowCapturerWin::GetWindowList(WindowList* windows) {
WindowList result;
@@ -163,13 +168,13 @@
void WindowCapturerWin::Capture(const DesktopRegion& region) {
if (!window_) {
LOG(LS_ERROR) << "Window hasn't been selected: " << GetLastError();
- callback_->OnCaptureResult(Result::ERROR_PERMANENT, nullptr);
+ callback_->OnCaptureCompleted(NULL);
return;
}
// Stop capturing if the window has been closed.
if (!IsWindow(window_)) {
- callback_->OnCaptureResult(Result::ERROR_PERMANENT, nullptr);
+ callback_->OnCaptureCompleted(NULL);
return;
}
@@ -177,13 +182,12 @@
// behavior on mace. Window can be temporarily invisible during the
// transition of full screen mode on/off.
if (IsIconic(window_) || !IsWindowVisible(window_)) {
- std::unique_ptr<DesktopFrame> frame(
- new BasicDesktopFrame(DesktopSize(1, 1)));
+ BasicDesktopFrame* frame = new BasicDesktopFrame(DesktopSize(1, 1));
memset(frame->data(), 0, frame->stride() * frame->size().height());
previous_size_ = frame->size();
window_size_map_[window_] = previous_size_;
- callback_->OnCaptureResult(Result::SUCCESS, std::move(frame));
+ callback_->OnCaptureCompleted(frame);
return;
}
@@ -191,22 +195,22 @@
DesktopRect cropped_rect;
if (!GetCroppedWindowRect(window_, &cropped_rect, &original_rect)) {
LOG(LS_WARNING) << "Failed to get window info: " << GetLastError();
- callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
+ callback_->OnCaptureCompleted(NULL);
return;
}
HDC window_dc = GetWindowDC(window_);
if (!window_dc) {
LOG(LS_WARNING) << "Failed to get window DC: " << GetLastError();
- callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
+ callback_->OnCaptureCompleted(NULL);
return;
}
std::unique_ptr<DesktopFrameWin> frame(
- DesktopFrameWin::Create(cropped_rect.size(), nullptr, window_dc));
+ DesktopFrameWin::Create(cropped_rect.size(), NULL, window_dc));
if (!frame.get()) {
ReleaseDC(window_, window_dc);
- callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
+ callback_->OnCaptureCompleted(NULL);
return;
}
@@ -259,7 +263,7 @@
frame.reset();
}
- callback_->OnCaptureResult(Result::SUCCESS, std::move(frame));
+ callback_->OnCaptureCompleted(frame.release());
}
} // namespace
« no previous file with comments | « webrtc/modules/desktop_capture/window_capturer_unittest.cc ('k') | webrtc/modules/desktop_capture/window_capturer_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698