diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index b40b7430f6..eb26f5c7bb 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -400,7 +400,6 @@ rtc_library("desktop_capture_generic") { "Xfixes", "Xrender", "Xrandr", - "Xtst", ] } diff --git a/modules/desktop_capture/linux/shared_x_display.cc b/modules/desktop_capture/linux/shared_x_display.cc index f0b35f62d3..c475db6e78 100644 --- a/modules/desktop_capture/linux/shared_x_display.cc +++ b/modules/desktop_capture/linux/shared_x_display.cc @@ -11,7 +11,6 @@ #include "modules/desktop_capture/linux/shared_x_display.h" #include -#include #include @@ -87,15 +86,4 @@ void SharedXDisplay::ProcessPendingXEvents() { } } -void SharedXDisplay::IgnoreXServerGrabs() { - int test_event_base = 0; - int test_error_base = 0; - int major = 0; - int minor = 0; - if (XTestQueryExtension(display(), &test_event_base, &test_error_base, &major, - &minor)) { - XTestGrabControl(display(), true); - } -} - } // namespace webrtc diff --git a/modules/desktop_capture/linux/shared_x_display.h b/modules/desktop_capture/linux/shared_x_display.h index 64c498c134..98b6101904 100644 --- a/modules/desktop_capture/linux/shared_x_display.h +++ b/modules/desktop_capture/linux/shared_x_display.h @@ -18,7 +18,6 @@ #include "api/ref_counted_base.h" #include "api/scoped_refptr.h" #include "rtc_base/constructor_magic.h" -#include "rtc_base/system/rtc_export.h" // Including Xlib.h will involve evil defines (Bool, Status, True, False), which // easily conflict with other headers. @@ -28,7 +27,7 @@ typedef union _XEvent XEvent; namespace webrtc { // A ref-counted object to store XDisplay connection. -class RTC_EXPORT SharedXDisplay : public rtc::RefCountedBase { +class SharedXDisplay : public rtc::RefCountedBase { public: class XEventHandler { public: @@ -63,8 +62,6 @@ class RTC_EXPORT SharedXDisplay : public rtc::RefCountedBase { // Processes pending XEvents, calling corresponding event handlers. void ProcessPendingXEvents(); - void IgnoreXServerGrabs(); - protected: ~SharedXDisplay() override;