Changeset 248291 in webkit

Timestamp:

Aug 5, 2019, 11:47:10 PM (7 years ago)

Author:

Fujii Hironori

Message:

Source/WebKit:
[Win][MiniBrowser][WK2] Unhandled key events should be bubbled up to the parent window
​https://bugs.webkit.org/show_bug.cgi?id=200464

Reviewed by Ross Kirsling.

• UIProcess/API/C/WKNativeEvent.h: Define WKNativeEventPtr for WIN32.

Tools:
[MiniBrowser][WK2] Unhandled key events should be bubbled up to the parent window
​https://bugs.webkit.org/show_bug.cgi?id=200464

Reviewed by Ross Kirsling.

When WK2 WebView is focused, short cut keys (e.g. Alt-F to open File
menu, Alt-F4 to close window, and etc) don't work.

WK1 WebView doesn't have this issue because it processes key events
properly.

• MiniBrowser/win/WebKitBrowserWindow.cpp:

(WebKitBrowserWindow::WebKitBrowserWindow):
(WebKitBrowserWindow::didNotHandleKeyEvent): Added. Send the
unhandled key events to the main window.

• MiniBrowser/win/WebKitBrowserWindow.h:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKNativeEvent.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/win/WebKitBrowserWindow.cpp (modified) (2 diffs)
• Tools/MiniBrowser/win/WebKitBrowserWindow.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-05  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][MiniBrowser][WK2] Unhandled key events should be bubbled up to the parent window
+        https://bugs.webkit.org/show_bug.cgi?id=200464
+
+        Reviewed by Ross Kirsling.
+
+        * UIProcess/API/C/WKNativeEvent.h: Define WKNativeEventPtr for WIN32.
+
 2019-08-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/C/WKNativeEvent.h

@@ -47 +47 @@
 typedef union _GdkEvent GdkEvent;
 typedef const GdkEvent* WKNativeEventPtr;
+#elif defined(WIN32)
+typedef const struct tagMSG* WKNativeEventPtr;
 #else
 typedef const void* WKNativeEventPtr;

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-05  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [MiniBrowser][WK2] Unhandled key events should be bubbled up to the parent window
+        https://bugs.webkit.org/show_bug.cgi?id=200464
+
+        Reviewed by Ross Kirsling.
+
+        When WK2 WebView is focused, short cut keys (e.g. Alt-F to open File
+        menu, Alt-F4 to close window, and etc) don't work.
+
+        WK1 WebView doesn't have this issue because it processes key events
+        properly.
+
+        * MiniBrowser/win/WebKitBrowserWindow.cpp:
+        (WebKitBrowserWindow::WebKitBrowserWindow):
+        (WebKitBrowserWindow::didNotHandleKeyEvent): Added. Send the
+        unhandled key events to the main window.
+        * MiniBrowser/win/WebKitBrowserWindow.h:
+
 2019-08-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp

@@ -146 +146 @@
     uiClient.base.clientInfo = this;
     uiClient.createNewPage = createNewPage;
+    uiClient.didNotHandleKeyEvent = didNotHandleKeyEvent;
     WKPageSetPageUIClient(page, &uiClient.base);
 
@@ -378 +379 @@
     return newPage.leakRef();
 }
+
+void WebKitBrowserWindow::didNotHandleKeyEvent(WKPageRef, WKNativeEventPtr event, const void* clientInfo)
+{
+    auto& thisWindow = toWebKitBrowserWindow(clientInfo);
+    DefWindowProc(thisWindow.hwnd(), event->message, event->wParam, event->lParam);
+}

trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.h

@@ -70 +70 @@
     static void didReceiveAuthenticationChallenge(WKPageRef, WKAuthenticationChallengeRef, const void*);
     static WKPageRef createNewPage(WKPageRef, WKPageConfigurationRef, WKNavigationActionRef, WKWindowFeaturesRef, const void *);
+    static void didNotHandleKeyEvent(WKPageRef, WKNativeEventPtr, const void*);
 
     WKRetainPtr<WKViewRef> m_view;