92ea95e34a
In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC from src/webrtc to src/ (in order to preserve an healthy git history). This CL takes care of fixing header guards, #include paths, etc... NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true TBR=tommi@webrtc.org Bug: chromium:611808 Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578 Reviewed-on: https://webrtc-review.googlesource.com/1561 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19846}
70 lines
1.8 KiB
C++
70 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/x11/x_error_trap.h"
|
|
|
|
#include <assert.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;
|
|
|
|
int XServerErrorHandler(Display* display, XErrorEvent* error_event) {
|
|
assert(g_xserver_error_trap_enabled);
|
|
g_last_xserver_error_code = error_event->error_code;
|
|
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() {
|
|
if (enabled_)
|
|
GetLastErrorAndDisable();
|
|
}
|
|
|
|
} // namespace webrtc
|