diff options
Diffstat (limited to 'src/core/native_web_keyboard_event_qt.cpp')
| -rw-r--r-- | src/core/native_web_keyboard_event_qt.cpp | 112 |
1 files changed, 50 insertions, 62 deletions
diff --git a/src/core/native_web_keyboard_event_qt.cpp b/src/core/native_web_keyboard_event_qt.cpp index b2e857aaf..9a5576fbb 100644 --- a/src/core/native_web_keyboard_event_qt.cpp +++ b/src/core/native_web_keyboard_event_qt.cpp @@ -1,101 +1,88 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE.Chromium file. -#include "content/public/browser/native_web_keyboard_event.h" -#include <QKeyEvent> +#include <QtCore/qglobal.h> -namespace { +#if !defined(Q_OS_MACOS) +#include "native_web_keyboard_event_qt.h" + +#include <QtGui/QKeyEvent> + +namespace QtWebEngineCore { +gfx::NativeEvent ToNativeEvent(QKeyEvent *keyEvent) +{ + return reinterpret_cast<gfx::NativeEvent>(keyEvent); +} + +QKeyEvent *ToKeyEvent(gfx::NativeEvent nativeEvent) +{ + return reinterpret_cast<QKeyEvent *>(nativeEvent); +} +} // namespace QtWebEngineCore +namespace { // We need to copy |os_event| in NativeWebKeyboardEvent because it is // queued in RenderWidgetHost and may be passed and used // RenderViewHostDelegate::HandledKeybardEvent after the original aura // event is destroyed. -gfx::NativeEvent CopyEvent(gfx::NativeEvent event) +gfx::NativeEvent CopyEvent(gfx::NativeEvent nativeEvent) { - return event ? reinterpret_cast<gfx::NativeEvent>(new QKeyEvent(*reinterpret_cast<QKeyEvent*>(event))) : 0; + if (!nativeEvent) + return nullptr; + + QKeyEvent *keyEvent = QtWebEngineCore::ToKeyEvent(nativeEvent); + return QtWebEngineCore::ToNativeEvent(keyEvent->clone()); } -void DestroyEvent(gfx::NativeEvent event) +void DestroyEvent(gfx::NativeEvent nativeEvent) { - delete reinterpret_cast<QKeyEvent*>(event); + delete QtWebEngineCore::ToKeyEvent(nativeEvent); } +} // namespace -} // namespace - -using blink::WebKeyboardEvent; namespace content { -NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebKeyboardEvent const&, gfx::NativeView) - : os_event(0) - , skip_in_browser(false) +NativeWebKeyboardEvent::NativeWebKeyboardEvent(const blink::WebKeyboardEvent &web_event, gfx::NativeView) + : blink::WebKeyboardEvent(web_event) + , os_event(nullptr) + , skip_if_unhandled(false) { } -NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type, int, base::TimeTicks) - : os_event(0) - , skip_in_browser(false) +NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type, int modifiers, + base::TimeTicks timestamp) + : blink::WebKeyboardEvent(type, modifiers, timestamp) + , os_event(nullptr) + , skip_if_unhandled(false) { } NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event) - : os_event(CopyEvent(native_event)), - skip_in_browser(false) + : os_event(CopyEvent(native_event)) + , skip_if_unhandled(false) { } NativeWebKeyboardEvent::NativeWebKeyboardEvent(const NativeWebKeyboardEvent& other) - : WebKeyboardEvent(other), - os_event(CopyEvent(other.os_event)), - skip_in_browser(other.skip_in_browser) + : blink::WebKeyboardEvent(other) + , os_event(CopyEvent(other.os_event)) + , skip_if_unhandled(other.skip_if_unhandled) { } -NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(const NativeWebKeyboardEvent& other) { - WebKeyboardEvent::operator=(other); +NativeWebKeyboardEvent &NativeWebKeyboardEvent::operator=(const NativeWebKeyboardEvent &other) +{ + if (this == &other) + return *this; + blink::WebKeyboardEvent::operator=(other); DestroyEvent(os_event); os_event = CopyEvent(other.os_event); - skip_in_browser = other.skip_in_browser; + skip_if_unhandled = other.skip_if_unhandled; return *this; } @@ -104,3 +91,4 @@ NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { } } // namespace content +#endif // !defined(Q_OS_MACOS) |