Introduce toHTMLFormControlElement, and use it.

Introduce toHTMLFormControlElement, and use it.

Note for 'alias'-related changes in HTMLFormElement:
We had unnecessary cast from Node to HTMLFormControlElement.
m_elementAliases can contain HTMLImageElement and HTMLObjectElement
in addition to HTMLFormControlElement. A node was cast to
HTMLFormControlElement wrongly, but it was harmless because nodes
stored in m_elementAliases are used as Node*.


Note for the HTMLSelectElement.h change:
HTMLKeyGenElement::reset() wants to call HTMLSelectElement::reset(), and
it was realized by a cast to HTMLFormControlElement, of which reset() is
public. Replacing the cast to toHTMLFormControlElement doesn't work
because both of toHTMLFormControlElement(Node*) and
toHTMLFormControlElement(FormAssociatedElement*) match to an
HTMLSelectElement argument.
The public reset() makes the code simpler.

BUG=none
TEST=none; no behavior changes.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=152706

[keishi, 2013-06-19 05:07:02]

lgtm

[commit-bot: I haz the power, 2013-06-19 05:49:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tkent@chromium.org/17381010/5001

[commit-bot: I haz the power, 2013-06-19 05:49:57]

Failed to apply patch for Source/core/html/HTMLFormElement.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/HTMLFormElement.cpp
  Hunk #8 FAILED at 651.
  Hunk #9 succeeded at 664 (offset 5 lines).
  Hunk #10 succeeded at 684 (offset 5 lines).
  Hunk #11 succeeded at 693 (offset 5 lines).
  1 out of 11 hunks FAILED -- saving rejects to file
Source/core/html/HTMLFormElement.cpp.rej

Patch:       Source/core/html/HTMLFormElement.cpp
Index: Source/core/html/HTMLFormElement.cpp
diff --git a/Source/core/html/HTMLFormElement.cpp
b/Source/core/html/HTMLFormElement.cpp
index
633d4b9a15736ef180928eba707270253b8b0752..e1ce73c7b83f28b07a220e32b8bcc66798867ccd
100644
--- a/Source/core/html/HTMLFormElement.cpp
+++ b/Source/core/html/HTMLFormElement.cpp
@@ -186,13 +186,13 @@ void HTMLFormElement::submitImplicitly(Event* event, bool
fromImplicitSubmission
         FormAssociatedElement* formAssociatedElement = m_associatedElements[i];
         if (!formAssociatedElement->isFormControlElement())
             continue;
-        HTMLFormControlElement* formElement =
static_cast<HTMLFormControlElement*>(formAssociatedElement);
-        if (formElement->isSuccessfulSubmitButton()) {
-            if (formElement->renderer()) {
-                formElement->dispatchSimulatedClick(event);
+        HTMLFormControlElement* control =
toHTMLFormControlElement(formAssociatedElement);
+        if (control->isSuccessfulSubmitButton()) {
+            if (control->renderer()) {
+                control->dispatchSimulatedClick(event);
                 return;
             }
-        } else if (formElement->canTriggerImplicitSubmission())
+        } else if (control->canTriggerImplicitSubmission())
             ++submissionTriggerCount;
     }
     if (fromImplicitSubmissionTrigger && submissionTriggerCount == 1)
@@ -203,7 +203,7 @@ static inline HTMLFormControlElement*
submitElementFromEvent(const Event* event)
 {
     for (Node* node = event->target()->toNode(); node; node =
node->parentNode()) {
         if (node->isElementNode() && toElement(node)->isFormControlElement())
-            return static_cast<HTMLFormControlElement*>(node);
+            return toHTMLFormControlElement(node);
     }
     return 0;
 }
@@ -220,7 +220,7 @@ bool HTMLFormElement::validateInteractively(Event* event)
 
     for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
         if (m_associatedElements[i]->isFormControlElement())
-           
static_cast<HTMLFormControlElement*>(m_associatedElements[i])->hideVisibleValidationMessage();
+           
toHTMLFormControlElement(m_associatedElements[i])->hideVisibleValidationMessage();
     }
 
     Vector<RefPtr<FormAssociatedElement> > unhandledInvalidControls;
@@ -242,7 +242,7 @@ bool HTMLFormElement::validateInteractively(Event* event)
             unhandled->scrollIntoViewIfNeeded(false);
             unhandled->focus();
             if (unhandled->isFormControlElement())
-               
static_cast<HTMLFormControlElement*>(unhandled)->updateVisibleValidationMessage();
+               
toHTMLFormControlElement(unhandled)->updateVisibleValidationMessage();
             break;
         }
     }
@@ -344,7 +344,7 @@ void HTMLFormElement::submit(Event* event, bool
activateSubmitButton, bool proce
         if (!associatedElement->isFormControlElement())
             continue;
         if (needButtonActivation) {
-            HTMLFormControlElement* control =
static_cast<HTMLFormControlElement*>(associatedElement);
+            HTMLFormControlElement* control =
toHTMLFormControlElement(associatedElement);
             if (control->isActivatedSubmit())
                 needButtonActivation = false;
             else if (firstSuccessfulSubmitButton == 0 &&
control->isSuccessfulSubmitButton())
@@ -379,7 +379,7 @@ void HTMLFormElement::reset()
 
     for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
         if (m_associatedElements[i]->isFormControlElement())
-           
static_cast<HTMLFormControlElement*>(m_associatedElements[i])->reset();
+            toHTMLFormControlElement(m_associatedElements[i])->reset();
     }
 
     m_isInResetFunction = false;
@@ -625,7 +625,7 @@ HTMLFormControlElement* HTMLFormElement::defaultButton()
const
     for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
         if (!m_associatedElements[i]->isFormControlElement())
             continue;
-        HTMLFormControlElement* control =
static_cast<HTMLFormControlElement*>(m_associatedElements[i]);
+        HTMLFormControlElement* control =
toHTMLFormControlElement(m_associatedElements[i]);
         if (control->isSuccessfulSubmitButton())
             return control;
     }
@@ -651,7 +651,7 @@ bool
HTMLFormElement::checkInvalidControlsAndCollectUnhandled(Vector<RefPtr<Form
     bool hasInvalidControls = false;
     for (unsigned i = 0; i < elements.size(); ++i) {
         if (elements[i]->form() == this && elements[i]->isFormControlElement())
{
-            HTMLFormControlElement* control =
static_cast<HTMLFormControlElement*>(elements[i].get());
+            HTMLFormControlElement* control =
toHTMLFormControlElement(elements[i].get());
             if (!control->checkValidity(&unhandledInvalidControls) &&
control->form() == this)
                 hasInvalidControls = true;
         }
@@ -659,14 +659,14 @@ bool
HTMLFormElement::checkInvalidControlsAndCollectUnhandled(Vector<RefPtr<Form
     return hasInvalidControls;
 }
 
-HTMLFormControlElement* HTMLFormElement::elementForAlias(const AtomicString&
alias)
+Node* HTMLFormElement::elementForAlias(const AtomicString& alias)
 {
     if (alias.isEmpty() || !m_elementAliases)
         return 0;
     return m_elementAliases->get(alias.impl());
 }
 
-void HTMLFormElement::addElementAlias(HTMLFormControlElement* element, const
AtomicString& alias)
+void HTMLFormElement::addElementAlias(Node* element, const AtomicString& alias)
 {
     if (alias.isEmpty())
         return;
@@ -679,7 +679,7 @@ void HTMLFormElement::getNamedElements(const AtomicString&
name, Vector<RefPtr<N
 {
     elements()->namedItems(name, namedItems);
 
-    HTMLFormControlElement* aliasElement = elementForAlias(name);
+    Node* aliasElement = elementForAlias(name);
     if (aliasElement) {
         if (namedItems.find(aliasElement) == notFound) {
             // We have seen it before but it is gone now. Still, we need to
return it.
@@ -688,7 +688,7 @@ void HTMLFormElement::getNamedElements(const AtomicString&
name, Vector<RefPtr<N
         }
     }
     if (namedItems.size() && namedItems.first() != aliasElement)
-       
addElementAlias(static_cast<HTMLFormControlElement*>(namedItems.first().get()),
name);
+        addElementAlias(namedItems.first().get(), name);
 }
 
 bool HTMLFormElement::shouldAutocomplete() const

[commit-bot: I haz the power, 2013-06-19 06:00:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tkent@chromium.org/17381010/3003

[commit-bot: I haz the power, 2013-06-19 07:21:38]

Change committed as 152706