Changeset 185416 in webkit

Timestamp:

Jun 10, 2015 8:17:53 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Move KeyBindingTranslator from platform to WebKit2 layer
​https://bugs.webkit.org/show_bug.cgi?id=145840

Reviewed by Martin Robinson.

It's currently used only by WebKit2 in the UI process and it's
another file built twice because of the GTK2 plugin process.

• PlatformGTK.cmake:

Source/WebKit2:

• UIProcess/API/gtk/WebKitWebViewBase.cpp:
• UIProcess/gtk/KeyBindingTranslator.cpp: Renamed from Source/WebCore/platform/gtk/KeyBindingTranslator.cpp.

(WebKit::backspaceCallback):
(WebKit::selectAllCallback):
(WebKit::cutClipboardCallback):
(WebKit::copyClipboardCallback):
(WebKit::pasteClipboardCallback):
(WebKit::toggleOverwriteCallback):
(WebKit::popupMenuCallback):
(WebKit::showHelpCallback):
(WebKit::deleteFromCursorCallback):
(WebKit::moveCursorCallback):
(WebKit::KeyBindingTranslator::KeyBindingTranslator):
(WebKit::KeyBindingTranslator::commandsForKeyEvent):

• UIProcess/gtk/KeyBindingTranslator.h: Renamed from Source/WebCore/platform/gtk/KeyBindingTranslator.h.

(WebKit::KeyBindingTranslator::addPendingEditorCommand):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PlatformGTK.cmake (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/PlatformGTK.cmake (modified) (1 diff)
• WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (2 diffs)
• WebKit2/UIProcess/gtk/KeyBindingTranslator.cpp (moved) (moved from trunk/Source/WebCore/platform/gtk/KeyBindingTranslator.cpp) (5 diffs)
• WebKit2/UIProcess/gtk/KeyBindingTranslator.h (moved) (moved from trunk/Source/WebCore/platform/gtk/KeyBindingTranslator.h) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move KeyBindingTranslator from platform to WebKit2 layer
+        https://bugs.webkit.org/show_bug.cgi?id=145840
+
+        Reviewed by Martin Robinson.
+
+        It's currently used only by WebKit2 in the UI process and it's
+        another file built twice because of the GTK2 plugin process.
+
+        * PlatformGTK.cmake:
+
 2015-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -221 +221 @@
     platform/gtk/GtkUtilities.cpp
     platform/gtk/GtkVersioning.c
-    platform/gtk/KeyBindingTranslator.cpp
     platform/gtk/LocalizedStringsGtk.cpp
     platform/gtk/PasteboardGtk.cpp

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move KeyBindingTranslator from platform to WebKit2 layer
+        https://bugs.webkit.org/show_bug.cgi?id=145840
+
+        Reviewed by Martin Robinson.
+
+        It's currently used only by WebKit2 in the UI process and it's
+        another file built twice because of the GTK2 plugin process.
+
+        * PlatformGTK.cmake:
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        * UIProcess/gtk/KeyBindingTranslator.cpp: Renamed from Source/WebCore/platform/gtk/KeyBindingTranslator.cpp.
+        (WebKit::backspaceCallback):
+        (WebKit::selectAllCallback):
+        (WebKit::cutClipboardCallback):
+        (WebKit::copyClipboardCallback):
+        (WebKit::pasteClipboardCallback):
+        (WebKit::toggleOverwriteCallback):
+        (WebKit::popupMenuCallback):
+        (WebKit::showHelpCallback):
+        (WebKit::deleteFromCursorCallback):
+        (WebKit::moveCursorCallback):
+        (WebKit::KeyBindingTranslator::KeyBindingTranslator):
+        (WebKit::KeyBindingTranslator::commandsForKeyEvent):
+        * UIProcess/gtk/KeyBindingTranslator.h: Renamed from Source/WebCore/platform/gtk/KeyBindingTranslator.h.
+        (WebKit::KeyBindingTranslator::addPendingEditorCommand):
+
 2015-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -283 +283 @@
     UIProcess/gtk/GestureController.cpp
     UIProcess/gtk/InputMethodFilter.cpp
+    UIProcess/gtk/KeyBindingTranslator.cpp
     UIProcess/gtk/RedirectedXCompositeWindow.cpp
     UIProcess/gtk/TextCheckerGtk.cpp

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -32 +32 @@
 #include "DrawingAreaProxyImpl.h"
 #include "InputMethodFilter.h"
+#include "KeyBindingTranslator.h"
 #include "NativeWebKeyboardEvent.h"
 #include "NativeWebMouseEvent.h"
@@ -54 +55 @@
 #include <WebCore/GtkUtilities.h>
 #include <WebCore/GtkVersioning.h>
-#include <WebCore/KeyBindingTranslator.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/PasteboardHelper.h>

trunk/Source/WebKit2/UIProcess/gtk/KeyBindingTranslator.cpp

@@ -20 +20 @@
 #include "KeyBindingTranslator.h"
 
-#include "GtkVersioning.h"
 #include <gdk/gdkkeysyms.h>
-#include <wtf/HashMap.h>
-
-namespace WebCore {
-
-typedef HashMap<int, const char*> IntConstCharHashMap;
+#include <gtk/gtk.h>
+
+namespace WebKit {
 
 static void backspaceCallback(GtkWidget* widget, KeyBindingTranslator* translator)
@@ -117 +114 @@
     const char* rawCommand = gtkDeleteCommands[deleteType][direction];
     if (!rawCommand)
-      return;
+        return;
 
     for (int i = 0; i < abs(count); i++)
@@ -186 +183 @@
 
 static const KeyCombinationEntry customKeyBindings[] = {
-    { GDK_b,         GDK_CONTROL_MASK,               "ToggleBold"    },
-    { GDK_i,         GDK_CONTROL_MASK,               "ToggleItalic"  },
-    { GDK_Escape,    0,                              "Cancel"        },
-    { GDK_greater,   GDK_CONTROL_MASK,               "Cancel"        },
-    { GDK_Tab,       0,                              "InsertTab"     },
-    { GDK_Tab,       GDK_SHIFT_MASK,                 "InsertBacktab" },
+    { GDK_KEY_b,         GDK_CONTROL_MASK,               "ToggleBold"    },
+    { GDK_KEY_i,         GDK_CONTROL_MASK,               "ToggleItalic"  },
+    { GDK_KEY_Escape,    0,                              "Cancel"        },
+    { GDK_KEY_greater,   GDK_CONTROL_MASK,               "Cancel"        },
+    { GDK_KEY_Tab,       0,                              "InsertTab"     },
+    { GDK_KEY_Tab,       GDK_SHIFT_MASK,                 "InsertBacktab" },
 };
 
@@ -198 +195 @@
     ASSERT(m_pendingEditorCommands.isEmpty());
 
-    // FIXME: Move KeyBindingTranslator to WebKit layer and remove the GTK2 code.
-#ifdef GTK_API_VERSION_2
-    gtk_bindings_activate_event(GTK_OBJECT(m_nativeWidget.get()), event);
-#else
     gtk_bindings_activate_event(G_OBJECT(m_nativeWidget.get()), event);
-#endif
-
     if (!m_pendingEditorCommands.isEmpty())
         return WTF::move(m_pendingEditorCommands);
 
     // Special-case enter keys for we want them to work regardless of modifier.
-    if ((event->keyval == GDK_Return || event->keyval == GDK_KP_Enter || event->keyval == GDK_ISO_Enter))
+    if ((event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter || event->keyval == GDK_KEY_ISO_Enter))
         return { "InsertNewLine" };
 
@@ -225 +216 @@
 }
 
-} // namespace WebCore
+} // namespace WebKit

trunk/Source/WebKit2/UIProcess/gtk/KeyBindingTranslator.h

@@ -20 +20 @@
 #define KeyBindingTranslator_h
 
-#include "GRefPtrGtk.h"
+#include <WebCore/GRefPtrGtk.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
@@ -26 +26 @@
 typedef struct _GdkEventKey GdkEventKey;
 
-namespace WebCore {
+namespace WebKit {
 
 class KeyBindingTranslator {
@@ -40 +40 @@
 };
 
-} // namespace WebCore
+} // namespace WebKit
 
 #endif