Drop LABEL element from form-associated 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 24 matching lines @@
 #include "core/frame/UseCounter.h"
 #include "core/html/FormAssociatedElement.h"
 #include "core/html/HTMLFormControlElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutObject.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-inline HTMLLabelElement::HTMLLabelElement(Document& document, HTMLFormElement* form)
+inline HTMLLabelElement::HTMLLabelElement(Document& document)
     : HTMLElement(labelTag, document)
     , m_processingClick(false)
 {
-    FormAssociatedElement::associateByParser(form);
 }
 
-HTMLLabelElement* HTMLLabelElement::create(Document& document, HTMLFormElement* form)
+HTMLLabelElement* HTMLLabelElement::create(Document& document)
 {
-    HTMLLabelElement* labelElement = new HTMLLabelElement(document, form);
-    return labelElement;
+    return new HTMLLabelElement(document);
 }
 
 LabelableElement* HTMLLabelElement::control() const
 {
     const AtomicString& controlId = getAttribute(forAttr);
     if (controlId.isNull()) {
         // Search the children and descendants of the label element for a form element.
         // per http://dev.w3.org/html5/spec/Overview.html#the-label-element
         // the form element must be "labelable form-associated element".
         for (LabelableElement& element : Traversal<LabelableElement>::descendantsOf(*this)) {
@@ skipping 10 matching lines @@
         if (isLabelableElement(*element) && toLabelableElement(*element).supportLabels()) {
             if (!element->isFormControlElement())
                 UseCounter::count(document(), UseCounter::HTMLLabelElementControlForNonFormAssociatedElement);
             return toLabelableElement(element);
         }
     }
 
     return nullptr;
 }
 
-HTMLFormElement* HTMLLabelElement::formOwner() const
+HTMLFormElement* HTMLLabelElement::form() const
 {
-    return FormAssociatedElement::form();
-}
-
-HTMLFormElement* HTMLLabelElement::formForBinding() const
-{
-    HTMLFormElement* formOwner = FormAssociatedElement::form();
-    HTMLFormElement* controlForm = nullptr;
-    if (LabelableElement* control = this->control()) {
-        if (control->isFormControlElement())
-            controlForm = toHTMLFormControlElement(control)->form();
-    }
-    if (formOwner != controlForm)
-        UseCounter::count(document(), UseCounter::HTMLLabelElementFormIsDifferentFromControlForm);
-    if (!controlForm && formOwner && formOwner == findFormAncestor())
-        UseCounter::count(document(), UseCounter::HTMLLabelElementHasNoControlAndFormIsAncestor);
-    return formOwner;
+    if (LabelableElement* control = this->control())
+        return control->isFormControlElement() ? toHTMLFormControlElement(control)->form() : nullptr;
+    return nullptr;
 }
 
 void HTMLLabelElement::setActive(bool down)
 {
     if (down != active()) {
         // Update our status first.
         HTMLElement::setActive(down);
     }
 
     // Also update our corresponding control.
@@ skipping 139 matching lines @@
 
     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);
+    if (attributeName == forAttr) {
+        TreeScope& scope = treeScope();
+        if (scope.shouldCacheLabelsByForAttribute())
+            updateLabel(scope, oldValue, attributeValue);
     }
+    HTMLElement::parseAttribute(attributeName, oldValue, attributeValue);
 }
 
 } // namespace blink