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

third_party/WebKit/Source/core/html/HTMLLabelElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 225 matching lines @@
 }
 
 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents)
 {
     if (HTMLElement* element = control())
         element->accessKeyAction(sendMouseEvents);
     else
         HTMLElement::accessKeyAction(sendMouseEvents);
 }
 
-void HTMLLabelElement::updateLabel(TreeScope& scope, const AtomicString& oldForAttributeValue, const AtomicString& newForAttributeValue)
-{
-    if (!inShadowIncludingDocument())
-        return;
-
-    if (oldForAttributeValue == newForAttributeValue)
-        return;
-
-    if (!oldForAttributeValue.isEmpty())
-        scope.removeLabel(oldForAttributeValue, this);
-    if (!newForAttributeValue.isEmpty())
-        scope.addLabel(newForAttributeValue, this);
-}
-
 Node::InsertionNotificationRequest HTMLLabelElement::insertedInto(ContainerNode* insertionPoint)
 {
     InsertionNotificationRequest result = HTMLElement::insertedInto(insertionPoint);
     FormAssociatedElement::insertedInto(insertionPoint);
-    if (insertionPoint->isInTreeScope()) {
-        TreeScope& scope = insertionPoint->treeScope();
-        if (scope == treeScope() && scope.shouldCacheLabelsByForAttribute())
-            updateLabel(scope, nullAtom, fastGetAttribute(forAttr));
-    }
 
     // Trigger for elements outside of forms.
     if (!formOwner() && insertionPoint->inShadowIncludingDocument())
         document().didAssociateFormControl(this);
 
     return result;
 }
 
 void HTMLLabelElement::removedFrom(ContainerNode* insertionPoint)
 {
-    if (insertionPoint->isInTreeScope() && treeScope() == document()) {
-        TreeScope& treeScope = insertionPoint->treeScope();
-        if (treeScope.shouldCacheLabelsByForAttribute())
-            updateLabel(treeScope, fastGetAttribute(forAttr), nullAtom);
-    }
     HTMLElement::removedFrom(insertionPoint);
     FormAssociatedElement::removedFrom(insertionPoint);
     document().removeFormAssociation(this);
 }
 
 DEFINE_TRACE(HTMLLabelElement)
 {
     HTMLElement::trace(visitor);
     FormAssociatedElement::trace(visitor);
 }
 
 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& attributeValue)
 {
     if (attributeName == formAttr) {
         formAttributeChanged();
         UseCounter::count(document(), UseCounter::HTMLLabelElementFormContentAttribute);
     } else {
-        if (attributeName == forAttr) {
-            TreeScope& scope = treeScope();
-            if (scope.shouldCacheLabelsByForAttribute())
-                updateLabel(scope, oldValue, attributeValue);
-        }
         HTMLElement::parseAttribute(attributeName, oldValue, attributeValue);
     }
 }
 
 } // namespace blink