Implement nameFromLabelElement to see if a control is associated with a label.

third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 Apple 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 577 matching lines @@
     }
 
     // TODO: we should refactor this - but right now this is necessary to make
     // sure scroll areas stay in the tree.
     if (isAttachment())
         return false;
 
     // find out if this element is inside of a label element.
     // if so, it may be ignored because it's the label for a checkbox or radio button
     AXObject* controlObject = correspondingControlForLabelElement();
-    if (controlObject && controlObject->isCheckboxOrRadio()) {
-        AXNameFrom controlNameFrom;
-        AXObject::AXObjectVector controlNameObjects;
-        controlObject->name(controlNameFrom, &controlNameObjects);
-        if (controlNameFrom == AXNameFromRelatedElement) {
-            if (ignoredReasons) {
-                HTMLLabelElement* label = labelElementContainer();
-                if (label && !label->isSameNode(node())) {
-                    AXObject* labelAXObject = axObjectCache().getOrCreate(label);
-                    ignoredReasons->append(IgnoredReason(AXLabelContainer, labelAXObject));
-                }
+    if (controlObject && controlObject->isCheckboxOrRadio() && controlObject->nameFromLabelElement()) {
+        if (ignoredReasons) {
+            HTMLLabelElement* label = labelElementContainer();
+            if (label && !label->isSameNode(node())) {
+                AXObject* labelAXObject = axObjectCache().getOrCreate(label);
+                ignoredReasons->append(IgnoredReason(AXLabelContainer, labelAXObject));
+            }
 
-                ignoredReasons->append(IgnoredReason(AXLabelFor, controlObject));
-            }
-            return true;
+            ignoredReasons->append(IgnoredReason(AXLabelFor, controlObject));
         }
+        return true;
     }
 
     if (m_layoutObject->isBR())
         return false;
 
     if (m_layoutObject->isText()) {
         // static text beneath MenuItems and MenuButtons are just reported along with the menu item, so it's ignored on an individual level
         AXObject* parent = parentObjectUnignored();
         if (parent && (parent->ariaRoleAttribute() == MenuItemRole || parent->ariaRoleAttribute() == MenuButtonRole)) {
             if (ignoredReasons)
@@ skipping 870 matching lines @@
 
     AXObject* result = axObjectCache().getOrCreate(obj);
     result->updateChildrenIfNecessary();
 
     // Allow the element to perform any hit-testing it might need to do to reach non-layout children.
     result = result->elementAccessibilityHitTest(point);
     if (result && result->accessibilityIsIgnored()) {
         // If this element is the label of a control, a hit test should return the control.
         if (result->isAXLayoutObject()) {
             AXObject* controlObject = toAXLayoutObject(result)->correspondingControlForLabelElement();
-            if (controlObject) {
-                AXNameFrom controlNameFrom;
-                AXObject::AXObjectVector controlNameObjects;
-                controlObject->name(controlNameFrom, &controlNameObjects);
-                if (controlObject && controlNameFrom == AXNameFromRelatedElement)
-                    return controlObject;
-            }
+            if (controlObject && controlObject->nameFromLabelElement())
+                return controlObject;
         }
 
         result = result->parentObjectUnignored();
     }
 
     return result;
 }
 
 AXObject* AXLayoutObject::elementAccessibilityHitTest(const IntPoint& point) const
 {
@@ skipping 1037 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink