Enable accessible name of a control to include multiple <label> elements.

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 33 matching lines @@
 #include "core/frame/FrameOwner.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/html/HTMLTextAreaElement.h"
+#include "core/html/LabelsNodeList.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutFieldset.h"
 #include "core/layout/LayoutFileUploadControl.h"
 #include "core/layout/LayoutHTMLCanvas.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutListMarker.h"
 #include "core/layout/LayoutMenuList.h"
 #include "core/layout/LayoutPart.h"
@@ skipping 2392 matching lines @@
     if (document && document->frame() && document->frame()->pagePopupOwner()) {
         IntPoint popupOrigin = document->view()->contentsToScreen(IntRect()).location();
         IntPoint mainOrigin = axObjectCache().rootObject()->documentFrameView()->contentsToScreen(IntRect()).location();
         result.moveBy(IntPoint(popupOrigin - mainOrigin));
     }
 
     // The size of the web area should be the content size, not the clipped size.
     if (isWebArea() && obj->frame()->view())
         result.setSize(LayoutSize(obj->frame()->view()->contentsSize()));
 
-    // Checkboxes and radio buttons include their label as part of their rect.
-    if (isCheckboxOrRadio()) {
-        HTMLLabelElement* label = labelForElement(toElement(m_layoutObject->node()));
-        if (label && label->layoutObject()) {
-            LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRect();
-            result.unite(labelRect);
+    // Checkboxes and radio buttons include their labels as part of their rect.
+    if (isCheckboxOrRadio() && isLabelableElement(obj->node())) {
+        LabelsNodeList* labels = toLabelableElement(obj->node())->labels();
+        if (labels) {
+            for (unsigned labelIndex = 0; labelIndex < labels->length(); ++labelIndex) {
+                AXObject* labelAXObject = axObjectCache().getOrCreate(labels->item(labelIndex));
+                if (labelAXObject) {
+                    LayoutRect labelRect = labelAXObject->elementRect();
+                    result.unite(labelRect);

[aboxhall, 2016/05/13 20:19:16]

This doesn't change in this change, but it never occurred to me until now that
this could be weird if there was some content between the labeled element and
its label. Not sure how likely that is to occur in practice.

[dmazzoni, 2016/05/13 22:22:42]

Agreed, it's a bit weird.

+                }
+            }
         }
     }
 
     return result;
 }
 
 } // namespace blink