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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/browser_accessibility_win.cc

Issue 23651003: Use Blink accessibility enums in Chromium (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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
« no previous file with comments | « content/browser/accessibility/browser_accessibility_manager_win.cc ('k') | content/browser/accessibility/browser_accessibility_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/accessibility/browser_accessibility_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 614dd8f61a225201509eaa939c611d75999b09d6..b5c8fd3c90dc8afb51505f9e7751b25afded305f 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -598,12 +598,12 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) {
if (!instance_active_)
return E_FAIL;
- if (role_ != AccessibilityNodeData::ROLE_LISTBOX)
+ if (role_ != WebKit::WebAXRoleListBox)
return E_NOTIMPL;
unsigned long selected_count = 0;
for (size_t i = 0; i < children_.size(); ++i) {
- if (children_[i]->HasState(AccessibilityNodeData::STATE_SELECTED))
+ if (children_[i]->HasState(WebKit::WebAXStateSelected))
++selected_count;
}
@@ -614,7 +614,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) {
if (selected_count == 1) {
for (size_t i = 0; i < children_.size(); ++i) {
- if (children_[i]->HasState(AccessibilityNodeData::STATE_SELECTED)) {
+ if (children_[i]->HasState(WebKit::WebAXStateSelected)) {
selected->vt = VT_DISPATCH;
selected->pdispVal =
children_[i]->ToBrowserAccessibilityWin()->NewReference();
@@ -629,7 +629,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) {
enum_variant->AddRef();
unsigned long index = 0;
for (size_t i = 0; i < children_.size(); ++i) {
- if (children_[i]->HasState(AccessibilityNodeData::STATE_SELECTED)) {
+ if (children_[i]->HasState(WebKit::WebAXStateSelected)) {
enum_variant->ItemAt(index)->vt = VT_DISPATCH;
enum_variant->ItemAt(index)->pdispVal =
children_[i]->ToBrowserAccessibilityWin()->NewReference();
@@ -870,9 +870,9 @@ STDMETHODIMP BrowserAccessibilityWin::get_groupPosition(
if (!group_level || !similar_items_in_group || !position_in_group)
return E_INVALIDARG;
- if (role_ == AccessibilityNodeData::ROLE_LISTBOX_OPTION &&
+ if (role_ == WebKit::WebAXRoleListBoxOption &&
parent_ &&
- parent_->role() == AccessibilityNodeData::ROLE_LISTBOX) {
+ parent_->role() == WebKit::WebAXRoleListBox) {
*group_level = 0;
*similar_items_in_group = parent_->child_count();
*position_in_group = index_in_parent_ + 1;
@@ -1131,7 +1131,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnDescription(long column,
int cell_id = cell_ids[i * columns + column];
BrowserAccessibilityWin* cell = static_cast<BrowserAccessibilityWin*>(
manager_->GetFromRendererID(cell_id));
- if (cell && cell->role_ == AccessibilityNodeData::ROLE_COLUMN_HEADER) {
+ if (cell && cell->role_ == WebKit::WebAXRoleColumnHeader) {
string16 cell_name = cell->GetString16Attribute(
AccessibilityNodeData::ATTR_NAME);
if (cell_name.size() > 0) {
@@ -1318,7 +1318,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowDescription(long row,
int cell_id = cell_ids[row * columns + i];
BrowserAccessibilityWin* cell =
manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin();
- if (cell && cell->role_ == AccessibilityNodeData::ROLE_ROW_HEADER) {
+ if (cell && cell->role_ == WebKit::WebAXRoleRowHeader) {
string16 cell_name = cell->GetString16Attribute(
AccessibilityNodeData::ATTR_NAME);
if (cell_name.size() > 0) {
@@ -1641,7 +1641,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells(
}
BrowserAccessibility* table = parent();
- while (table && table->role() != AccessibilityNodeData::ROLE_TABLE)
+ while (table && table->role() != WebKit::WebAXRoleTable)
table = table->parent();
if (!table) {
NOTREACHED();
@@ -1666,7 +1666,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells(
int cell_id = cell_ids[i * columns + column];
BrowserAccessibilityWin* cell =
manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin();
- if (cell && cell->role_ == AccessibilityNodeData::ROLE_COLUMN_HEADER)
+ if (cell && cell->role_ == WebKit::WebAXRoleColumnHeader)
(*n_column_header_cells)++;
}
@@ -1677,7 +1677,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells(
int cell_id = cell_ids[i * columns + column];
BrowserAccessibilityWin* cell =
manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin();
- if (cell && cell->role_ == AccessibilityNodeData::ROLE_COLUMN_HEADER) {
+ if (cell && cell->role_ == WebKit::WebAXRoleColumnHeader) {
(*cell_accessibles)[index] =
static_cast<IAccessible*>(cell->NewReference());
++index;
@@ -1740,7 +1740,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells(
}
BrowserAccessibility* table = parent();
- while (table && table->role() != AccessibilityNodeData::ROLE_TABLE)
+ while (table && table->role() != WebKit::WebAXRoleTable)
table = table->parent();
if (!table) {
NOTREACHED();
@@ -1765,7 +1765,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells(
int cell_id = cell_ids[row * columns + i];
BrowserAccessibilityWin* cell =
manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin();
- if (cell && cell->role_ == AccessibilityNodeData::ROLE_ROW_HEADER)
+ if (cell && cell->role_ == WebKit::WebAXRoleRowHeader)
(*n_row_header_cells)++;
}
@@ -1776,7 +1776,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells(
int cell_id = cell_ids[row * columns + i];
BrowserAccessibilityWin* cell =
manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin();
- if (cell && cell->role_ == AccessibilityNodeData::ROLE_ROW_HEADER) {
+ if (cell && cell->role_ == WebKit::WebAXRoleRowHeader) {
(*cell_accessibles)[index] =
static_cast<IAccessible*>(cell->NewReference());
++index;
@@ -1865,7 +1865,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_table(IUnknown** table) {
GetIntAttribute(AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX, &column);
BrowserAccessibility* find_table = parent();
- while (find_table && find_table->role() != AccessibilityNodeData::ROLE_TABLE)
+ while (find_table && find_table->role() != WebKit::WebAXRoleTable)
find_table = find_table->parent();
if (!find_table) {
NOTREACHED();
@@ -1901,8 +1901,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) {
return E_INVALIDARG;
*offset = 0;
- if (role_ == AccessibilityNodeData::ROLE_TEXT_FIELD ||
- role_ == AccessibilityNodeData::ROLE_TEXTAREA) {
+ if (role_ == WebKit::WebAXRoleTextField ||
+ role_ == WebKit::WebAXRoleTextArea) {
int sel_start = 0;
if (GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_START,
&sel_start))
@@ -1920,8 +1920,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) {
return E_INVALIDARG;
*n_selections = 0;
- if (role_ == AccessibilityNodeData::ROLE_TEXT_FIELD ||
- role_ == AccessibilityNodeData::ROLE_TEXTAREA) {
+ if (role_ == WebKit::WebAXRoleTextField ||
+ role_ == WebKit::WebAXRoleTextArea) {
int sel_start = 0;
int sel_end = 0;
if (GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_START,
@@ -1945,8 +1945,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index,
*start_offset = 0;
*end_offset = 0;
- if (role_ == AccessibilityNodeData::ROLE_TEXT_FIELD ||
- role_ == AccessibilityNodeData::ROLE_TEXTAREA) {
+ if (role_ == WebKit::WebAXRoleTextField ||
+ role_ == WebKit::WebAXRoleTextArea) {
int sel_start = 0;
int sel_end = 0;
if (GetIntAttribute(
@@ -2792,9 +2792,9 @@ void BrowserAccessibilityWin::PreInitialize() {
IntAttributeToIA2(AccessibilityNodeData::ATTR_HIERARCHICAL_LEVEL, "level");
// Expose the set size and position in set for listbox options.
- if (role_ == AccessibilityNodeData::ROLE_LISTBOX_OPTION &&
+ if (role_ == WebKit::WebAXRoleListBoxOption &&
parent_ &&
- parent_->role() == AccessibilityNodeData::ROLE_LISTBOX) {
+ parent_->role() == WebKit::WebAXRoleListBox) {
ia2_attributes_.push_back(
L"setsize:" + base::IntToString16(parent_->child_count()));
ia2_attributes_.push_back(
@@ -2833,7 +2833,7 @@ void BrowserAccessibilityWin::PreInitialize() {
// Expose table cell index.
if (ia_role_ == ROLE_SYSTEM_CELL) {
BrowserAccessibility* table = parent();
- while (table && table->role() != AccessibilityNodeData::ROLE_TABLE)
+ while (table && table->role() != WebKit::WebAXRoleTable)
table = table->parent();
if (table) {
const std::vector<int32>& unique_cell_ids = table->GetIntListAttribute(
@@ -2903,8 +2903,8 @@ void BrowserAccessibilityWin::PreInitialize() {
// If it's a text field, also consider the placeholder.
std::string placeholder;
- if (role_ == AccessibilityNodeData::ROLE_TEXT_FIELD &&
- HasState(AccessibilityNodeData::STATE_FOCUSABLE) &&
+ if (role_ == WebKit::WebAXRoleTextField &&
+ HasState(WebKit::WebAXStateFocusable) &&
GetHtmlAttribute("placeholder", &placeholder)) {
if (name_.empty() && !title_elem_id) {
name_ = placeholder;
@@ -2917,8 +2917,8 @@ void BrowserAccessibilityWin::PreInitialize() {
SetStringAttribute(AccessibilityNodeData::ATTR_HELP, help);
// On Windows, the value of a document should be its url.
- if (role_ == AccessibilityNodeData::ROLE_ROOT_WEB_AREA ||
- role_ == AccessibilityNodeData::ROLE_WEB_AREA) {
+ if (role_ == WebKit::WebAXRoleRootWebArea ||
+ role_ == WebKit::WebAXRoleWebArea) {
GetStringAttribute(AccessibilityNodeData::ATTR_DOC_URL, &value_);
}
@@ -2926,9 +2926,9 @@ void BrowserAccessibilityWin::PreInitialize() {
// WebKit stores the main accessible text in the "value" - swap it so
// that it's the "name".
if (name_.empty() &&
- (role_ == AccessibilityNodeData::ROLE_LISTBOX_OPTION ||
- role_ == AccessibilityNodeData::ROLE_STATIC_TEXT ||
- role_ == AccessibilityNodeData::ROLE_LIST_MARKER)) {
+ (role_ == WebKit::WebAXRoleListBoxOption ||
+ role_ == WebKit::WebAXRoleStaticText ||
+ role_ == WebKit::WebAXRoleListMarker)) {
name_.swap(value_);
}
@@ -2965,7 +2965,7 @@ void BrowserAccessibilityWin::PostInitialize() {
hypertext_.clear();
for (unsigned int i = 0; i < children().size(); ++i) {
BrowserAccessibility* child = children()[i];
- if (child->role() == AccessibilityNodeData::ROLE_STATIC_TEXT) {
+ if (child->role() == WebKit::WebAXRoleStaticText) {
hypertext_ += UTF8ToUTF16(child->name());
} else {
hyperlink_offset_to_index_[hypertext_.size()] = hyperlinks_.size();
@@ -2976,15 +2976,15 @@ void BrowserAccessibilityWin::PostInitialize() {
DCHECK_EQ(hyperlink_offset_to_index_.size(), hyperlinks_.size());
// Fire an event when an alert first appears.
- if (role_ == AccessibilityNodeData::ROLE_ALERT && first_time_)
- manager_->NotifyAccessibilityEvent(AccessibilityNotificationAlert, this);
+ if (role_ == WebKit::WebAXRoleAlert && first_time_)
+ manager_->NotifyAccessibilityEvent(WebKit::WebAXEventAlert, this);
// Fire events if text has changed.
string16 text = TextForIAccessibleText();
if (previous_text_ != text) {
if (!previous_text_.empty() && !text.empty()) {
manager_->NotifyAccessibilityEvent(
- AccessibilityNotificationObjectShow, this);
+ WebKit::WebAXEventShow, this);
}
// TODO(dmazzoni): Look into HIDE events, too.
@@ -3002,7 +3002,7 @@ void BrowserAccessibilityWin::PostInitialize() {
// focus for managed descendants is platform-specific.
// Fire a focus event if the focused descendant in a multi-select
// list box changes.
- if (role_ == AccessibilityNodeData::ROLE_LISTBOX_OPTION &&
+ if (role_ == WebKit::WebAXRoleListBoxOption &&
(ia_state_ & STATE_SYSTEM_FOCUSABLE) &&
(ia_state_ & STATE_SYSTEM_SELECTABLE) &&
(ia_state_ & STATE_SYSTEM_FOCUSED) &&
@@ -3123,7 +3123,7 @@ string16 BrowserAccessibilityWin::GetValueText() {
string16 BrowserAccessibilityWin::TextForIAccessibleText() {
if (IsEditableText())
return UTF8ToUTF16(value_);
- return (role_ == AccessibilityNodeData::ROLE_STATIC_TEXT) ?
+ return (role_ == WebKit::WebAXRoleStaticText) ?
UTF8ToUTF16(name_) : hypertext_;
}
@@ -3173,59 +3173,59 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia2_state_ = IA2_STATE_OPAQUE;
ia2_attributes_.clear();
- if (HasState(AccessibilityNodeData::STATE_BUSY))
+ if (HasState(WebKit::WebAXStateBusy))
ia_state_ |= STATE_SYSTEM_BUSY;
- if (HasState(AccessibilityNodeData::STATE_CHECKED))
+ if (HasState(WebKit::WebAXStateChecked))
ia_state_ |= STATE_SYSTEM_CHECKED;
- if (HasState(AccessibilityNodeData::STATE_COLLAPSED))
+ if (HasState(WebKit::WebAXStateCollapsed))
ia_state_ |= STATE_SYSTEM_COLLAPSED;
- if (HasState(AccessibilityNodeData::STATE_EXPANDED))
+ if (HasState(WebKit::WebAXStateExpanded))
ia_state_ |= STATE_SYSTEM_EXPANDED;
- if (HasState(AccessibilityNodeData::STATE_FOCUSABLE))
+ if (HasState(WebKit::WebAXStateFocusable))
ia_state_ |= STATE_SYSTEM_FOCUSABLE;
- if (HasState(AccessibilityNodeData::STATE_HASPOPUP))
+ if (HasState(WebKit::WebAXStateHaspopup))
ia_state_ |= STATE_SYSTEM_HASPOPUP;
- if (HasState(AccessibilityNodeData::STATE_HOTTRACKED))
+ if (HasState(WebKit::WebAXStateHovered))
ia_state_ |= STATE_SYSTEM_HOTTRACKED;
- if (HasState(AccessibilityNodeData::STATE_INDETERMINATE))
+ if (HasState(WebKit::WebAXStateIndeterminate))
ia_state_ |= STATE_SYSTEM_INDETERMINATE;
- if (HasState(AccessibilityNodeData::STATE_INVISIBLE))
+ if (HasState(WebKit::WebAXStateInvisible))
ia_state_ |= STATE_SYSTEM_INVISIBLE;
- if (HasState(AccessibilityNodeData::STATE_LINKED))
+ if (HasState(WebKit::WebAXStateLinked))
ia_state_ |= STATE_SYSTEM_LINKED;
- if (HasState(AccessibilityNodeData::STATE_MULTISELECTABLE)) {
+ if (HasState(WebKit::WebAXStateMultiselectable)) {
ia_state_ |= STATE_SYSTEM_EXTSELECTABLE;
ia_state_ |= STATE_SYSTEM_MULTISELECTABLE;
}
// TODO(ctguil): Support STATE_SYSTEM_EXTSELECTABLE/accSelect.
- if (HasState(AccessibilityNodeData::STATE_OFFSCREEN))
+ if (HasState(WebKit::WebAXStateOffscreen))
ia_state_ |= STATE_SYSTEM_OFFSCREEN;
- if (HasState(AccessibilityNodeData::STATE_PRESSED))
+ if (HasState(WebKit::WebAXStatePressed))
ia_state_ |= STATE_SYSTEM_PRESSED;
- if (HasState(AccessibilityNodeData::STATE_PROTECTED))
+ if (HasState(WebKit::WebAXStateProtected))
ia_state_ |= STATE_SYSTEM_PROTECTED;
- if (HasState(AccessibilityNodeData::STATE_REQUIRED))
+ if (HasState(WebKit::WebAXStateRequired))
ia2_state_ |= IA2_STATE_REQUIRED;
- if (HasState(AccessibilityNodeData::STATE_SELECTABLE))
+ if (HasState(WebKit::WebAXStateSelectable))
ia_state_ |= STATE_SYSTEM_SELECTABLE;
- if (HasState(AccessibilityNodeData::STATE_SELECTED))
+ if (HasState(WebKit::WebAXStateSelected))
ia_state_ |= STATE_SYSTEM_SELECTED;
- if (HasState(AccessibilityNodeData::STATE_TRAVERSED))
+ if (HasState(WebKit::WebAXStateVisited))
ia_state_ |= STATE_SYSTEM_TRAVERSED;
- if (HasState(AccessibilityNodeData::STATE_UNAVAILABLE))
+ if (!HasState(WebKit::WebAXStateEnabled))
ia_state_ |= STATE_SYSTEM_UNAVAILABLE;
- if (HasState(AccessibilityNodeData::STATE_VERTICAL)) {
+ if (HasState(WebKit::WebAXStateVertical)) {
ia2_state_ |= IA2_STATE_VERTICAL;
} else {
ia2_state_ |= IA2_STATE_HORIZONTAL;
}
- if (HasState(AccessibilityNodeData::STATE_VISITED))
+ if (HasState(WebKit::WebAXStateVisited))
ia_state_ |= STATE_SYSTEM_TRAVERSED;
// WebKit marks everything as readonly unless it's editable text, so if it's
// not readonly, mark it as editable now. The final computation of the
// READONLY state for MSAA is below, after the switch.
- if (!HasState(AccessibilityNodeData::STATE_READONLY))
+ if (!HasState(WebKit::WebAXStateReadonly))
ia2_state_ |= IA2_STATE_EDITABLE;
string16 invalid;
@@ -3243,25 +3243,25 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia_role_ = 0;
ia2_role_ = 0;
switch (role_) {
- case AccessibilityNodeData::ROLE_ALERT:
+ case WebKit::WebAXRoleAlert:
ia_role_ = ROLE_SYSTEM_ALERT;
break;
- case AccessibilityNodeData::ROLE_ALERT_DIALOG:
+ case WebKit::WebAXRoleAlertDialog:
ia_role_ = ROLE_SYSTEM_DIALOG;
break;
- case AccessibilityNodeData::ROLE_APPLICATION:
+ case WebKit::WebAXRoleApplication:
ia_role_ = ROLE_SYSTEM_APPLICATION;
break;
- case AccessibilityNodeData::ROLE_ARTICLE:
+ case WebKit::WebAXRoleArticle:
ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_SECTION;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_BUSY_INDICATOR:
+ case WebKit::WebAXRoleBusyIndicator:
ia_role_ = ROLE_SYSTEM_ANIMATION;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_BUTTON:
+ case WebKit::WebAXRoleButton:
ia_role_ = ROLE_SYSTEM_PUSHBUTTON;
bool is_aria_pressed_defined;
bool is_mixed;
@@ -3272,85 +3272,86 @@ void BrowserAccessibilityWin::InitRoleAndState() {
if (is_mixed)
ia_state_ |= STATE_SYSTEM_MIXED;
break;
- case AccessibilityNodeData::ROLE_CANVAS:
- ia_role_ = ROLE_SYSTEM_GRAPHIC;
- break;
- case AccessibilityNodeData::ROLE_CANVAS_WITH_FALLBACK_CONTENT:
- role_name_ = L"canvas";
- ia2_role_ = IA2_ROLE_CANVAS;
+ case WebKit::WebAXRoleCanvas:
+ if (GetBoolAttribute(AccessibilityNodeData::ATTR_CANVAS_HAS_FALLBACK)) {
+ role_name_ = L"canvas";
+ ia2_role_ = IA2_ROLE_CANVAS;
+ } else {
+ ia_role_ = ROLE_SYSTEM_GRAPHIC;
+ }
break;
- case AccessibilityNodeData::ROLE_CELL:
+ case WebKit::WebAXRoleCell:
ia_role_ = ROLE_SYSTEM_CELL;
break;
- case AccessibilityNodeData::ROLE_CHECKBOX:
+ case WebKit::WebAXRoleCheckBox:
ia_role_ = ROLE_SYSTEM_CHECKBUTTON;
break;
- case AccessibilityNodeData::ROLE_COLOR_WELL:
+ case WebKit::WebAXRoleColorWell:
ia_role_ = ROLE_SYSTEM_CLIENT;
ia2_role_ = IA2_ROLE_COLOR_CHOOSER;
break;
- case AccessibilityNodeData::ROLE_COLUMN:
+ case WebKit::WebAXRoleColumn:
ia_role_ = ROLE_SYSTEM_COLUMN;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_COLUMN_HEADER:
+ case WebKit::WebAXRoleColumnHeader:
ia_role_ = ROLE_SYSTEM_COLUMNHEADER;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_COMBO_BOX:
+ case WebKit::WebAXRoleComboBox:
ia_role_ = ROLE_SYSTEM_COMBOBOX;
break;
- case AccessibilityNodeData::ROLE_DIV:
+ case WebKit::WebAXRoleDiv:
role_name_ = L"div";
ia2_role_ = IA2_ROLE_SECTION;
break;
- case AccessibilityNodeData::ROLE_DEFINITION:
+ case WebKit::WebAXRoleDefinition:
role_name_ = html_tag;
ia2_role_ = IA2_ROLE_PARAGRAPH;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_DESCRIPTION_LIST_DETAIL:
+ case WebKit::WebAXRoleDescriptionListDetail:
role_name_ = html_tag;
ia2_role_ = IA2_ROLE_PARAGRAPH;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_DESCRIPTION_LIST_TERM:
+ case WebKit::WebAXRoleDescriptionListTerm:
ia_role_ = ROLE_SYSTEM_LISTITEM;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_DIALOG:
+ case WebKit::WebAXRoleDialog:
ia_role_ = ROLE_SYSTEM_DIALOG;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_DISCLOSURE_TRIANGLE:
+ case WebKit::WebAXRoleDisclosureTriangle:
ia_role_ = ROLE_SYSTEM_OUTLINEBUTTON;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_DOCUMENT:
- case AccessibilityNodeData::ROLE_ROOT_WEB_AREA:
- case AccessibilityNodeData::ROLE_WEB_AREA:
+ case WebKit::WebAXRoleDocument:
+ case WebKit::WebAXRoleRootWebArea:
+ case WebKit::WebAXRoleWebArea:
ia_role_ = ROLE_SYSTEM_DOCUMENT;
ia_state_ |= STATE_SYSTEM_READONLY;
ia_state_ |= STATE_SYSTEM_FOCUSABLE;
break;
- case AccessibilityNodeData::ROLE_EDITABLE_TEXT:
+ case WebKit::WebAXRoleEditableText:
ia_role_ = ROLE_SYSTEM_TEXT;
ia2_state_ |= IA2_STATE_SINGLE_LINE;
ia2_state_ |= IA2_STATE_EDITABLE;
break;
- case AccessibilityNodeData::ROLE_FORM:
+ case WebKit::WebAXRoleForm:
role_name_ = L"form";
ia2_role_ = IA2_ROLE_FORM;
break;
- case AccessibilityNodeData::ROLE_FOOTER:
+ case WebKit::WebAXRoleFooter:
ia_role_ = IA2_ROLE_FOOTER;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_GRID:
+ case WebKit::WebAXRoleGrid:
ia_role_ = ROLE_SYSTEM_TABLE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_GROUP: {
+ case WebKit::WebAXRoleGroup: {
string16 aria_role = GetString16Attribute(
AccessibilityNodeData::ATTR_ROLE);
if (aria_role == L"group" || html_tag == L"fieldset") {
@@ -3367,190 +3368,188 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia_state_ |= STATE_SYSTEM_READONLY;
break;
}
- case AccessibilityNodeData::ROLE_GROW_AREA:
+ case WebKit::WebAXRoleGrowArea:
ia_role_ = ROLE_SYSTEM_GRIP;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_HEADING:
+ case WebKit::WebAXRoleHeading:
role_name_ = html_tag;
ia2_role_ = IA2_ROLE_HEADING;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_HORIZONTAL_RULE:
+ case WebKit::WebAXRoleHorizontalRule:
ia_role_ = ROLE_SYSTEM_SEPARATOR;
break;
- case AccessibilityNodeData::ROLE_IMAGE:
+ case WebKit::WebAXRoleImage:
ia_role_ = ROLE_SYSTEM_GRAPHIC;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_IMAGE_MAP:
+ case WebKit::WebAXRoleImageMap:
role_name_ = html_tag;
ia2_role_ = IA2_ROLE_IMAGE_MAP;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_IMAGE_MAP_LINK:
+ case WebKit::WebAXRoleImageMapLink:
ia_role_ = ROLE_SYSTEM_LINK;
ia_state_ |= STATE_SYSTEM_LINKED;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_LABEL:
+ case WebKit::WebAXRoleLabel:
ia_role_ = ROLE_SYSTEM_TEXT;
ia2_role_ = IA2_ROLE_LABEL;
break;
- case AccessibilityNodeData::ROLE_LANDMARK_APPLICATION:
- case AccessibilityNodeData::ROLE_LANDMARK_BANNER:
- case AccessibilityNodeData::ROLE_LANDMARK_COMPLEMENTARY:
- case AccessibilityNodeData::ROLE_LANDMARK_CONTENTINFO:
- case AccessibilityNodeData::ROLE_LANDMARK_MAIN:
- case AccessibilityNodeData::ROLE_LANDMARK_NAVIGATION:
- case AccessibilityNodeData::ROLE_LANDMARK_SEARCH:
+ case WebKit::WebAXRoleBanner:
+ case WebKit::WebAXRoleComplementary:
+ case WebKit::WebAXRoleContentInfo:
+ case WebKit::WebAXRoleMain:
+ case WebKit::WebAXRoleNavigation:
+ case WebKit::WebAXRoleSearch:
ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_SECTION;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_LINK:
- case AccessibilityNodeData::ROLE_WEBCORE_LINK:
+ case WebKit::WebAXRoleLink:
ia_role_ = ROLE_SYSTEM_LINK;
ia_state_ |= STATE_SYSTEM_LINKED;
break;
- case AccessibilityNodeData::ROLE_LIST:
+ case WebKit::WebAXRoleList:
ia_role_ = ROLE_SYSTEM_LIST;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_LISTBOX:
+ case WebKit::WebAXRoleListBox:
ia_role_ = ROLE_SYSTEM_LIST;
break;
- case AccessibilityNodeData::ROLE_LISTBOX_OPTION:
+ case WebKit::WebAXRoleListBoxOption:
ia_role_ = ROLE_SYSTEM_LISTITEM;
if (ia_state_ & STATE_SYSTEM_SELECTABLE) {
ia_state_ |= STATE_SYSTEM_FOCUSABLE;
- if (HasState(AccessibilityNodeData::STATE_FOCUSED))
+ if (HasState(WebKit::WebAXStateFocused))
ia_state_ |= STATE_SYSTEM_FOCUSED;
}
break;
- case AccessibilityNodeData::ROLE_LIST_ITEM:
+ case WebKit::WebAXRoleListItem:
ia_role_ = ROLE_SYSTEM_LISTITEM;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_LIST_MARKER:
+ case WebKit::WebAXRoleListMarker:
ia_role_ = ROLE_SYSTEM_TEXT;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_MATH:
+ case WebKit::WebAXRoleMath:
ia_role_ = ROLE_SYSTEM_EQUATION;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_MENU:
- case AccessibilityNodeData::ROLE_MENU_BUTTON:
+ case WebKit::WebAXRoleMenu:
+ case WebKit::WebAXRoleMenuButton:
ia_role_ = ROLE_SYSTEM_MENUPOPUP;
break;
- case AccessibilityNodeData::ROLE_MENU_BAR:
+ case WebKit::WebAXRoleMenuBar:
ia_role_ = ROLE_SYSTEM_MENUBAR;
break;
- case AccessibilityNodeData::ROLE_MENU_ITEM:
+ case WebKit::WebAXRoleMenuItem:
ia_role_ = ROLE_SYSTEM_MENUITEM;
break;
- case AccessibilityNodeData::ROLE_MENU_LIST_POPUP:
+ case WebKit::WebAXRoleMenuListPopup:
ia_role_ = ROLE_SYSTEM_CLIENT;
break;
- case AccessibilityNodeData::ROLE_MENU_LIST_OPTION:
+ case WebKit::WebAXRoleMenuListOption:
ia_role_ = ROLE_SYSTEM_LISTITEM;
if (ia_state_ & STATE_SYSTEM_SELECTABLE) {
ia_state_ |= STATE_SYSTEM_FOCUSABLE;
- if (HasState(AccessibilityNodeData::STATE_FOCUSED))
+ if (HasState(WebKit::WebAXStateFocused))
ia_state_ |= STATE_SYSTEM_FOCUSED;
}
break;
- case AccessibilityNodeData::ROLE_NOTE:
+ case WebKit::WebAXRoleNote:
ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_NOTE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_OUTLINE:
+ case WebKit::WebAXRoleOutline:
ia_role_ = ROLE_SYSTEM_OUTLINE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_PARAGRAPH:
+ case WebKit::WebAXRoleParagraph:
role_name_ = L"P";
ia2_role_ = IA2_ROLE_PARAGRAPH;
break;
- case AccessibilityNodeData::ROLE_POPUP_BUTTON:
+ case WebKit::WebAXRolePopUpButton:
if (html_tag == L"select") {
ia_role_ = ROLE_SYSTEM_COMBOBOX;
} else {
ia_role_ = ROLE_SYSTEM_BUTTONMENU;
}
break;
- case AccessibilityNodeData::ROLE_PROGRESS_INDICATOR:
+ case WebKit::WebAXRoleProgressIndicator:
ia_role_ = ROLE_SYSTEM_PROGRESSBAR;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_RADIO_BUTTON:
+ case WebKit::WebAXRoleRadioButton:
ia_role_ = ROLE_SYSTEM_RADIOBUTTON;
break;
- case AccessibilityNodeData::ROLE_RADIO_GROUP:
+ case WebKit::WebAXRoleRadioGroup:
ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_SECTION;
break;
- case AccessibilityNodeData::ROLE_REGION:
+ case WebKit::WebAXRoleRegion:
ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_SECTION;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_ROW:
+ case WebKit::WebAXRoleRow:
ia_role_ = ROLE_SYSTEM_ROW;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_ROW_HEADER:
+ case WebKit::WebAXRoleRowHeader:
ia_role_ = ROLE_SYSTEM_ROWHEADER;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_RULER:
+ case WebKit::WebAXRoleRuler:
ia_role_ = ROLE_SYSTEM_CLIENT;
ia2_role_ = IA2_ROLE_RULER;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_SCROLLAREA:
+ case WebKit::WebAXRoleScrollArea:
ia_role_ = ROLE_SYSTEM_CLIENT;
ia2_role_ = IA2_ROLE_SCROLL_PANE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_SCROLLBAR:
+ case WebKit::WebAXRoleScrollBar:
ia_role_ = ROLE_SYSTEM_SCROLLBAR;
break;
- case AccessibilityNodeData::ROLE_SLIDER:
+ case WebKit::WebAXRoleSlider:
ia_role_ = ROLE_SYSTEM_SLIDER;
break;
- case AccessibilityNodeData::ROLE_SPIN_BUTTON:
+ case WebKit::WebAXRoleSpinButton:
ia_role_ = ROLE_SYSTEM_SPINBUTTON;
break;
- case AccessibilityNodeData::ROLE_SPIN_BUTTON_PART:
+ case WebKit::WebAXRoleSpinButtonPart:
ia_role_ = ROLE_SYSTEM_PUSHBUTTON;
break;
- case AccessibilityNodeData::ROLE_SPLIT_GROUP:
+ case WebKit::WebAXRoleSplitGroup:
ia_role_ = ROLE_SYSTEM_CLIENT;
ia2_role_ = IA2_ROLE_SPLIT_PANE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_ANNOTATION:
- case AccessibilityNodeData::ROLE_STATIC_TEXT:
+ case WebKit::WebAXRoleAnnotation:
+ case WebKit::WebAXRoleStaticText:
ia_role_ = ROLE_SYSTEM_TEXT;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_STATUS:
+ case WebKit::WebAXRoleStatus:
ia_role_ = ROLE_SYSTEM_STATUSBAR;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_SPLITTER:
+ case WebKit::WebAXRoleSplitter:
ia_role_ = ROLE_SYSTEM_SEPARATOR;
break;
- case AccessibilityNodeData::ROLE_SVG_ROOT:
+ case WebKit::WebAXRoleSVGRoot:
ia_role_ = ROLE_SYSTEM_GRAPHIC;
break;
- case AccessibilityNodeData::ROLE_TAB:
+ case WebKit::WebAXRoleTab:
ia_role_ = ROLE_SYSTEM_PAGETAB;
break;
- case AccessibilityNodeData::ROLE_TABLE: {
+ case WebKit::WebAXRoleTable: {
string16 aria_role = GetString16Attribute(
AccessibilityNodeData::ATTR_ROLE);
if (aria_role == L"treegrid") {
@@ -3561,81 +3560,77 @@ void BrowserAccessibilityWin::InitRoleAndState() {
}
break;
}
- case AccessibilityNodeData::ROLE_TABLE_HEADER_CONTAINER:
+ case WebKit::WebAXRoleTableHeaderContainer:
ia_role_ = ROLE_SYSTEM_GROUPING;
ia2_role_ = IA2_ROLE_SECTION;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_TAB_GROUP_UNUSED:
- NOTREACHED();
- ia_role_ = ROLE_SYSTEM_PAGETABLIST;
- break;
- case AccessibilityNodeData::ROLE_TAB_LIST:
+ case WebKit::WebAXRoleTabList:
ia_role_ = ROLE_SYSTEM_PAGETABLIST;
break;
- case AccessibilityNodeData::ROLE_TAB_PANEL:
+ case WebKit::WebAXRoleTabPanel:
ia_role_ = ROLE_SYSTEM_PROPERTYPAGE;
break;
- case AccessibilityNodeData::ROLE_TOGGLE_BUTTON:
+ case WebKit::WebAXRoleToggleButton:
ia_role_ = ROLE_SYSTEM_PUSHBUTTON;
ia2_role_ = IA2_ROLE_TOGGLE_BUTTON;
break;
- case AccessibilityNodeData::ROLE_TEXTAREA:
+ case WebKit::WebAXRoleTextArea:
ia_role_ = ROLE_SYSTEM_TEXT;
ia2_state_ |= IA2_STATE_MULTI_LINE;
ia2_state_ |= IA2_STATE_EDITABLE;
ia2_state_ |= IA2_STATE_SELECTABLE_TEXT;
break;
- case AccessibilityNodeData::ROLE_TEXT_FIELD:
+ case WebKit::WebAXRoleTextField:
ia_role_ = ROLE_SYSTEM_TEXT;
ia2_state_ |= IA2_STATE_SINGLE_LINE;
ia2_state_ |= IA2_STATE_EDITABLE;
ia2_state_ |= IA2_STATE_SELECTABLE_TEXT;
break;
- case AccessibilityNodeData::ROLE_TIMER:
+ case WebKit::WebAXRoleTimer:
ia_role_ = ROLE_SYSTEM_CLOCK;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_TOOLBAR:
+ case WebKit::WebAXRoleToolbar:
ia_role_ = ROLE_SYSTEM_TOOLBAR;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_TOOLTIP:
+ case WebKit::WebAXRoleUserInterfaceTooltip:
ia_role_ = ROLE_SYSTEM_TOOLTIP;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_TREE:
+ case WebKit::WebAXRoleTree:
ia_role_ = ROLE_SYSTEM_OUTLINE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_TREE_GRID:
+ case WebKit::WebAXRoleTreeGrid:
ia_role_ = ROLE_SYSTEM_OUTLINE;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_TREE_ITEM:
+ case WebKit::WebAXRoleTreeItem:
ia_role_ = ROLE_SYSTEM_OUTLINEITEM;
ia_state_ |= STATE_SYSTEM_READONLY;
break;
- case AccessibilityNodeData::ROLE_WINDOW:
+ case WebKit::WebAXRoleWindow:
ia_role_ = ROLE_SYSTEM_WINDOW;
break;
// TODO(dmazzoni): figure out the proper MSAA role for all of these.
- case AccessibilityNodeData::ROLE_BROWSER:
- case AccessibilityNodeData::ROLE_DIRECTORY:
- case AccessibilityNodeData::ROLE_DRAWER:
- case AccessibilityNodeData::ROLE_HELP_TAG:
- case AccessibilityNodeData::ROLE_IGNORED:
- case AccessibilityNodeData::ROLE_INCREMENTOR:
- case AccessibilityNodeData::ROLE_LOG:
- case AccessibilityNodeData::ROLE_MARQUEE:
- case AccessibilityNodeData::ROLE_MATTE:
- case AccessibilityNodeData::ROLE_PRESENTATIONAL:
- case AccessibilityNodeData::ROLE_RULER_MARKER:
- case AccessibilityNodeData::ROLE_SHEET:
- case AccessibilityNodeData::ROLE_SLIDER_THUMB:
- case AccessibilityNodeData::ROLE_SYSTEM_WIDE:
- case AccessibilityNodeData::ROLE_VALUE_INDICATOR:
+ case WebKit::WebAXRoleBrowser:
+ case WebKit::WebAXRoleDirectory:
+ case WebKit::WebAXRoleDrawer:
+ case WebKit::WebAXRoleHelpTag:
+ case WebKit::WebAXRoleIgnored:
+ case WebKit::WebAXRoleIncrementor:
+ case WebKit::WebAXRoleLog:
+ case WebKit::WebAXRoleMarquee:
+ case WebKit::WebAXRoleMatte:
+ case WebKit::WebAXRolePresentational:
+ case WebKit::WebAXRoleRulerMarker:
+ case WebKit::WebAXRoleSheet:
+ case WebKit::WebAXRoleSliderThumb:
+ case WebKit::WebAXRoleSystemWide:
+ case WebKit::WebAXRoleValueIndicator:
default:
ia_role_ = ROLE_SYSTEM_CLIENT;
break;
@@ -3647,11 +3642,11 @@ void BrowserAccessibilityWin::InitRoleAndState() {
// aria-readonly attribute and for a few roles (in the switch above).
// We clear the READONLY state on focusable controls and on a document.
// Everything else, the majority of objects, do not have this state set.
- if (HasState(AccessibilityNodeData::STATE_FOCUSABLE) &&
+ if (HasState(WebKit::WebAXStateFocusable) &&
ia_role_ != ROLE_SYSTEM_DOCUMENT) {
ia_state_ &= ~(STATE_SYSTEM_READONLY);
}
- if (!HasState(AccessibilityNodeData::STATE_READONLY))
+ if (!HasState(WebKit::WebAXStateReadonly))
ia_state_ &= ~(STATE_SYSTEM_READONLY);
if (GetBoolAttribute(AccessibilityNodeData::ATTR_ARIA_READONLY))
ia_state_ |= STATE_SYSTEM_READONLY;
« no previous file with comments | « content/browser/accessibility/browser_accessibility_manager_win.cc ('k') | content/browser/accessibility/browser_accessibility_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698