Fire AX notifications on list box options.

Source/modules/accessibility/AXObjectCacheImpl.cpp

 /*
  * Copyright (C) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 21 matching lines @@
 
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLabelElement.h"
+#include "core/html/HTMLOptionElement.h"
+#include "core/html/HTMLSelectElement.h"
 #include "core/layout/LayoutListBox.h"
 #include "core/layout/LayoutMenuList.h"
 #include "core/layout/LayoutProgress.h"
 #include "core/layout/LayoutSlider.h"
 #include "core/layout/LayoutTable.h"
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutTableRow.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/line/AbstractInlineTextBox.h"
 #include "core/page/Chrome.h"
@@ skipping 688 matching lines @@
     m_notificationsToPost.append(std::make_pair(object, notification));
     if (!m_notificationPostTimer.isActive())
         m_notificationPostTimer.startOneShot(0, FROM_HERE);
 }
 
 void AXObjectCacheImpl::checkedStateChanged(Node* node)
 {
     postNotification(node, AXObjectCacheImpl::AXCheckedStateChanged);
 }
 
-void AXObjectCacheImpl::selectedChildrenChanged(Node* node)
+void AXObjectCacheImpl::listboxOptionStateChanged(HTMLOptionElement* option)
 {
-    selectedChildrenChanged(get(node));
+    postNotification(option, AXCheckedStateChanged);
 }
 
-void AXObjectCacheImpl::selectedChildrenChanged(LayoutObject* layoutObject)
+void AXObjectCacheImpl::listboxSelectedChildrenChanged(HTMLSelectElement* select)
 {
-    selectedChildrenChanged(get(layoutObject));
+    postNotification(select, AXSelectedChildrenChanged);
 }
 
-void AXObjectCacheImpl::selectedChildrenChanged(AXObject* obj)
+void AXObjectCacheImpl::listboxActiveIndexChanged(HTMLSelectElement* select)
 {
-    while (obj && obj->roleValue() != ListBoxRole)
-        obj = obj->parentObject();
-    postNotification(obj, AXSelectedChildrenChanged);
+    AXObject* obj = get(select);
+    if (!obj || !obj->isAXListBox())
+        return;
+
+    static_cast<AXListBox*>(obj)->activeIndexChanged();
 }
 
 void AXObjectCacheImpl::handleScrollbarUpdate(FrameView* view)
 {
     if (!view)
         return;
 
     // We don't want to create a scroll view from this method, only update an existing one.
     if (AXObject* scrollViewObject = get(view)) {
         m_modificationCount++;
@@ skipping 14 matching lines @@
     if (AXObject* obj = getOrCreate(layoutObject))
         postNotification(obj, AXLayoutComplete);
 }
 
 void AXObjectCacheImpl::handleAriaExpandedChange(Node* node)
 {
     if (AXObject* obj = getOrCreate(node))
         obj->handleAriaExpandedChanged();
 }
 
+void AXObjectCacheImpl::handleAriaSelectedChanged(Node* node)
+{
+    AXObject* obj = get(node);
+    if (!obj)
+        return;
+
+    postNotification(obj, AXCheckedStateChanged);
+
+    AXObject* listbox = obj->parentObjectUnignored();
+    if (listbox->roleValue() == ListBoxRole)
+        postNotification(listbox, AXSelectedChildrenChanged);
+}
+
 void AXObjectCacheImpl::handleActiveDescendantChanged(Node* node)
 {
     if (AXObject* obj = getOrCreate(node))
         obj->handleActiveDescendantChanged();
 }
 
 void AXObjectCacheImpl::handleAriaRoleChanged(Node* node)
 {
     if (AXObject* obj = getOrCreate(node)) {
         obj->updateAccessibilityRole();
@@ skipping 16 matching lines @@
 
     if (attrName == aria_activedescendantAttr)
         handleActiveDescendantChanged(element);
     else if (attrName == aria_valuenowAttr || attrName == aria_valuetextAttr)
         postNotification(element, AXObjectCacheImpl::AXValueChanged);
     else if (attrName == aria_labelAttr || attrName == aria_labeledbyAttr || attrName == aria_labelledbyAttr)
         textChanged(element);
     else if (attrName == aria_checkedAttr)
         checkedStateChanged(element);
     else if (attrName == aria_selectedAttr)
-        selectedChildrenChanged(element);
+        handleAriaSelectedChanged(element);
     else if (attrName == aria_expandedAttr)
         handleAriaExpandedChange(element);
     else if (attrName == aria_hiddenAttr)
         childrenChanged(element->parentNode());
     else if (attrName == aria_invalidAttr)
         postNotification(element, AXObjectCacheImpl::AXInvalidStatusChanged);
     else
         postNotification(element, AXObjectCacheImpl::AXAriaAttributeChanged);
 }
 
@@ skipping 262 matching lines @@
 void AXObjectCacheImpl::setCanvasObjectBounds(Element* element, const LayoutRect& rect)
 {
     AXObject* obj = getOrCreate(element);
     if (!obj)
         return;
 
     obj->setElementRect(rect);
 }
 
 } // namespace blink