Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1255)

Unified Diff: Source/modules/accessibility/AXObject.cpp

Issue 1045693002: Expose multiline attribute from blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reland Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/accessibility/AXObject.cpp
diff --git a/Source/modules/accessibility/AXObject.cpp b/Source/modules/accessibility/AXObject.cpp
index fcc9f2fc793529ae320ba4be66b0e243c373f8ce..7194440b6547472709f98e3ecc8fc58b0469605e 100644
--- a/Source/modules/accessibility/AXObject.cpp
+++ b/Source/modules/accessibility/AXObject.cpp
@@ -28,7 +28,6 @@
#include "config.h"
#include "modules/accessibility/AXObject.h"
-
#include "core/dom/NodeTraversal.h"
#include "core/editing/VisibleUnits.h"
#include "core/editing/htmlediting.h"
@@ -117,7 +116,7 @@ const RoleEntry roles[] = {
{ "tablist", TabListRole },
{ "tabpanel", TabPanelRole },
{ "text", StaticTextRole },
- { "textbox", TextAreaRole },
+ { "textbox", TextFieldRole },
{ "timer", TimerRole },
{ "toolbar", ToolbarRole },
{ "tooltip", UserInterfaceTooltipRole },
@@ -401,7 +400,7 @@ bool AXObject::isDetached() const
bool AXObject::isARIATextControl() const
{
- return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchBoxRole;
+ return ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchBoxRole;
}
bool AXObject::isButton() const
@@ -458,7 +457,6 @@ bool AXObject::isPasswordFieldAndShouldHideValue() const
bool AXObject::isTextControl() const
{
switch (roleValue()) {
- case TextAreaRole:
case TextFieldRole:
case ComboBoxRole:
case SearchBoxRole:
@@ -483,7 +481,6 @@ bool AXObject::isClickable() const
case RadioButtonRole:
case SpinButtonRole:
case TabRole:
- case TextAreaRole:
case TextFieldRole:
case ToggleButtonRole:
return true;
@@ -643,7 +640,6 @@ String AXObject::actionVerb() const
case ToggleButtonRole:
return queryString(WebLocalizedString::AXButtonActionVerb);
case TextFieldRole:
- case TextAreaRole:
return queryString(WebLocalizedString::AXTextFieldActionVerb);
case RadioButtonRole:
return queryString(WebLocalizedString::AXRadioButtonActionVerb);
@@ -681,8 +677,21 @@ AccessibilityButtonState AXObject::checkboxOrRadioValue() const
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");
}
@@ -1199,7 +1208,7 @@ int AXObject::lineForPosition(const VisiblePosition& visiblePos) const
bool AXObject::isARIAControl(AccessibilityRole ariaRole)
{
- return isARIAInput(ariaRole) || ariaRole == TextAreaRole || ariaRole == ButtonRole
+ return isARIAInput(ariaRole) || ariaRole == ButtonRole
|| ariaRole == ComboBoxRole || ariaRole == SliderRole;
}
« no previous file with comments | « Source/modules/accessibility/AXObject.h ('k') | Source/modules/accessibility/InspectorAccessibilityAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698