Changeset 231853 in webkit

Timestamp:

May 16, 2018 10:54:50 AM (6 years ago)

Author:

Fujii Hironori

Message:

[Win] Implement WebPage::handleEditingKeyboardEvent
​https://bugs.webkit.org/show_bug.cgi?id=185327

Reviewed by Alexey Proskuryakov.

• WebProcess/WebPage/win/WebPageWin.cpp:

(WebKit::WebPage::handleEditingKeyboardEvent): Copied from WebKitLegacy.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/win/WebPageWin.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-16  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] Implement WebPage::handleEditingKeyboardEvent
+        https://bugs.webkit.org/show_bug.cgi?id=185327
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::WebPage::handleEditingKeyboardEvent): Copied from WebKitLegacy.
+
 2018-05-16  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp

@@ -34 +34 @@
 #include "WebProcess.h"
 #include <WebCore/BackForwardController.h>
+#include <WebCore/Editor.h>
 #include <WebCore/EventHandler.h>
 #include <WebCore/EventNames.h>
@@ -261 +262 @@
     return mapKey ? keyPressCommandsMap->get(mapKey) : 0;
 }
+
+bool WebPage::handleEditingKeyboardEvent(WebCore::KeyboardEvent* event)
+{
+    auto* frame = downcast<Node>(event->target())->document().frame();
+    ASSERT(frame);
+
+    auto* keyEvent = event->underlyingPlatformEvent();
+    if (!keyEvent || keyEvent->isSystemKey()) // Do not treat this as text input if it's a system key event.
+        return false;
+
+    auto command = frame->editor().command(interpretKeyEvent(event));
+
+    if (keyEvent->type() == PlatformEvent::RawKeyDown) {
+        // WebKit doesn't have enough information about mode to decide
+        // how commands that just insert text if executed via Editor
+        // should be treated, so we leave it upon WebCore to either
+        // handle them immediately (e.g. Tab that changes focus) or
+        // let a keypress event be generated (e.g. Tab that inserts a
+        // Tab character, or Enter).
+        return !command.isTextInsertion() && command.execute(event);
+    }
+
+    if (command.execute(event))
+        return true;
+
+    // Don't insert null or control characters as they can result in unexpected behaviour.
+    if (event->charCode() < ' ')
+        return false;
+
+    return frame->editor().insertText(keyEvent->text(), event);
+}
+
 } // namespace WebKit