Commit d8b19b69 authored by Jamie Walch's avatar Jamie Walch Committed by Commit Bot

Enable cursor compositing for uncurtained Mac.

I previously thought that the cursor was always part of the captured
screen on Mac, but it turns out that's only true if curtain mode is
active. This CL makes creating of a composing capturer conditional
on the curtain mode setting, which should give the correct beheviour
for both remote support and uncurtained remote access.

Bug: 1048774
Change-Id: I28cc01b0b615794e06cd31308c10a40af550e0e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036546
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Reviewed-by: default avatarJoe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738347}
parent c0f63b53
...@@ -97,12 +97,12 @@ uint32_t BasicDesktopEnvironment::GetDesktopSessionId() const { ...@@ -97,12 +97,12 @@ uint32_t BasicDesktopEnvironment::GetDesktopSessionId() const {
std::unique_ptr<DesktopAndCursorConditionalComposer> std::unique_ptr<DesktopAndCursorConditionalComposer>
BasicDesktopEnvironment::CreateComposingVideoCapturer() { BasicDesktopEnvironment::CreateComposingVideoCapturer() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
// MacOS always includes the mouse cursor in the captured image. // Mac includes the mouse cursor in the captured image in curtain mode.
return nullptr; if (options_.enable_curtaining())
#else return nullptr;
#endif
return std::make_unique<DesktopAndCursorConditionalComposer>( return std::make_unique<DesktopAndCursorConditionalComposer>(
CreateVideoCapturer()); CreateVideoCapturer());
#endif
} }
std::unique_ptr<webrtc::DesktopCapturer> std::unique_ptr<webrtc::DesktopCapturer>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment