<label> should support form association by parser

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 19 matching lines @@
 #include "core/dom/ElementTraversal.h"
 #include "core/editing/FrameSelection.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/FormAssociatedElement.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-inline HTMLLabelElement::HTMLLabelElement(Document& document)
+inline HTMLLabelElement::HTMLLabelElement(Document& document, HTMLFormElement* form)
     : HTMLElement(labelTag, document)
 {
+    FormAssociatedElement::associateByParser(form);
 }
 
-DEFINE_NODE_FACTORY(HTMLLabelElement)
+PassRefPtrWillBeRawPtr<HTMLLabelElement> HTMLLabelElement::create(Document& document, HTMLFormElement* form)
+{
+    RefPtrWillBeRawPtr<HTMLLabelElement> labelElement = adoptRefWillBeNoop(new HTMLLabelElement(document, form));
+    return labelElement.release();
+}
 
 bool HTMLLabelElement::rendererIsFocusable() const
 {
     HTMLLabelElement* that = const_cast<HTMLLabelElement*>(this);
     return that->isContentEditable();
 }
 
 LabelableElement* HTMLLabelElement::control() const
 {
     const AtomicString& controlId = getAttribute(forAttr);
@@ skipping 11 matching lines @@
     if (Element* element = treeScope().getElementById(controlId)) {
         if (isLabelableElement(*element) && toLabelableElement(*element).supportLabels())
             return toLabelableElement(element);
     }
 
     return 0;
 }
 
 HTMLFormElement* HTMLLabelElement::formOwner() const
 {
-    return FormAssociatedElement::findAssociatedForm(this);
+    return !fastGetAttribute(formAttr).isNull() ? FormAssociatedElement::findAssociatedForm(this) : FormAssociatedElement::form();

[keishi, 2014/09/16 01:59:19]

I think we shouldn't need to use findAssociatedForm if we call
formAttributeChanged from parseAttribute.

[spartha, 2014/09/17 11:02:18]

Done.

 }
 
 void HTMLLabelElement::setActive(bool down)
 {
     if (down == active())
         return;
 
     // Update our status first.
     HTMLElement::setActive(down);
 
@@ skipping 102 matching lines @@
 }
 
 void HTMLLabelElement::updateLabel(TreeScope& scope, const AtomicString& oldForAttributeValue, const AtomicString& newForAttributeValue)
 {
     if (!inDocument())
         return;
 
     if (oldForAttributeValue == newForAttributeValue)
         return;
 
+    HTMLElement* label = this;
     if (!oldForAttributeValue.isEmpty())
-        scope.removeLabel(oldForAttributeValue, toHTMLLabelElement(this));
+        scope.removeLabel(oldForAttributeValue, toHTMLLabelElement(label));

[keishi, 2014/09/16 01:59:19]

I think we don't need to use toHTMLLabelElement and just use "this".

[spartha, 2014/09/17 11:02:18]

Done.

     if (!newForAttributeValue.isEmpty())
-        scope.addLabel(newForAttributeValue, toHTMLLabelElement(this));
+        scope.addLabel(newForAttributeValue, toHTMLLabelElement(label));
 }
 
 void HTMLLabelElement::attributeWillChange(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     if (name == HTMLNames::forAttr) {
         TreeScope& scope = treeScope();
         if (scope.shouldCacheLabelsByForAttribute())
             updateLabel(scope, oldValue, newValue);
     }
     HTMLElement::attributeWillChange(name, oldValue, newValue);
 }
 
 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));
     }
     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);
+}
+
+void HTMLLabelElement::trace(Visitor* visitor)
+{
+    HTMLElement::trace(visitor);
+    FormAssociatedElement::trace(visitor);
 }
 
 } // namespace