Input type file should return ButtonRole.

Source/modules/accessibility/AXRenderObject.cpp

 /*
 * Copyright (C) 2008 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 314 matching lines @@
         if (type == InputTypeNames::datetime
             || type == InputTypeNames::datetime_local
             || type == InputTypeNames::month
             || type == InputTypeNames::week)
             return DateTimeRole;
         if (type == InputTypeNames::radio) {
             if ((node->parentNode() && isHTMLMenuElement(node->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole))
                 return MenuItemRadioRole;
             return RadioButtonRole;
         }
+        if (type == InputTypeNames::file)
+            return ButtonRole;
         if (type == InputTypeNames::number)
             return SpinButtonRole;
         if (input.isTextButton())
             return buttonRoleType();
         if (type == InputTypeNames::color)
             return ColorWellRole;
         if (type == InputTypeNames::time)
             return TimeRole;
         return TextFieldRole;
     }
 
-    if (isFileUploadButton())
-        return ButtonRole;
-
     if (cssBox && cssBox->isMenuList())
         return PopUpButtonRole;
 
     if (headingLevel())
         return HeadingRole;
 
     if (m_renderer->isSVGImage())
         return ImageRole;
     if (m_renderer->isSVGRoot())
         return SVGRootRole;
@@ skipping 130 matching lines @@
 {
     RenderBoxModelObject* renderer = renderBoxModelObject();
     if (!renderer)
         return false;
     // Widgets are the replaced elements that we represent to AX as attachments
     bool isRenderPart = renderer->isRenderPart();
     ASSERT(!isRenderPart || (renderer->isReplaced() && !isImage()));
     return isRenderPart;
 }
 
-bool AXRenderObject::isFileUploadButton() const
-{
-    return m_renderer && isHTMLInputElement(m_renderer->node()) && toHTMLInputElement(*m_renderer->node()).type() == InputTypeNames::file;
-}
-
 static bool isLinkable(const AXObject& object)
 {
     if (!object.renderer())
         return false;
 
     // See https://wiki.mozilla.org/Accessibility/AT-Windows-API for the elements
     // Mozilla considers linkable.
     return object.isLink() || object.isImage() || object.renderer()->isText();
 }
 
@@ skipping 1939 matching lines @@
         if (label && label->renderer()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink