e9ab88570b
This reverts commit 3a285224b62b04fc84ce027b0306bcf9ef26041f. Reason for revert: Still breaking downstream projects due to not using forward headers. I will talk to Mark separately about the usage. Original change's description: > Reland "Linux capturers: organize X11 and Wayland implementations into separate folders" > > Bug: webrtc:13429 > Change-Id: I6e88de4f7ebcb64076312d83ac2c79db24f85ad8 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239841 > Commit-Queue: Mark Foltz <mfoltz@chromium.org> > Reviewed-by: Mark Foltz <mfoltz@chromium.org> > Cr-Commit-Position: refs/heads/main@{#35481} TBR=grulja@gmail.com,mfoltz@chromium.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I1f75e3d89495f2a9a31d0f4406a3efdf0d95f74a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:13429 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/240064 Owners-Override: Christoffer Jansson <jansson@google.com> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Christoffer Jansson <jansson@google.com> Cr-Commit-Position: refs/heads/main@{#35484}
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/constructor_magic.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_
|