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

third_party/WebKit/Source/core/dom/TreeScope.cpp

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  * Copyright (C) 2012 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 26 matching lines @@
 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/TreeScopeAdopter.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/DOMSelection.h"
 #include "core/events/EventPath.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLFrameOwnerElement.h"
-#include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLMapElement.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 using namespace HTMLNames;
@@ skipping 238 matching lines @@
     if (!pointWithScrollAndZoomIfPossible(document, hitPoint))
         return HeapVector<Member<Element>>();
 
     HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::ListBased | HitTestRequest::PenetratingList);
     HitTestResult result(request, hitPoint);
     document.layoutViewItem().hitTest(result);
 
     return elementsFromHitTestResult(result);
 }
 
-void TreeScope::addLabel(const AtomicString& forAttributeValue, HTMLLabelElement* element)
-{
-    DCHECK(m_labelsByForAttribute);
-    m_labelsByForAttribute->add(forAttributeValue, element);
-}
-
-void TreeScope::removeLabel(const AtomicString& forAttributeValue, HTMLLabelElement* element)
-{
-    DCHECK(m_labelsByForAttribute);
-    m_labelsByForAttribute->remove(forAttributeValue, element);
-}
-
-HTMLLabelElement* TreeScope::labelElementForId(const AtomicString& forAttributeValue)
-{
-    if (forAttributeValue.isEmpty())
-        return nullptr;
-
-    if (!m_labelsByForAttribute) {
-        // Populate the map on first access.
-        m_labelsByForAttribute = DocumentOrderedMap::create();
-        for (HTMLLabelElement& label : Traversal<HTMLLabelElement>::startsAfter(rootNode())) {
-            const AtomicString& forValue = label.fastGetAttribute(forAttr);
-            if (!forValue.isEmpty())
-                addLabel(forValue, &label);
-        }
-    }
-
-    return toHTMLLabelElement(m_labelsByForAttribute->getElementByLabelForAttribute(forAttributeValue, this));
-}
-
 DOMSelection* TreeScope::getSelection() const
 {
     if (!rootNode().document().frame())
         return nullptr;
 
     if (m_selection)
         return m_selection.get();
 
     // FIXME: The correct selection in Shadow DOM requires that Position can have a ShadowRoot
     // as a container.
@@ skipping 181 matching lines @@
 
 DEFINE_TRACE(TreeScope)
 {
     visitor->trace(m_rootNode);
     visitor->trace(m_document);
     visitor->trace(m_parentTreeScope);
     visitor->trace(m_idTargetObserverRegistry);
     visitor->trace(m_selection);
     visitor->trace(m_elementsById);
     visitor->trace(m_imageMapsByName);
-    visitor->trace(m_labelsByForAttribute);
     visitor->trace(m_scopedStyleResolver);
     visitor->trace(m_radioButtonGroupScope);
 }
 
 } // namespace blink