Remove a part of type checking predicates of HTMLInputElement.

Source/core/html/RadioNodeList.cpp

 /*
  * Copyright (c) 2012 Motorola Mobility, 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY MOTOROLA MOBILITY, INC. AND ITS CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MOTOROLA MOBILITY, INC. OR ITS
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/RadioNodeList.h"
 
 #include "core/HTMLNames.h"
+#include "core/InputTypeNames.h"
 #include "core/dom/Element.h"
 #include "core/dom/NodeRareData.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLObjectElement.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 RadioNodeList::RadioNodeList(ContainerNode& rootNode, const AtomicString& name, CollectionType type)
     : LiveNodeList(rootNode, type, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
     , m_name(name)
 {
 }
 
 RadioNodeList::~RadioNodeList()
 {
 #if !ENABLE(OILPAN)
     ownerNode().nodeLists()->removeCache(this, type(), m_name);
 #endif
 }
 
 static inline HTMLInputElement* toRadioButtonInputElement(Element& element)
 {
     if (!isHTMLInputElement(element))
         return 0;
     HTMLInputElement& inputElement = toHTMLInputElement(element);
-    if (!inputElement.isRadioButton() || inputElement.value().isEmpty())
+    if (inputElement.type() != InputTypeNames::radio || inputElement.value().isEmpty())
         return 0;
     return &inputElement;
 }
 
 String RadioNodeList::value() const
 {
     if (shouldOnlyMatchImgElements())
         return String();
     unsigned length = this->length();
     for (unsigned i = 0; i < length; ++i) {
@@ skipping 45 matching lines @@
 
         if (toHTMLImageElement(element).formOwner() != ownerNode())
             return false;
 
         return matchesByIdOrName(element);
     }
 
     if (!isHTMLObjectElement(element) && !element.isFormControlElement())
         return false;
 
-    if (isHTMLInputElement(element) && toHTMLInputElement(element).isImageButton())
+    if (isHTMLInputElement(element) && toHTMLInputElement(element).type() == InputTypeNames::image)
         return false;
 
     return checkElementMatchesRadioNodeListFilter(element);
 }
 
 } // namespace