Changeset 105618 in webkit

Timestamp:

Jan 23, 2012 6:45:23 AM (12 years ago)

Author:

mario@webkit.org

Message:

[GTK] Refactor GTK's accessibilitity code to be more modular
​https://bugs.webkit.org/show_bug.cgi?id=76783

Reviewed by Martin Robinson.

New files for the implementation of the AtkAction interface,
containing the related code from WebKitAccessibleWrapperAtk.cpp.

• accessibility/gtk/WebKitAccessibleInterfaceAction.cpp: Added.

(core):
(webkitAccessibleActionInterfaceInit):
(webkitAccessibleActionDoAction):
(webkitAccessibleActionGetNActions):
(webkitAccessibleActionGetDescription):
(webkitAccessibleActionGetKeybinding):
(webkitAccessibleActionGetName):

• accessibility/gtk/WebKitAccessibleInterfaceAction.h: Added.

• accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code

related to the implementation of the AtkAction interface.

Add new files to build files.

• GNUmakefile.list.am: Add WebKitAccessibleInterfaceAction.[h|cpp].
• WebCore.gypi: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• accessibility/gtk/WebKitAccessibleInterfaceAction.cpp (added)
• accessibility/gtk/WebKitAccessibleInterfaceAction.h (added)
• accessibility/gtk/WebKitAccessibleWrapperAtk.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-23  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        [GTK] Refactor GTK's accessibilitity code to be more modular
+        https://bugs.webkit.org/show_bug.cgi?id=76783
+
+        Reviewed by Martin Robinson.
+
+        New files for the implementation of the AtkAction interface,
+        containing the related code from WebKitAccessibleWrapperAtk.cpp.
+
+        * accessibility/gtk/WebKitAccessibleInterfaceAction.cpp: Added.
+        (core):
+        (webkitAccessibleActionInterfaceInit):
+        (webkitAccessibleActionDoAction):
+        (webkitAccessibleActionGetNActions):
+        (webkitAccessibleActionGetDescription):
+        (webkitAccessibleActionGetKeybinding):
+        (webkitAccessibleActionGetName):
+        * accessibility/gtk/WebKitAccessibleInterfaceAction.h: Added.
+
+        * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code
+        related to the implementation of the AtkAction interface.
+
+        Add new files to build files.
+
+        * GNUmakefile.list.am: Add WebKitAccessibleInterfaceAction.[h|cpp].
+        * WebCore.gypi: Ditto.
+
 2012-01-23  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4425 +4425 @@
         Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h \
         Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp \
+        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.cpp \
+        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.h \
         Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp \
         Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h \

trunk/Source/WebCore/WebCore.gypi

@@ -1769 +1769 @@
             'accessibility/gtk/WebKitAccessibleHyperlink.cpp',
             'accessibility/gtk/WebKitAccessibleHyperlink.h',
+            'accessibility/gtk/WebKitAccessibleInterfaceAction.cpp',
+            'accessibility/gtk/WebKitAccessibleInterfaceAction.h',
             'accessibility/gtk/WebKitAccessibleUtil.cpp',
             'accessibility/gtk/WebKitAccessibleUtil.h',

trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp

@@ -64 +64 @@
 #include "TextIterator.h"
 #include "WebKitAccessibleHyperlink.h"
+#include "WebKitAccessibleInterfaceAction.h"
 #include "WebKitAccessibleUtil.h"
 #include "htmlediting.h"
@@ -108 +109 @@
 
     return core(WEBKIT_ACCESSIBLE(object));
-}
-
-static AccessibilityObject* core(AtkAction* action)
-{
-    return core(ATK_OBJECT(action));
 }
 
@@ -869 +865 @@
 }
 
-static gboolean webkit_accessible_action_do_action(AtkAction* action, gint i)
-{
-    g_return_val_if_fail(!i, FALSE);
-    return core(action)->performDefaultAction();
-}
-
-static gint webkit_accessible_action_get_n_actions(AtkAction* action)
-{
-    return 1;
-}
-
-static const gchar* webkit_accessible_action_get_description(AtkAction* action, gint i)
-{
-    g_return_val_if_fail(!i, 0);
-    // TODO: Need a way to provide/localize action descriptions.
-    notImplemented();
-    return "";
-}
-
-static const gchar* webkit_accessible_action_get_keybinding(AtkAction* action, gint i)
-{
-    g_return_val_if_fail(!i, 0);
-    // FIXME: Construct a proper keybinding string.
-    return returnString(core(action)->accessKey().string());
-}
-
-static const gchar* webkit_accessible_action_get_name(AtkAction* action, gint i)
-{
-    g_return_val_if_fail(!i, 0);
-    return returnString(core(action)->actionVerb());
-}
-
-static void atk_action_interface_init(AtkActionIface* iface)
-{
-    iface->do_action = webkit_accessible_action_do_action;
-    iface->get_n_actions = webkit_accessible_action_get_n_actions;
-    iface->get_description = webkit_accessible_action_get_description;
-    iface->get_keybinding = webkit_accessible_action_get_keybinding;
-    iface->get_name = webkit_accessible_action_get_name;
-}
-
 // Selection (for controls)
 
@@ -2485 +2440 @@
 
 static const GInterfaceInfo AtkInterfacesInitFunctions[] = {
-    {(GInterfaceInitFunc)atk_action_interface_init,
-     (GInterfaceFinalizeFunc) 0, 0},
+    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleActionInterfaceInit), 0, 0},
     {(GInterfaceInitFunc)atk_selection_interface_init,
      (GInterfaceFinalizeFunc) 0, 0},