Changeset 105740 in webkit


Ignore:
Timestamp:
Jan 24, 2012 8:22:57 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 AtkValue interface,
containing the related code from WebKitAccessibleWrapperAtk.cpp.

  • accessibility/gtk/WebKitAccessibleInterfaceValue.cpp: Added.

(core):
(webkitAccessibleValueInterfaceInit):
(webkitAccessibleValueGetCurrentValue):
(webkitAccessibleValueGetMaximumValue):
(webkitAccessibleValueGetMinimumValue):
(webkitAccessibleValueSetCurrentValue):
(webkitAccessibleValueGetMinimumIncrement):

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

related to the implementation of the AtkValue interface.

Add new files to build files.

  • GNUmakefile.list.am: Add WebKitAccessibleInterfaceValue.[h|cpp].
  • WebCore.gypi: Ditto.
Location:
trunk/Source/WebCore
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r105739 r105740  
     12012-01-24  Mario Sanchez Prada  <msanchez@igalia.com>
     2
     3        [GTK] Refactor GTK's accessibilitity code to be more modular
     4        https://bugs.webkit.org/show_bug.cgi?id=76783
     5
     6        Reviewed by Martin Robinson.
     7
     8        New files for the implementation of the AtkValue interface,
     9        containing the related code from WebKitAccessibleWrapperAtk.cpp.
     10
     11        * accessibility/gtk/WebKitAccessibleInterfaceValue.cpp: Added.
     12        (core):
     13        (webkitAccessibleValueInterfaceInit):
     14        (webkitAccessibleValueGetCurrentValue):
     15        (webkitAccessibleValueGetMaximumValue):
     16        (webkitAccessibleValueGetMinimumValue):
     17        (webkitAccessibleValueSetCurrentValue):
     18        (webkitAccessibleValueGetMinimumIncrement):
     19        * accessibility/gtk/WebKitAccessibleInterfaceValue.h: Added.
     20        * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code
     21        related to the implementation of the AtkValue interface.
     22
     23        Add new files to build files.
     24
     25        * GNUmakefile.list.am: Add WebKitAccessibleInterfaceValue.[h|cpp].
     26        * WebCore.gypi: Ditto.
     27
    1282012-01-24  Antti Koivisto  <antti@apple.com>
    229
  • trunk/Source/WebCore/GNUmakefile.list.am

    r105727 r105740  
    44384438        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp \
    44394439        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.h \
     4440        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.cpp \
     4441        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.h \
    44404442        Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp \
    44414443        Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h \
  • trunk/Source/WebCore/WebCore.gypi

    r105727 r105740  
    13621362            'accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp',
    13631363            'accessibility/gtk/WebKitAccessibleInterfaceSelection.h',
     1364            'accessibility/gtk/WebKitAccessibleInterfaceValue.cpp',
     1365            'accessibility/gtk/WebKitAccessibleInterfaceValue.h',
    13641366            'accessibility/gtk/WebKitAccessibleUtil.cpp',
    13651367            'accessibility/gtk/WebKitAccessibleUtil.h',
  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp

    r105727 r105740  
    7272#include "WebKitAccessibleInterfaceImage.h"
    7373#include "WebKitAccessibleInterfaceSelection.h"
     74#include "WebKitAccessibleInterfaceValue.h"
    7475#include "WebKitAccessibleUtil.h"
    7576#include "htmlediting.h"
     
    124125{
    125126    return core(ATK_OBJECT(table));
    126 }
    127 
    128 static AccessibilityObject* core(AtkValue* value)
    129 {
    130     return core(ATK_OBJECT(value));
    131127}
    132128
     
    18211817}
    18221818
    1823 static void webkitAccessibleValueGetCurrentValue(AtkValue* value, GValue* gValue)
    1824 {
    1825     memset(gValue,  0, sizeof(GValue));
    1826     g_value_init(gValue, G_TYPE_DOUBLE);
    1827     g_value_set_double(gValue, core(value)->valueForRange());
    1828 }
    1829 
    1830 static void webkitAccessibleValueGetMaximumValue(AtkValue* value, GValue* gValue)
    1831 {
    1832     memset(gValue,  0, sizeof(GValue));
    1833     g_value_init(gValue, G_TYPE_DOUBLE);
    1834     g_value_set_double(gValue, core(value)->maxValueForRange());
    1835 }
    1836 
    1837 static void webkitAccessibleValueGetMinimumValue(AtkValue* value, GValue* gValue)
    1838 {
    1839     memset(gValue,  0, sizeof(GValue));
    1840     g_value_init(gValue, G_TYPE_DOUBLE);
    1841     g_value_set_double(gValue, core(value)->minValueForRange());
    1842 }
    1843 
    1844 static gboolean webkitAccessibleValueSetCurrentValue(AtkValue* value, const GValue* gValue)
    1845 {
    1846     if (!G_VALUE_HOLDS_DOUBLE(gValue) && !G_VALUE_HOLDS_INT(gValue))
    1847         return FALSE;
    1848 
    1849     AccessibilityObject* coreObject = core(value);
    1850     if (!coreObject->canSetValueAttribute())
    1851         return FALSE;
    1852 
    1853     if (G_VALUE_HOLDS_DOUBLE(gValue))
    1854         coreObject->setValue(String::number(g_value_get_double(gValue)));
    1855     else
    1856         coreObject->setValue(String::number(g_value_get_int(gValue)));
    1857 
    1858     return TRUE;
    1859 }
    1860 
    1861 static void webkitAccessibleValueGetMinimumIncrement(AtkValue* value, GValue* gValue)
    1862 {
    1863     memset(gValue,  0, sizeof(GValue));
    1864     g_value_init(gValue, G_TYPE_DOUBLE);
    1865 
    1866     // There's not such a thing in the WAI-ARIA specification, thus return zero.
    1867     g_value_set_double(gValue, 0.0);
    1868 }
    1869 
    1870 static void atkValueInterfaceInit(AtkValueIface* iface)
    1871 {
    1872     iface->get_current_value = webkitAccessibleValueGetCurrentValue;
    1873     iface->get_maximum_value = webkitAccessibleValueGetMaximumValue;
    1874     iface->get_minimum_value = webkitAccessibleValueGetMinimumValue;
    1875     iface->set_current_value = webkitAccessibleValueSetCurrentValue;
    1876     iface->get_minimum_increment = webkitAccessibleValueGetMinimumIncrement;
    1877 }
    1878 
    18791819static const GInterfaceInfo AtkInterfacesInitFunctions[] = {
    18801820    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleActionInterfaceInit), 0, 0},
     
    18901830    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleHyperlinkImplInterfaceInit), 0, 0},
    18911831    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleDocumentInterfaceInit), 0, 0},
    1892     {(GInterfaceInitFunc)atkValueInterfaceInit,
    1893      (GInterfaceFinalizeFunc) 0, 0}
     1832    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleValueInterfaceInit), 0, 0}
    18941833};
    18951834
Note: See TracChangeset for help on using the changeset viewer.