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

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

 /*
  * 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 22 matching lines @@
 #include "core/layout/HitTestRequest.h"
 #include "platform/heap/Handle.h"
 #include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 class ContainerNode;
 class DOMSelection;
 class Document;
 class Element;
-class HTMLLabelElement;
 class HTMLMapElement;
 class HitTestResult;
 class IdTargetObserverRegistry;
 class ScopedStyleResolver;
 class Node;
 
 // A class which inherits both Node and TreeScope must call clearRareData() in its destructor
 // so that the Node destructor no longer does problematic NodeList cache manipulation in
 // the destructor.
 class CORE_EXPORT TreeScope : public GarbageCollectedMixin {
@@ skipping 21 matching lines @@
 
     void addImageMap(HTMLMapElement*);
     void removeImageMap(HTMLMapElement*);
     HTMLMapElement* getImageMap(const String& url) const;
 
     Element* elementFromPoint(int x, int y) const;
     Element* hitTestPoint(int x, int y, const HitTestRequest&) const;
     HeapVector<Member<Element>> elementsFromPoint(int x, int y) const;
     HeapVector<Member<Element>> elementsFromHitTestResult(HitTestResult&) const;
 
-    // For accessibility.
-    bool shouldCacheLabelsByForAttribute() const { return m_labelsByForAttribute; }
-    void addLabel(const AtomicString& forAttributeValue, HTMLLabelElement*);
-    void removeLabel(const AtomicString& forAttributeValue, HTMLLabelElement*);
-    HTMLLabelElement* labelElementForId(const AtomicString& forAttributeValue);
-
     DOMSelection* getSelection() const;
 
     Element* retarget(const Element& target) const;
 
     // Find first anchor with the given name.
     // First searches for an element with the given ID, but if that fails, then looks
     // for an anchor with the given name. ID matching is always case sensitive, but
     // Anchor name matching is case sensitive in strict mode and not case sensitive in
     // quirks mode for historical compatibility reasons.
     Element* findAnchor(const String& name);
@@ skipping 30 matching lines @@
     void setParentTreeScope(TreeScope&);
     void setNeedsStyleRecalcForViewportUnits();
 
 private:
     Member<ContainerNode> m_rootNode;
     Member<Document> m_document;
     Member<TreeScope> m_parentTreeScope;
 
     Member<DocumentOrderedMap> m_elementsById;
     Member<DocumentOrderedMap> m_imageMapsByName;
-    Member<DocumentOrderedMap> m_labelsByForAttribute;
 
     Member<IdTargetObserverRegistry> m_idTargetObserverRegistry;
 
     Member<ScopedStyleResolver> m_scopedStyleResolver;
 
     mutable Member<DOMSelection> m_selection;
 
     RadioButtonGroupScope m_radioButtonGroupScope;
 };
 
 inline bool TreeScope::hasElementWithId(const AtomicString& id) const
 {
     DCHECK(!id.isNull());
     return m_elementsById && m_elementsById->contains(id);
 }
 
 inline bool TreeScope::containsMultipleElementsWithId(const AtomicString& id) const
 {
     return m_elementsById && m_elementsById->containsMultiple(id);
 }
 
 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(TreeScope)
 
 HitTestResult hitTestInDocument(const Document*, int x, int y, const HitTestRequest& = HitTestRequest::ReadOnly | HitTestRequest::Active);
 
 } // namespace blink
 
 #endif // TreeScope_h