IDEA-CR-65080: Fix JBCefBrowser.myCefClient.addKeyboardHandler

1. remove the handler on dispose
2. replace onPreKeyEvent (not getting called with CEF ver. 81) with onKeyEvent

(cherry picked from commit ffc440e8394b77e45b8087e0535c1036029ba4aa)
(cherry picked from commit a41401296f629f4937ccdc96dc664a91dd30e7fb)

GitOrigin-RevId: f540459a857d318048d3ad853b68f27b70ec56b7

platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java

@@ -49,6 +49,7 @@ public class JBCefBrowser implements JBCefDisposable {
   @Nullable private volatile JBCefCookieManager myJBCefCookieManager;
   @NotNull private final CefFocusHandler myCefFocusHandler;
   @Nullable private final CefLifeSpanHandler myLifeSpanHandler;
+  @NotNull private final CefKeyboardHandler myKeyboardHandler;
   @NotNull private final DisposeHelper myDisposeHelper = new DisposeHelper();
 
   private final boolean myIsDefaultClient;
@@ -203,9 +204,9 @@ public class JBCefBrowser implements JBCefDisposable {
       });
     }
 
-    myCefClient.addKeyboardHandler(new CefKeyboardHandlerAdapter() {
+    myCefClient.addKeyboardHandler(myKeyboardHandler = new CefKeyboardHandlerAdapter() {
       @Override
-      public boolean onPreKeyEvent(CefBrowser browser, CefKeyEvent cefKeyEvent, BoolRef is_keyboard_shortcut) {
+      public boolean onKeyEvent(CefBrowser browser, CefKeyEvent cefKeyEvent) {
         Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
         boolean consume = focusOwner != browser.getUIComponent();
         if (consume && SystemInfoRt.isMac && isUpDownKeyEvent(cefKeyEvent)) return true; // consume
@@ -366,6 +367,7 @@ public class JBCefBrowser implements JBCefDisposable {
   public void dispose() {
     myDisposeHelper.dispose(() -> {
       myCefClient.removeFocusHandler(myCefFocusHandler, myCefBrowser);
+      myCefClient.removeKeyboardHandler(myKeyboardHandler, myCefBrowser);
       if (myLifeSpanHandler != null) myCefClient.removeLifeSpanHandler(myLifeSpanHandler, myCefBrowser);
       myCefBrowser.stopLoad();
       myCefBrowser.close(false);