mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 23:57:59 +01:00
3e70781361
This is a follow-up to https://webrtc-review.googlesource.com/c/src/+/106280. This time the whole code base is covered. Some files may have not been fixed though, whenever the IWYU tool was breaking the build. Bug: webrtc:8311 Change-Id: I2c31f552a87e887d33931d46e87b6208b1e483ef Reviewed-on: https://webrtc-review.googlesource.com/c/111965 Commit-Queue: Yves Gerey <yvesg@google.com> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25830}
69 lines
1.8 KiB
C++
69 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/linux/x_error_trap.h"
|
|
|
|
#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;
|
|
|
|
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
|