webrtc/modules/desktop_capture/screen_capturer_mac.mm - Issue 2974613003: base->rtc_base: Update .c, .mm and .java files.

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_mac.mm

Issue 2974613003: base->rtc_base: Update .c, .mm and .java files. (Closed)

Patch Set: Created 3 years, 5 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:

Index: webrtc/modules/desktop_capture/screen_capturer_mac.mm

diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm

index f48b307742bac1f497cd2b5a30f97ef9ab776e95..78d977b473e33bc1a0e4563fed1c478565e19fcc 100644

--- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm

+++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm

@@ -21,13 +21,8 @@

#include <OpenGL/CGLMacro.h>

#include <OpenGL/OpenGL.h>

-#include "webrtc/base/checks.h"

-#include "webrtc/base/constructormagic.h"

-#include "webrtc/base/logging.h"

-#include "webrtc/base/macutils.h"

-#include "webrtc/base/timeutils.h"

-#include "webrtc/modules/desktop_capture/desktop_capturer.h"

#include "webrtc/modules/desktop_capture/desktop_capture_options.h"

+#include "webrtc/modules/desktop_capture/desktop_capturer.h"

#include "webrtc/modules/desktop_capture/desktop_frame.h"

#include "webrtc/modules/desktop_capture/desktop_geometry.h"

#include "webrtc/modules/desktop_capture/desktop_region.h"

@@ -37,6 +32,11 @@

#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"

#include "webrtc/modules/desktop_capture/screen_capturer_helper.h"

#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"

+#include "webrtc/rtc_base/checks.h"

+#include "webrtc/rtc_base/constructormagic.h"

+#include "webrtc/rtc_base/logging.h"

+#include "webrtc/rtc_base/macutils.h"

+#include "webrtc/rtc_base/timeutils.h"

// Once Chrome no longer supports OSX 10.8, everything within this

// preprocessor block can be removed. https://crbug.com/579255