diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-22 14:18:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-13 16:11:59 +0100 |
| commit | 7869ec5823da36a3ce33b379d3d664204756cad5 (patch) | |
| tree | 45b692a4ed986b0a8932f2f6a183ed9408439e33 /src/core/desktop_screen_qt.h | |
| parent | ffb13e6927ae14a7185bb45ee0dfd03973e5ebb0 (diff) | |
Adaptations for Chromium 86
Change-Id: I7e0ebecdbb68cfff0b574c966f3fa80d28680e1c
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/desktop_screen_qt.h')
| -rw-r--r-- | src/core/desktop_screen_qt.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/core/desktop_screen_qt.h b/src/core/desktop_screen_qt.h index f6b252789..f47cfabbc 100644 --- a/src/core/desktop_screen_qt.h +++ b/src/core/desktop_screen_qt.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -40,32 +40,17 @@ #ifndef DESKTOP_SCREEN_QT_H #define DESKTOP_SCREEN_QT_H -#include "ui/display/screen.h" - -#include <set> +#include "ui/display/screen_base.h" namespace QtWebEngineCore { -class DesktopScreenQt : public display::Screen +class DesktopScreenQt : public display::ScreenBase { public: - // Overridden from gfx::Screen: - gfx::Point GetCursorScreenPoint() override; - bool IsWindowUnderCursor(gfx::NativeWindow) override; - gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; - int GetNumDisplays() const override; - std::vector<display::Display>& GetAllDisplays() const override; - display::Display GetDisplayNearestWindow(gfx::NativeWindow window) const override; - display::Display GetDisplayNearestPoint(const gfx::Point& point) const override; - display::Display GetDisplayMatching(const gfx::Rect& match_rect) const override; - display::Display GetPrimaryDisplay() const override; - void AddObserver(display::DisplayObserver* observer) override; - void RemoveObserver(display::DisplayObserver* observer) override; + DesktopScreenQt(); + ~DesktopScreenQt() override; - gfx::NativeWindow GetLocalProcessWindowAtPoint(const gfx::Point &point, - const std::set<gfx::NativeWindow> &ignore) override; -private: - std::set<display::DisplayObserver *> m_observers; + display::Display GetDisplayNearestWindow(gfx::NativeWindow /*window*/) const override; }; } // namespace QtWebEngineCore |