Changeset 79321 in webkit

Timestamp:

Feb 22, 2011 7:26:23 AM (13 years ago)

Author:

mario@webkit.org

Message:

2011-02-22 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Combo boxes should emit object:selection-changed even when collapsed
​https://bugs.webkit.org/show_bug.cgi?id=53146

New GTK-specific layout test to check the right signals are emitted.

• platform/gtk/accessibility/combo-box-collapsed-selection-changed-expected.txt: Added.
• platform/gtk/accessibility/combo-box-collapsed-selection-changed.html: Added.

2011-02-22 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Combo boxes should emit object:selection-changed even when collapsed
​https://bugs.webkit.org/show_bug.cgi?id=53146

Emit the selection-changed signals when the menu list value has changed

Test: platform/gtk/accessibility/combo-box-collapsed-selection-changed.html

• accessibility/gtk/AXObjectCacheAtk.cpp: (WebCore::getListObject): New, return the right list object for menu lists and list boxes. (WebCore::notifyChildrenSelectionChange): Support menu lists. (WebCore::AXObjectCache::postPlatformNotification): Call function notifyChildrenSelectionChange for AXMenuListValueChanged.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/combo-box-collapsed-selection-changed-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/combo-box-collapsed-selection-changed.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-22  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Combo boxes should emit object:selection-changed even when collapsed
+        https://bugs.webkit.org/show_bug.cgi?id=53146
+
+        New GTK-specific layout test to check the right signals are emitted.
+
+        * platform/gtk/accessibility/combo-box-collapsed-selection-changed-expected.txt: Added.
+        * platform/gtk/accessibility/combo-box-collapsed-selection-changed.html: Added.
+
 2011-02-15  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-22  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Combo boxes should emit object:selection-changed even when collapsed
+        https://bugs.webkit.org/show_bug.cgi?id=53146
+
+        Emit the selection-changed signals when the menu list value has changed
+
+        Test: platform/gtk/accessibility/combo-box-collapsed-selection-changed.html
+
+        * accessibility/gtk/AXObjectCacheAtk.cpp:
+        (WebCore::getListObject): New, return the right list object for
+        menu lists and list boxes.
+        (WebCore::notifyChildrenSelectionChange): Support menu lists.
+        (WebCore::AXObjectCache::postPlatformNotification): Call function
+        notifyChildrenSelectionChange for AXMenuListValueChanged.
+
 2011-02-22  Andras Becsi  <abecsi@webkit.org>
 

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

@@ -43 +43 @@
 }
 
+static AccessibilityObject* getListObject(AccessibilityObject* object)
+{
+    // Only list boxes and menu lists supported so far.
+    if (!object->isListBox() && !object->isMenuList())
+        return 0;
+
+    // For list boxes the list object is just itself.
+    if (object->isListBox())
+        return object;
+
+    // For menu lists we need to return the first accessible child,
+    // with role MenuListPopupRole, since that's the one holding the list
+    // of items with role MenuListOptionRole.
+    AccessibilityObject::AccessibilityChildrenVector children = object->children();
+    if (!children.size())
+        return 0;
+
+    AccessibilityObject* listObject = children.at(0).get();
+    if (!listObject->isMenuListPopup())
+        return 0;
+
+    return listObject;
+}
+
 static void notifyChildrenSelectionChange(AccessibilityObject* object)
 {
@@ -50 +74 @@
     static RefPtr<AccessibilityObject> oldFocusedObject = 0;
 
-    // Only list boxes supported so far.
-    if (!object || !object->isListBox())
+    // Only list boxes and menu lists supported so far.
+    if (!object || !(object->isListBox() || object->isMenuList()))
         return;
 
@@ -58 +82 @@
 
     // Find the item where the selection change was triggered from.
-    AccessibilityObject::AccessibilityChildrenVector items = object->children();
     SelectElement* select = toSelectElement(static_cast<Element*>(object->node()));
     if (!select)
         return;
     int changedItemIndex = select->activeSelectionStartListIndex();
+
+    AccessibilityObject* listObject = getListObject(object);
+    if (!listObject)
+        return;
+
+    AccessibilityObject::AccessibilityChildrenVector items = listObject->children();
     if (changedItemIndex < 0 || changedItemIndex >= static_cast<int>(items.size()))
         return;
     AccessibilityObject* item = items.at(changedItemIndex).get();
 
-    // Ensure the oldFocusedObject belongs to the same document that
+    // Ensure oldFocusedObject belongs to the same list object that
     // the current item so further comparisons make sense. Otherwise,
     // just reset oldFocusedObject so it won't be taken into account.
-    if (item && oldFocusedObject && item->document() != oldFocusedObject->document())
+    if (item && oldFocusedObject && item->parentObject() != oldFocusedObject->parentObject())
         oldFocusedObject = 0;
 
@@ -104 +133 @@
             return;
         g_signal_emit_by_name(axObject, "state-change", "checked", coreObject->isChecked());
-    } else if (notification == AXMenuListValueChanged) {
-        if (!coreObject->isMenuList())
-            return;
-        g_signal_emit_by_name(axObject, "focus-event", true);
-        g_signal_emit_by_name(axObject, "state-change", "focused", true);
-    } else if (notification == AXSelectedChildrenChanged)
+    } else if (notification == AXSelectedChildrenChanged || notification == AXMenuListValueChanged) {
+        if (notification == AXMenuListValueChanged && coreObject->isMenuList()) {
+            g_signal_emit_by_name(axObject, "focus-event", true);
+            g_signal_emit_by_name(axObject, "state-change", "focused", true);
+        }
         notifyChildrenSelectionChange(coreObject);
+    }
 }