5477961acf
This reverts commit 913b34e5891823007c5adc7580a4d59126d51cac. Reason for revert: Suspected for breaking chromium tests. The WebRTC import was reverted, see: https://chromium-review.googlesource.com/c/chromium/src/+/3322494 Due to for example failures like: https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20CFI/21522/overview Example tests: WebRtcScreenCaptureBrowserTestWithPicker Original change's description: > Reland "Linux capturers: organize X11 and Wayland implementations into separate folders" > > Bug: webrtc:13429 > Change-Id: Ib5e429fe248f058387e23b77339558ca7d064466 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/240184 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Mark Foltz <mfoltz@chromium.org> > Commit-Queue: Mark Foltz <mfoltz@chromium.org> > Cr-Commit-Position: refs/heads/main@{#35493} TBR=mbonadei@webrtc.org,grulja@gmail.com,mfoltz@chromium.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I6d05062c9bc947d5bc6f9db5f6861cbf37d4b9bc No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:13429 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/240380 Reviewed-by: Henrik Boström <hbos@webrtc.org> Auto-Submit: Henrik Boström <hbos@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Owners-Override: Henrik Boström <hbos@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35501}
46 lines
1.2 KiB
C++
46 lines
1.2 KiB
C++
/*
|
|
* Copyright (c) 2017 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_ATOM_CACHE_H_
|
|
#define MODULES_DESKTOP_CAPTURE_LINUX_X_ATOM_CACHE_H_
|
|
|
|
#include <X11/X.h>
|
|
#include <X11/Xlib.h>
|
|
|
|
namespace webrtc {
|
|
|
|
// A cache of Atom. Each Atom object is created on demand.
|
|
class XAtomCache final {
|
|
public:
|
|
explicit XAtomCache(::Display* display);
|
|
~XAtomCache();
|
|
|
|
::Display* display() const;
|
|
|
|
Atom WmState();
|
|
Atom WindowType();
|
|
Atom WindowTypeNormal();
|
|
Atom IccProfile();
|
|
|
|
private:
|
|
// If |*atom| is None, this function uses XInternAtom() to retrieve an Atom.
|
|
Atom CreateIfNotExist(Atom* atom, const char* name);
|
|
|
|
::Display* const display_;
|
|
Atom wm_state_ = None;
|
|
Atom window_type_ = None;
|
|
Atom window_type_normal_ = None;
|
|
Atom icc_profile_ = None;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_LINUX_X_ATOM_CACHE_H_
|