Title: [280565] trunk/Source
Revision
280565
Author
hironori.fu...@sony.com
Date
2021-08-02 15:37:04 -0700 (Mon, 02 Aug 2021)

Log Message

[Win] ASSERTION FAILED: evt->type() == eventNames().keydownEvent || evt->type() == eventNames().keypressEvent in WebView::interpretKeyEvent since r280492
https://bugs.webkit.org/show_bug.cgi?id=228690

Reviewed by Brent Fulgham.

Source/WebKit:

* WebProcess/WebPage/win/WebPageWin.cpp:
(WebKit::WebPage::handleEditingKeyboardEvent): Return early unless the event is keydown or keypress.

Source/WebKitLegacy/win:

* WebView.cpp:
(WebView::handleEditingKeyboardEvent): Return early unless the event is keydown or keypress.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (280564 => 280565)


--- trunk/Source/WebKit/ChangeLog	2021-08-02 22:23:16 UTC (rev 280564)
+++ trunk/Source/WebKit/ChangeLog	2021-08-02 22:37:04 UTC (rev 280565)
@@ -1,3 +1,13 @@
+2021-08-02  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [Win] ASSERTION FAILED: evt->type() == eventNames().keydownEvent || evt->type() == eventNames().keypressEvent in WebView::interpretKeyEvent since r280492
+        https://bugs.webkit.org/show_bug.cgi?id=228690
+
+        Reviewed by Brent Fulgham.
+
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::WebPage::handleEditingKeyboardEvent): Return early unless the event is keydown or keypress.
+
 2021-08-02  Alex Christensen  <achristen...@webkit.org>
 
         Don't change invalid baseURLs from loadData or loadHTMLString to about:blank

Modified: trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp (280564 => 280565)


--- trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp	2021-08-02 22:23:16 UTC (rev 280564)
+++ trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp	2021-08-02 22:37:04 UTC (rev 280565)
@@ -265,6 +265,9 @@
     if (!keyEvent || keyEvent->isSystemKey()) // Do not treat this as text input if it's a system key event.
         return false;
 
+    if (event.type() != eventNames().keydownEvent && event.type() != eventNames().keypressEvent)
+        return false;
+
     auto command = frame->editor().command(interpretKeyEvent(&event));
 
     if (keyEvent->type() == PlatformEvent::RawKeyDown) {

Modified: trunk/Source/WebKitLegacy/win/ChangeLog (280564 => 280565)


--- trunk/Source/WebKitLegacy/win/ChangeLog	2021-08-02 22:23:16 UTC (rev 280564)
+++ trunk/Source/WebKitLegacy/win/ChangeLog	2021-08-02 22:37:04 UTC (rev 280565)
@@ -1,3 +1,13 @@
+2021-08-02  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [Win] ASSERTION FAILED: evt->type() == eventNames().keydownEvent || evt->type() == eventNames().keypressEvent in WebView::interpretKeyEvent since r280492
+        https://bugs.webkit.org/show_bug.cgi?id=228690
+
+        Reviewed by Brent Fulgham.
+
+        * WebView.cpp:
+        (WebView::handleEditingKeyboardEvent): Return early unless the event is keydown or keypress.
+
 2021-07-16  Megan Gardner  <megan_gard...@apple.com>
 
         Pipe App Highlight scrolling through UI Process in preparation for Note Overlay avoidance.

Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (280564 => 280565)


--- trunk/Source/WebKitLegacy/win/WebView.cpp	2021-08-02 22:23:16 UTC (rev 280564)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp	2021-08-02 22:37:04 UTC (rev 280565)
@@ -2359,6 +2359,9 @@
     if (!keyEvent || keyEvent->isSystemKey())  // do not treat this as text input if it's a system key event
         return false;
 
+    if (event.type() != eventNames().keydownEvent && event.type() != eventNames().keypressEvent)
+        return false;
+
     auto command = frame->editor().command(interpretKeyEvent(&event));
 
     if (keyEvent->type() == PlatformEvent::RawKeyDown) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to