1 files changed, 43 insertions, 26 deletions

diff --git a/src/core/native_web_keyboard_event_qt.cpp b/src/core/native_web_keyboard_event_qt.cpp
index 77bc068c7..9a5576fbb 100644
--- a/src/core/native_web_keyboard_event_qt.cpp
+++ b/src/core/native_web_keyboard_event_qt.cpp
@@ -1,61 +1,77 @@
-// Copyright (C) 2016 The Qt Company Ltd.
+// 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)
 {
-    if (!event)
+    if (!nativeEvent)
         return nullptr;
 
-    QKeyEvent *keyEvent = reinterpret_cast<QKeyEvent *>(event);
-    return reinterpret_cast<gfx::NativeEvent>(keyEvent->clone());
+    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)
 {
 }
 
@@ -63,10 +79,10 @@ NativeWebKeyboardEvent &NativeWebKeyboardEvent::operator=(const NativeWebKeyboar
 {
     if (this == &other)
         return *this;
-    WebKeyboardEvent::operator=(other);
+    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;
 }
 
@@ -75,3 +91,4 @@ NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
 }
 
 }  // namespace content
+#endif // !defined(Q_OS_MACOS)