Reviewed by Geoff.

David Harrison · David Harrison · commit 01fc7a139643 · 2006-08-25T22:25:54.000Z
<rdar://problem/4416432> Radio buttons and Checkboxes in AXWebAreas don't fill in their AXTitle attribute * bridge/mac/WebCoreAXObject.mm: (labelForElement): New. Returns the HTMLLabelElement, if any, for the specified Element. (-[WebCoreAXObject title]): For input elements, return the innerHTML() of the labelForElement(). Canonical link: https://commits.webkit.org/13438@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16042 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-25  David Harrison  <harrison@apple.com>
+
+        Reviewed by Geoff.
+
+        <rdar://problem/4416432> Radio buttons and Checkboxes in AXWebAreas don't fill in their AXTitle attribute
+
+        * bridge/mac/WebCoreAXObject.mm:
+        (labelForElement):
+        New. Returns the HTMLLabelElement, if any, for the specified Element.
+        
+        (-[WebCoreAXObject title]):
+        For input elements, return the innerHTML() of the labelForElement().
+
 2006-08-25  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Tim Hatcher
diff --git a/WebCore/bridge/mac/WebCoreAXObject.mm b/WebCore/bridge/mac/WebCoreAXObject.mm
@@ -36,6 +36,7 @@
 #import "htmlediting.h"
 #import "HTMLFrameElement.h"
 #import "HTMLInputElement.h"
+#import "HTMLLabelElement.h"
 #import "HTMLMapElement.h"
 #import "HTMLNames.h"
 #import "HTMLSelectElement.h"
@@ -563,20 +564,40 @@ -(id)value
     return nil;
 }
 
+static HTMLLabelElement* labelForElement(Element* element)
+{
+    RefPtr<NodeList> list = element->document()->getElementsByTagName("label");
+    unsigned len = list->length();
+    for (unsigned i = 0; i < len; i++) {
+        HTMLLabelElement* label = static_cast<HTMLLabelElement*>(list->item(i));
+        if (label->formElement() == element)
+            return label;
+    }
+    
+    return 0;
+}
+
 -(NSString*)title
 {
     if (!m_renderer || m_areaElement || !m_renderer->element())
         return nil;
     
     if (m_renderer->element()->hasTagName(buttonTag))
         return [self textUnderElement];
+        
     if (m_renderer->element()->hasTagName(inputTag)) {
         HTMLInputElement* input = static_cast<HTMLInputElement*>(m_renderer->element());
         if (input->isTextButton())
             return input->value();
+
+        HTMLLabelElement* label = labelForElement(input);
+        if (label)
+            return label->innerText();
     }
+    
     if (m_renderer->element()->isLink())
         return [self textUnderElement];
+        
     if ([self isAttachment])
         return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityTitleAttribute];
     
