zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of TOOLKIT_GTK define.

Browse Source 
This is not defined anywhere, including chromium.

Bug: None
Change-Id: If5e89880570a80dd5720e48ebaefb0eb2c37fab3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215360
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#34105}
This commit is contained in:
Byoungchan Lee
2021-04-16 07:03:36 +09:00
committed by WebRTC LUCI CQ
parent 816134a8aa
commit 0f506780aa
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/desktop_capture/linux/x_error_trap.cc
View File

@ -13,16 +13,10 @@
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
#if defined(TOOLKIT_GTK)
#include <gdk/gdk.h>
#endif // !defined(TOOLKIT_GTK)
namespace webrtc { namespace webrtc {
namespace { namespace {
#if !defined(TOOLKIT_GTK)
// TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202. // TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202.
static bool g_xserver_error_trap_enabled = false; static bool g_xserver_error_trap_enabled = false;
static int g_last_xserver_error_code = 0; static int g_last_xserver_error_code = 0;
@ -33,32 +27,22 @@ int XServerErrorHandler(Display* display, XErrorEvent* error_event) {
return 0; return 0;
} }
#endif // !defined(TOOLKIT_GTK)
} // namespace } // namespace
XErrorTrap::XErrorTrap(Display* display) XErrorTrap::XErrorTrap(Display* display)
: original_error_handler_(NULL), enabled_(true) { : original_error_handler_(NULL), enabled_(true) {
#if defined(TOOLKIT_GTK)
gdk_error_trap_push();
#else // !defined(TOOLKIT_GTK)
assert(!g_xserver_error_trap_enabled); assert(!g_xserver_error_trap_enabled);
original_error_handler_ = XSetErrorHandler(&XServerErrorHandler); original_error_handler_ = XSetErrorHandler(&XServerErrorHandler);
g_xserver_error_trap_enabled = true; g_xserver_error_trap_enabled = true;
g_last_xserver_error_code = 0; g_last_xserver_error_code = 0;
#endif // !defined(TOOLKIT_GTK)
} }
int XErrorTrap::GetLastErrorAndDisable() { int XErrorTrap::GetLastErrorAndDisable() {
enabled_ = false; enabled_ = false;
#if defined(TOOLKIT_GTK)
return gdk_error_trap_push();
#else // !defined(TOOLKIT_GTK)
assert(g_xserver_error_trap_enabled); assert(g_xserver_error_trap_enabled);
XSetErrorHandler(original_error_handler_); XSetErrorHandler(original_error_handler_);
g_xserver_error_trap_enabled = false; g_xserver_error_trap_enabled = false;
return g_last_xserver_error_code; return g_last_xserver_error_code;
#endif // !defined(TOOLKIT_GTK)
} }
XErrorTrap::~XErrorTrap() { XErrorTrap::~XErrorTrap() {