Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1611486 - P1 - Cherry-pick webrct desktop sharing X hang fixes;r=dminor

Browse Source 
4b47dd39a7

Differential Revision: https://phabricator.services.mozilla.com/D61000

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nico Grunbaum 2020-01-30 05:47:41 +00:00
parent a4cdc71de2
commit 6a8f257529
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
View File

@ -201,15 +201,6 @@ void DesktopAndCursorComposer::OnMouseCursor(MouseCursor* cursor) {
cursor_.reset(cursor);
}
void DesktopAndCursorComposer::OnMouseCursorPosition(
MouseCursorMonitor::CursorState state,
const DesktopVector& position) {
if (!use_desktop_relative_cursor_position_) {
cursor_state_ = state;
cursor_position_ = position;
}
}
void DesktopAndCursorComposer::OnMouseCursorPosition(
const DesktopVector& position) {
if (use_desktop_relative_cursor_position_) {

2
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
View File

@ -70,8 +70,6 @@ class DesktopAndCursorComposer : public DesktopCapturer,
// MouseCursorMonitor::Callback interface.
void OnMouseCursor(MouseCursor* cursor) override;
void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
const DesktopVector& position) override;
void OnMouseCursorPosition(const DesktopVector& position) override;
const std::unique_ptr<DesktopCapturer> desktop_capturer_;

3
media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor.h
View File

@ -54,13 +54,12 @@ class MouseCursorMonitor {
// relative to the |window| specified in the constructor.
// Deprecated: use the following overload instead.
virtual void OnMouseCursorPosition(CursorState state,
const DesktopVector& position) = 0;
const DesktopVector& position) {}
// Called in response to Capture(). |position| indicates cursor absolute
// position on the system in fullscreen coordinate, i.e. the top-left
// monitor always starts from (0, 0).
// TODO(zijiehe): Ensure all implementations return the absolute position.
// TODO(zijiehe): Make this function pure virtual after Chromium changes.
// TODO(zijiehe): Current this overload works correctly only when capturing
// mouse cursor against fullscreen.
virtual void OnMouseCursorPosition(const DesktopVector& position) {}

4
media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
View File

@ -31,9 +31,7 @@ class MouseCursorMonitorTest : public testing::Test,
cursor_image_.reset(cursor_image);
}
void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
const DesktopVector& position) override {
state_ = state;
void OnMouseCursorPosition(const DesktopVector& position) override {
position_ = position;
position_received_ = true;
}