318da51f99
The content_unittests failure was caused by wrong path in the cfi blacklist (when the files from x11 folder were moved to the linux folder by this change). Bug: chromium:682122 Change-Id: I4f7f6c5a73a981feeac18494749f85935e812981 Reviewed-on: https://webrtc-review.googlesource.com/c/110461 Commit-Queue: Tomáš Popela <tomas.popela@gmail.com> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Brave Yao <braveyao@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25621}
40 lines
1.1 KiB
C++
40 lines
1.1 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.
|
|
*/
|
|
|
|
#ifndef MODULES_DESKTOP_CAPTURE_LINUX_X_ERROR_TRAP_H_
|
|
#define MODULES_DESKTOP_CAPTURE_LINUX_X_ERROR_TRAP_H_
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Helper class that registers X Window error handler. Caller can use
|
|
// GetLastErrorAndDisable() to get the last error that was caught, if any.
|
|
class XErrorTrap {
|
|
public:
|
|
explicit XErrorTrap(Display* display);
|
|
~XErrorTrap();
|
|
|
|
// Returns last error and removes unregisters the error handler.
|
|
int GetLastErrorAndDisable();
|
|
|
|
private:
|
|
XErrorHandler original_error_handler_;
|
|
bool enabled_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(XErrorTrap);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_LINUX_X_ERROR_TRAP_H_
|