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

Add missing DesktopCapturer methods.

DesktopCapturer is not a pure virtual interface, meaning that wrapping
implementations such as DesktopAndCursorConditionalComposer need to be
updated whenever a new method is added--the compiler will not give an
error in this case. This was the cause of the multi-monitor breakage
for relative pointer mode.

Change-Id: I5a37a0e1fc47bf72cf9ccc7810c9e17d0a418237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063412
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Gary Kacmarcik <garykac@chromium.org>
Auto-Submit: Jamie Walch <jamiewalch@chromium.org>
Reviewed-by: default avatarGary Kacmarcik <garykac@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742384}
parent 44dc5548
......@@ -69,4 +69,21 @@ void DesktopAndCursorConditionalComposer::SetExcludedWindow(
capturer_->SetExcludedWindow(window);
}
bool DesktopAndCursorConditionalComposer::GetSourceList(SourceList* sources) {
return capturer_->GetSourceList(sources);
}
bool DesktopAndCursorConditionalComposer::SelectSource(SourceId id) {
return capturer_->SelectSource(id);
}
bool DesktopAndCursorConditionalComposer::FocusOnSelectedSource() {
return capturer_->FocusOnSelectedSource();
}
bool DesktopAndCursorConditionalComposer::IsOccluded(
const webrtc::DesktopVector& pos) {
return capturer_->IsOccluded(pos);
}
} // namespace remoting
......@@ -35,6 +35,10 @@ class DesktopAndCursorConditionalComposer : public webrtc::DesktopCapturer {
shared_memory_factory) override;
void CaptureFrame() override;
void SetExcludedWindow(webrtc::WindowId window) override;
bool GetSourceList(SourceList* sources) override;
bool SelectSource(SourceId id) override;
bool FocusOnSelectedSource() override;
bool IsOccluded(const webrtc::DesktopVector& pos) override;
private:
DesktopAndCursorConditionalComposer(
......
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