admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[XProto] Add SharedXDisplay::IgnoreXServerGrabs"

Browse Source 
This reverts commit cf8ea9c25903edb2c907a3cf18e1d31e0196e2e9.

Reason for revert: Breaks an upstream project.

Original change's description:
> [XProto] Add SharedXDisplay::IgnoreXServerGrabs
> 
> This is necessary for Chromium CL:
> https://chromium-review.googlesource.com/c/chromium/src/+/2327373
> 
> BUG=chromium:1066670
> 
> Change-Id: I8c5e5976d6c4737135254b9715b3aa5c885bfc8c
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180773
> Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#31901}

TBR=jamiewalch@chromium.org,sergeyu@chromium.org,thomasanderson@chromium.org

Change-Id: I666996581e78e783d8028c601559f0c5871a7145
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1066670
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181362
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31903}
This commit is contained in:
Andrey Logvin 2020-08-11 08:24:29 +00:00 committed by Commit Bot
parent faa233ccab
commit c61e780dc8
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/desktop_capture/BUILD.gn
View File

@ -400,7 +400,6 @@ rtc_library("desktop_capture_generic") {
"Xfixes",
"Xrender",
"Xrandr",
"Xtst",
]
}

12
modules/desktop_capture/linux/shared_x_display.cc
View File

@ -11,7 +11,6 @@
#include "modules/desktop_capture/linux/shared_x_display.h"
#include <X11/Xlib.h>
#include <X11/extensions/XTest.h>
#include <algorithm>
@ -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

5
modules/desktop_capture/linux/shared_x_display.h
View File

@ -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;