Expose multiline attribute from blink

Source/modules/accessibility/AXObject.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 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 10 matching lines @@
  * 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 "modules/accessibility/AXObject.h"
-
 #include "core/dom/NodeTraversal.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutListItem.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/LayoutView.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/UserGestureIndicator.h"
@@ skipping 68 matching lines @@
     { "searchbox", SearchBoxRole },
     { "separator", SplitterRole },
     { "slider", SliderRole },
     { "spinbutton", SpinButtonRole },
     { "status", StatusRole },
     { "switch", SwitchRole },
     { "tab", TabRole },
     { "tablist", TabListRole },
     { "tabpanel", TabPanelRole },
     { "text", StaticTextRole },
-    { "textbox", TextAreaRole },
+    { "textbox", TextFieldRole },
     { "timer", TimerRole },
     { "toolbar", ToolbarRole },
     { "tooltip", UserInterfaceTooltipRole },
     { "tree", TreeRole },
     { "treegrid", TreeGridRole },
     { "treeitem", TreeItemRole }
 };
 
 struct InternalRoleEntry {
     AccessibilityRole webcoreRole;
@@ skipping 263 matching lines @@
     m_detached = true;
 }
 
 bool AXObject::isDetached() const
 {
     return m_detached;
 }
 
 bool AXObject::isARIATextControl() const
 {
-    return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchBoxRole;
+    return ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchBoxRole;
 }
 
 bool AXObject::isButton() const
 {
     AccessibilityRole role = roleValue();
 
     return role == ButtonRole || role == PopUpButtonRole || role == ToggleButtonRole;
 }
 
 bool AXObject::isLandmarkRelated() const
@@ skipping 36 matching lines @@
     Settings* settings = document()->settings();
     if (!settings || settings->accessibilityPasswordValuesEnabled())
         return false;
 
     return isPasswordField();
 }
 
 bool AXObject::isTextControl() const
 {
     switch (roleValue()) {
-    case TextAreaRole:
     case TextFieldRole:
     case ComboBoxRole:
     case SearchBoxRole:
         return true;
     default:
         return false;
     }
 }
 
 bool AXObject::isClickable() const
 {
     switch (roleValue()) {
     case ButtonRole:
     case CheckBoxRole:
     case ColorWellRole:
     case ComboBoxRole:
     case ImageMapLinkRole:
     case LinkRole:
     case ListBoxOptionRole:
     case MenuButtonRole:
     case PopUpButtonRole:
     case RadioButtonRole:
     case SpinButtonRole:
     case TabRole:
-    case TextAreaRole:
     case TextFieldRole:
     case ToggleButtonRole:
         return true;
     default:
         return false;
     }
 }
 
 bool AXObject::accessibilityIsIgnored() const
 {
@@ skipping 139 matching lines @@
 
 String AXObject::actionVerb() const
 {
     // FIXME: Need to add verbs for select elements.
 
     switch (roleValue()) {
     case ButtonRole:
     case ToggleButtonRole:
         return queryString(WebLocalizedString::AXButtonActionVerb);
     case TextFieldRole:
-    case TextAreaRole:
         return queryString(WebLocalizedString::AXTextFieldActionVerb);
     case RadioButtonRole:
         return queryString(WebLocalizedString::AXRadioButtonActionVerb);
     case CheckBoxRole:
     case SwitchRole:
         return queryString(isChecked() ? WebLocalizedString::AXCheckedCheckBoxActionVerb : WebLocalizedString::AXUncheckedCheckBoxActionVerb);
     case LinkRole:
         return queryString(WebLocalizedString::AXLinkActionVerb);
     case PopUpButtonRole:
         // FIXME: Implement.
@@ skipping 17 matching lines @@
     if (equalIgnoringCase(result, "mixed")) {
         AccessibilityRole role = ariaRoleAttribute();
         if (role == RadioButtonRole || role == MenuItemRadioRole || role == SwitchRole)
             return ButtonStateOff;
         return ButtonStateMixed;
     }
 
     return ButtonStateOff;
 }
 
-bool AXObject::ariaIsMultiline() const
+bool AXObject::isMultiline() const
 {
+    Node* node = this->node();
+    if (!node)
+        return false;
+
+    if (isHTMLTextAreaElement(*node))
+        return true;
+
+    if (node->hasEditableStyle())
+        return true;
+
+    if (!isNativeTextControl() && !isNonNativeTextControl())
+        return false;
+
     return equalIgnoringCase(getAttribute(aria_multilineAttr), "true");
 }
 
 bool AXObject::ariaPressedIsPresent() const
 {
     return !getAttribute(aria_pressedAttr).isEmpty();
 }
 
 bool AXObject::supportsARIAAttributes() const
 {
@@ skipping 496 matching lines @@
         VisiblePosition prevVisiblePos = previousLinePosition(currentVisiblePos, 0, HasEditableAXRole);
         currentVisiblePos = prevVisiblePos;
         ++lineCount;
     } while (currentVisiblePos.isNotNull() && !(inSameLine(currentVisiblePos, savedVisiblePos)));
 
     return lineCount;
 }
 
 bool AXObject::isARIAControl(AccessibilityRole ariaRole)
 {
-    return isARIAInput(ariaRole) || ariaRole == TextAreaRole || ariaRole == ButtonRole
+    return isARIAInput(ariaRole) || ariaRole == ButtonRole
         || ariaRole == ComboBoxRole || ariaRole == SliderRole;
 }
 
 bool AXObject::isARIAInput(AccessibilityRole ariaRole)
 {
     return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole || ariaRole == SwitchRole || ariaRole ==  SearchBoxRole;
 }
 
 AccessibilityRole AXObject::ariaRoleToWebCoreRole(const String& value)
 {
@@ skipping 78 matching lines @@
 }
 
 const AtomicString& AXObject::internalRoleName(AccessibilityRole role)
 {
     static const Vector<AtomicString>* internalRoleNameVector = createInternalRoleNameVector();
 
     return internalRoleNameVector->at(role);
 }
 
 } // namespace blink