Changeset 105726 in webkit

Timestamp:

Jan 24, 2012 4:04:16 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 AtkImage interface,
containing the related code from WebKitAccessibleWrapperAtk.cpp.

• accessibility/gtk/WebKitAccessibleInterfaceImage.cpp: Added.

(core):
(webkitAccessibleImageInterfaceInit):
(webkitAccessibleImageGetImagePosition):
(webkitAccessibleImageGetImageDescription):
(webkitAccessibleImageGetImageSize):

• accessibility/gtk/WebKitAccessibleInterfaceImage.h: Added.
• accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code

related to the implementation of the AtkImage interface.

Add new files to build files.

• GNUmakefile.list.am: Add WebKitAccessibleInterfaceImage.[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/WebKitAccessibleInterfaceImage.cpp (added)
• accessibility/gtk/WebKitAccessibleInterfaceImage.h (added)
• accessibility/gtk/WebKitAccessibleWrapperAtk.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-24  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 AtkImage interface,
+        containing the related code from WebKitAccessibleWrapperAtk.cpp.
+
+        * accessibility/gtk/WebKitAccessibleInterfaceImage.cpp: Added.
+        (core):
+        (webkitAccessibleImageInterfaceInit):
+        (webkitAccessibleImageGetImagePosition):
+        (webkitAccessibleImageGetImageDescription):
+        (webkitAccessibleImageGetImageSize):
+        * accessibility/gtk/WebKitAccessibleInterfaceImage.h: Added.
+        * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code
+        related to the implementation of the AtkImage interface.
+
+        Add new files to build files.
+
+        * GNUmakefile.list.am: Add WebKitAccessibleInterfaceImage.[h|cpp].
+        * WebCore.gypi: Ditto.
+
 2012-01-24  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4434 +4434 @@
         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp \
         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.h \
+        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp \
+        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.h \
         Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp \
         Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h \

trunk/Source/WebCore/WebCore.gypi

@@ -1358 +1358 @@
             'accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp',
             'accessibility/gtk/WebKitAccessibleInterfaceHypertext.h',
+            'accessibility/gtk/WebKitAccessibleInterfaceImage.cpp',
+            'accessibility/gtk/WebKitAccessibleInterfaceImage.h',
             'accessibility/gtk/WebKitAccessibleUtil.cpp',
             'accessibility/gtk/WebKitAccessibleUtil.h',

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

@@ -70 +70 @@
 #include "WebKitAccessibleInterfaceHyperlinkImpl.h"
 #include "WebKitAccessibleInterfaceHypertext.h"
+#include "WebKitAccessibleInterfaceImage.h"
 #include "WebKitAccessibleUtil.h"
 #include "htmlediting.h"
@@ -122 +123 @@
 {
     return core(ATK_OBJECT(text));
-}
-
-static AccessibilityObject* core(AtkImage* image)
-{
-    return core(ATK_OBJECT(image));
 }
 
@@ -1836 +1832 @@
 }
 
-// Image
-
-static void webkit_accessible_image_get_image_position(AtkImage* image, gint* x, gint* y, AtkCoordType coordType)
-{
-    IntRect rect = core(image)->elementRect();
-    contentsRelativeToAtkCoordinateType(core(image), coordType, rect, x, y);
-}
-
-static const gchar* webkit_accessible_image_get_image_description(AtkImage* image)
-{
-    return returnString(core(image)->accessibilityDescription());
-}
-
-static void webkit_accessible_image_get_image_size(AtkImage* image, gint* width, gint* height)
-{
-    IntSize size = core(image)->size();
-
-    if (width)
-        *width = size.width();
-    if (height)
-        *height = size.height();
-}
-
-static void atk_image_interface_init(AtkImageIface* iface)
-{
-    iface->get_image_position = webkit_accessible_image_get_image_position;
-    iface->get_image_description = webkit_accessible_image_get_image_description;
-    iface->get_image_size = webkit_accessible_image_get_image_size;
-}
-
 // Table
 
@@ -2127 +2093 @@
      (GInterfaceFinalizeFunc) 0, 0},
     {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleComponentInterfaceInit), 0, 0},
-    {(GInterfaceInitFunc)atk_image_interface_init,
-     (GInterfaceFinalizeFunc) 0, 0},
+    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleImageInterfaceInit), 0, 0},
     {(GInterfaceInitFunc)atk_table_interface_init,
      (GInterfaceFinalizeFunc) 0, 0},