commit df7d13aded56eddeb9c821003938853401686bc9
author xan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jun 26 09:12:44 2009 +0000
committer xan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jun 26 09:12:44 2009 +0000
tree 5103e955fad98efdc43488ff80fef438aee7e498
parent e43bf7a6d7999153bbe495058c1c404c2871983c

2009-06-26  Xan Lopez  <xlopez@igalia.com>

        Reviewed by Jan Alonzo.

        https://bugs.webkit.org/show_bug.cgi?id=25529
        [Gtk] Expected states not exposed to assistive technologies

        Add support for VISIBLE, EDITABLE and SENSITIVE states.

        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
        (setAtkStateSetFromCoreObject):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45252 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index ee7a37e..5636d17 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -293,11 +293,17 @@
     if (coreObject->isChecked())
         atk_state_set_add_state(stateSet, ATK_STATE_CHECKED);
 
-    if (!coreObject->isReadOnly())
+    // FIXME: isReadOnly does not seem to do the right thing for
+    // controls, so check explicitly for them
+    if (!coreObject->isReadOnly() ||
+        (coreObject->isControl() && coreObject->canSetValueAttribute()))
         atk_state_set_add_state(stateSet, ATK_STATE_EDITABLE);
 
-    if (coreObject->isEnabled())
+    // FIXME: Put both ENABLED and SENSITIVE together here for now
+    if (coreObject->isEnabled()) {
         atk_state_set_add_state(stateSet, ATK_STATE_ENABLED);
+        atk_state_set_add_state(stateSet, ATK_STATE_SENSITIVE);
+    }
 
     if (coreObject->canSetFocusAttribute())
         atk_state_set_add_state(stateSet, ATK_STATE_FOCUSABLE);
@@ -320,13 +326,17 @@
 
     // TODO: ATK_STATE_SELECTABLE_TEXT
 
-    // TODO: ATK_STATE_SENSITIVE
-
     if (coreObject->isSelected())
         atk_state_set_add_state(stateSet, ATK_STATE_SELECTED);
 
-    if (!coreObject->isOffScreen())
+    // FIXME: Group both SHOWING and VISIBLE here for now
+    // Not sure how to handle this in WebKit, see bug
+    // http://bugzilla.gnome.org/show_bug.cgi?id=509650 for other
+    // issues with SHOWING vs VISIBLE within GTK+
+    if (!coreObject->isOffScreen()) {
         atk_state_set_add_state(stateSet, ATK_STATE_SHOWING);
+        atk_state_set_add_state(stateSet, ATK_STATE_VISIBLE);
+    }
 
     // Mutually exclusive, so we group these two
     if (coreObject->roleValue() == TextFieldRole)