webrtc/modules/desktop_capture/screen_capturer_mock_objects.h - Issue 2030333003: Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

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

« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc ('k') | webrtc/modules/desktop_capture/screen_capturer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

diff --git a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

index 1f17e8c8be3e57b1caf53c5fe38d169ff5602708..7264249e0fb0c70403ece92b121b5b54e7678c13 100644

--- a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

+++ b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

@@ -36,13 +36,7 @@

MockScreenCapturerCallback() {}

virtual ~MockScreenCapturerCallback() {}

- MOCK_METHOD2(OnCaptureResultPtr,

- void(DesktopCapturer::Result result,

- std::unique_ptr<DesktopFrame>* frame));

- void OnCaptureResult(DesktopCapturer::Result result,

- std::unique_ptr<DesktopFrame> frame) override {

- OnCaptureResultPtr(result, &frame);

- }

+ MOCK_METHOD1(OnCaptureCompleted, void(DesktopFrame*));

private:

RTC_DISALLOW_COPY_AND_ASSIGN(MockScreenCapturerCallback);