diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
| commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /modules/desktop_capture/linux/x_error_trap.cc | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
| download | webrtc-emu-31-release.tar.gz | |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'modules/desktop_capture/linux/x_error_trap.cc')
| -rw-r--r-- | modules/desktop_capture/linux/x_error_trap.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/modules/desktop_capture/linux/x_error_trap.cc b/modules/desktop_capture/linux/x_error_trap.cc index 53c907fc45..903aa86ab3 100644 --- a/modules/desktop_capture/linux/x_error_trap.cc +++ b/modules/desktop_capture/linux/x_error_trap.cc @@ -13,16 +13,10 @@ #include <assert.h> #include <stddef.h> -#if defined(TOOLKIT_GTK) -#include <gdk/gdk.h> -#endif // !defined(TOOLKIT_GTK) - namespace webrtc { namespace { -#if !defined(TOOLKIT_GTK) - // TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202. static bool g_xserver_error_trap_enabled = false; static int g_last_xserver_error_code = 0; @@ -33,32 +27,22 @@ int XServerErrorHandler(Display* display, XErrorEvent* error_event) { return 0; } -#endif // !defined(TOOLKIT_GTK) - } // namespace XErrorTrap::XErrorTrap(Display* display) : original_error_handler_(NULL), enabled_(true) { -#if defined(TOOLKIT_GTK) - gdk_error_trap_push(); -#else // !defined(TOOLKIT_GTK) assert(!g_xserver_error_trap_enabled); original_error_handler_ = XSetErrorHandler(&XServerErrorHandler); g_xserver_error_trap_enabled = true; g_last_xserver_error_code = 0; -#endif // !defined(TOOLKIT_GTK) } int XErrorTrap::GetLastErrorAndDisable() { enabled_ = false; -#if defined(TOOLKIT_GTK) - return gdk_error_trap_push(); -#else // !defined(TOOLKIT_GTK) assert(g_xserver_error_trap_enabled); XSetErrorHandler(original_error_handler_); g_xserver_error_trap_enabled = false; return g_last_xserver_error_code; -#endif // !defined(TOOLKIT_GTK) } XErrorTrap::~XErrorTrap() { |