webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc - Issue 1902323002: Modify ScreenCaptureFrameQueue into a template

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/desktop_and_cursor_composer_unittest.cc

Issue 1902323002: Modify ScreenCaptureFrameQueue into a template (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fix build break in linux Created 4 years, 8 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/BUILD.gn ('k') | webrtc/modules/desktop_capture/desktop_capture.gypi » ('j') | webrtc/modules/desktop_capture/screen_capture_queue.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc

diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc

index 6652a1af71e1125e02bfca000539cbdf2a45e971..d0a8e6b4fa07331743824541ce017d709530fcce 100644

--- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc

+++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc

@@ -59,9 +59,9 @@ uint32_t BlendPixels(uint32_t dest, uint32_t src) {

return b + (g << 8) + (r << 16) + 0xff000000;

}

-DesktopFrame* CreateTestFrame() {

- DesktopFrame* frame =

- new BasicDesktopFrame(DesktopSize(kScreenWidth, kScreenHeight));

+std::unique_ptr<DesktopFrame> CreateTestFrame() {

+ std::unique_ptr<DesktopFrame> frame(

+ new BasicDesktopFrame(DesktopSize(kScreenWidth, kScreenHeight)));

uint32_t* data = reinterpret_cast<uint32_t*>(frame->data());

for (int y = 0; y < kScreenHeight; ++y) {

for (int x = 0; x < kScreenWidth; ++x) {