| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/common/accessibility_node_data.h" | 5 #include "content/common/accessibility_node_data.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 return str; | 27 return str; |
| 28 } | 28 } |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 } // Anonymous namespace | 31 } // Anonymous namespace |
| 32 | 32 |
| 33 namespace content { | 33 namespace content { |
| 34 | 34 |
| 35 AccessibilityNodeData::AccessibilityNodeData() | 35 AccessibilityNodeData::AccessibilityNodeData() |
| 36 : id(-1), | 36 : id(-1), |
| 37 role(ROLE_UNKNOWN), | 37 role(WebKit::WebAXRoleUnknown), |
| 38 state(-1) { | 38 state(-1) { |
| 39 } | 39 } |
| 40 | 40 |
| 41 AccessibilityNodeData::~AccessibilityNodeData() { | 41 AccessibilityNodeData::~AccessibilityNodeData() { |
| 42 } | 42 } |
| 43 | 43 |
| 44 void AccessibilityNodeData::AddStringAttribute( | 44 void AccessibilityNodeData::AddStringAttribute( |
| 45 StringAttribute attribute, const std::string& value) { | 45 StringAttribute attribute, const std::string& value) { |
| 46 string_attributes.push_back(std::make_pair(attribute, value)); | 46 string_attributes.push_back(std::make_pair(attribute, value)); |
| 47 } | 47 } |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 | 133 |
| 134 #ifndef NDEBUG | 134 #ifndef NDEBUG |
| 135 std::string AccessibilityNodeData::DebugString(bool recursive) const { | 135 std::string AccessibilityNodeData::DebugString(bool recursive) const { |
| 136 std::string result; | 136 std::string result; |
| 137 | 137 |
| 138 result += "id=" + IntToString(id); | 138 result += "id=" + IntToString(id); |
| 139 | 139 |
| 140 switch (role) { | 140 switch (role) { |
| 141 case ROLE_ALERT: result += " ALERT"; break; | 141 case WebKit::WebAXRoleAlert: result += " ALERT"; break; |
| 142 case ROLE_ALERT_DIALOG: result += " ALERT_DIALOG"; break; | 142 case WebKit::WebAXRoleAlertDialog: result += " ALERT_DIALOG"; break; |
| 143 case ROLE_ANNOTATION: result += " ANNOTATION"; break; | 143 case WebKit::WebAXRoleAnnotation: result += " ANNOTATION"; break; |
| 144 case ROLE_APPLICATION: result += " APPLICATION"; break; | 144 case WebKit::WebAXRoleApplication: result += " APPLICATION"; break; |
| 145 case ROLE_ARTICLE: result += " ARTICLE"; break; | 145 case WebKit::WebAXRoleArticle: result += " ARTICLE"; break; |
| 146 case ROLE_BROWSER: result += " BROWSER"; break; | 146 case WebKit::WebAXRoleBanner: result += " L_BANNER"; break; |
| 147 case ROLE_BUSY_INDICATOR: result += " BUSY_INDICATOR"; break; | 147 case WebKit::WebAXRoleBrowser: result += " BROWSER"; break; |
| 148 case ROLE_BUTTON: result += " BUTTON"; break; | 148 case WebKit::WebAXRoleBusyIndicator: result += " BUSY_INDICATOR"; break; |
| 149 case ROLE_CANVAS: result += " CANVAS"; break; | 149 case WebKit::WebAXRoleButton: result += " BUTTON"; break; |
| 150 case ROLE_CANVAS_WITH_FALLBACK_CONTENT: result += " CANVAS_FALLBACK"; break; | 150 case WebKit::WebAXRoleCanvas: result += " CANVAS"; break; |
| 151 case ROLE_CELL: result += " CELL"; break; | 151 case WebKit::WebAXRoleCell: result += " CELL"; break; |
| 152 case ROLE_CHECKBOX: result += " CHECKBOX"; break; | 152 case WebKit::WebAXRoleCheckBox: result += " CHECKBOX"; break; |
| 153 case ROLE_COLOR_WELL: result += " COLOR_WELL"; break; | 153 case WebKit::WebAXRoleColorWell: result += " COLOR_WELL"; break; |
| 154 case ROLE_COLUMN: result += " COLUMN"; break; | 154 case WebKit::WebAXRoleColumn: result += " COLUMN"; break; |
| 155 case ROLE_COLUMN_HEADER: result += " COLUMN_HEADER"; break; | 155 case WebKit::WebAXRoleColumnHeader: result += " COLUMN_HEADER"; break; |
| 156 case ROLE_COMBO_BOX: result += " COMBO_BOX"; break; | 156 case WebKit::WebAXRoleComboBox: result += " COMBO_BOX"; break; |
| 157 case ROLE_DEFINITION: result += " DEFINITION"; break; | 157 case WebKit::WebAXRoleComplementary: result += " L_COMPLEMENTARY"; break; |
| 158 case ROLE_DESCRIPTION_LIST_DETAIL: result += " DD"; break; | 158 case WebKit::WebAXRoleContentInfo: result += " L_CONTENTINFO"; break; |
| 159 case ROLE_DESCRIPTION_LIST_TERM: result += " DT"; break; | 159 case WebKit::WebAXRoleDefinition: result += " DEFINITION"; break; |
| 160 case ROLE_DIALOG: result += " DIALOG"; break; | 160 case WebKit::WebAXRoleDescriptionListDetail: result += " DD"; break; |
| 161 case ROLE_DIRECTORY: result += " DIRECTORY"; break; | 161 case WebKit::WebAXRoleDescriptionListTerm: result += " DT"; break; |
| 162 case ROLE_DISCLOSURE_TRIANGLE: result += " DISCLOSURE_TRIANGLE"; break; | 162 case WebKit::WebAXRoleDialog: result += " DIALOG"; break; |
| 163 case ROLE_DIV: result += " DIV"; break; | 163 case WebKit::WebAXRoleDirectory: result += " DIRECTORY"; break; |
| 164 case ROLE_DOCUMENT: result += " DOCUMENT"; break; | 164 case WebKit::WebAXRoleDisclosureTriangle: |
| 165 case ROLE_DRAWER: result += " DRAWER"; break; | 165 result += " DISCLOSURE_TRIANGLE"; break; |
| 166 case ROLE_EDITABLE_TEXT: result += " EDITABLE_TEXT"; break; | 166 case WebKit::WebAXRoleDiv: result += " DIV"; break; |
| 167 case ROLE_FOOTER: result += " FOOTER"; break; | 167 case WebKit::WebAXRoleDocument: result += " DOCUMENT"; break; |
| 168 case ROLE_FORM: result += " FORM"; break; | 168 case WebKit::WebAXRoleDrawer: result += " DRAWER"; break; |
| 169 case ROLE_GRID: result += " GRID"; break; | 169 case WebKit::WebAXRoleEditableText: result += " EDITABLE_TEXT"; break; |
| 170 case ROLE_GROUP: result += " GROUP"; break; | 170 case WebKit::WebAXRoleFooter: result += " FOOTER"; break; |
| 171 case ROLE_GROW_AREA: result += " GROW_AREA"; break; | 171 case WebKit::WebAXRoleForm: result += " FORM"; break; |
| 172 case ROLE_HEADING: result += " HEADING"; break; | 172 case WebKit::WebAXRoleGrid: result += " GRID"; break; |
| 173 case ROLE_HELP_TAG: result += " HELP_TAG"; break; | 173 case WebKit::WebAXRoleGroup: result += " GROUP"; break; |
| 174 case ROLE_HORIZONTAL_RULE: result += " HORIZONTAL_RULE"; break; | 174 case WebKit::WebAXRoleGrowArea: result += " GROW_AREA"; break; |
| 175 case ROLE_IGNORED: result += " IGNORED"; break; | 175 case WebKit::WebAXRoleHeading: result += " HEADING"; break; |
| 176 case ROLE_IMAGE: result += " IMAGE"; break; | 176 case WebKit::WebAXRoleHelpTag: result += " HELP_TAG"; break; |
| 177 case ROLE_IMAGE_MAP: result += " IMAGE_MAP"; break; | 177 case WebKit::WebAXRoleHorizontalRule: result += " HORIZONTAL_RULE"; break; |
| 178 case ROLE_IMAGE_MAP_LINK: result += " IMAGE_MAP_LINK"; break; | 178 case WebKit::WebAXRoleIgnored: result += " IGNORED"; break; |
| 179 case ROLE_INCREMENTOR: result += " INCREMENTOR"; break; | 179 case WebKit::WebAXRoleImage: result += " IMAGE"; break; |
| 180 case ROLE_LABEL: result += " LABEL"; break; | 180 case WebKit::WebAXRoleImageMap: result += " IMAGE_MAP"; break; |
| 181 case ROLE_LANDMARK_APPLICATION: result += " L_APPLICATION"; break; | 181 case WebKit::WebAXRoleImageMapLink: result += " IMAGE_MAP_LINK"; break; |
| 182 case ROLE_LANDMARK_BANNER: result += " L_BANNER"; break; | 182 case WebKit::WebAXRoleIncrementor: result += " INCREMENTOR"; break; |
| 183 case ROLE_LANDMARK_COMPLEMENTARY: result += " L_COMPLEMENTARY"; break; | 183 case WebKit::WebAXRoleLabel: result += " LABEL"; break; |
| 184 case ROLE_LANDMARK_CONTENTINFO: result += " L_CONTENTINFO"; break; | 184 case WebKit::WebAXRoleLink: result += " LINK"; break; |
| 185 case ROLE_LANDMARK_MAIN: result += " L_MAIN"; break; | 185 case WebKit::WebAXRoleList: result += " LIST"; break; |
| 186 case ROLE_LANDMARK_NAVIGATION: result += " L_NAVIGATION"; break; | 186 case WebKit::WebAXRoleListBox: result += " LISTBOX"; break; |
| 187 case ROLE_LANDMARK_SEARCH: result += " L_SEARCH"; break; | 187 case WebKit::WebAXRoleListBoxOption: result += " LISTBOX_OPTION"; break; |
| 188 case ROLE_LINK: result += " LINK"; break; | 188 case WebKit::WebAXRoleListItem: result += " LIST_ITEM"; break; |
| 189 case ROLE_LIST: result += " LIST"; break; | 189 case WebKit::WebAXRoleListMarker: result += " LIST_MARKER"; break; |
| 190 case ROLE_LISTBOX: result += " LISTBOX"; break; | 190 case WebKit::WebAXRoleLog: result += " LOG"; break; |
| 191 case ROLE_LISTBOX_OPTION: result += " LISTBOX_OPTION"; break; | 191 case WebKit::WebAXRoleMain: result += " L_MAIN"; break; |
| 192 case ROLE_LIST_ITEM: result += " LIST_ITEM"; break; | 192 case WebKit::WebAXRoleMarquee: result += " MARQUEE"; break; |
| 193 case ROLE_LIST_MARKER: result += " LIST_MARKER"; break; | 193 case WebKit::WebAXRoleMath: result += " MATH"; break; |
| 194 case ROLE_LOG: result += " LOG"; break; | 194 case WebKit::WebAXRoleMatte: result += " MATTE"; break; |
| 195 case ROLE_MARQUEE: result += " MARQUEE"; break; | 195 case WebKit::WebAXRoleMenu: result += " MENU"; break; |
| 196 case ROLE_MATH: result += " MATH"; break; | 196 case WebKit::WebAXRoleMenuBar: result += " MENU_BAR"; break; |
| 197 case ROLE_MATTE: result += " MATTE"; break; | 197 case WebKit::WebAXRoleMenuButton: result += " MENU_BUTTON"; break; |
| 198 case ROLE_MENU: result += " MENU"; break; | 198 case WebKit::WebAXRoleMenuItem: result += " MENU_ITEM"; break; |
| 199 case ROLE_MENU_BAR: result += " MENU_BAR"; break; | 199 case WebKit::WebAXRoleMenuListOption: result += " MENU_LIST_OPTION"; break; |
| 200 case ROLE_MENU_BUTTON: result += " MENU_BUTTON"; break; | 200 case WebKit::WebAXRoleMenuListPopup: result += " MENU_LIST_POPUP"; break; |
| 201 case ROLE_MENU_ITEM: result += " MENU_ITEM"; break; | 201 case WebKit::WebAXRoleNavigation: result += " L_NAVIGATION"; break; |
| 202 case ROLE_MENU_LIST_OPTION: result += " MENU_LIST_OPTION"; break; | 202 case WebKit::WebAXRoleNote: result += " NOTE"; break; |
| 203 case ROLE_MENU_LIST_POPUP: result += " MENU_LIST_POPUP"; break; | 203 case WebKit::WebAXRoleOutline: result += " OUTLINE"; break; |
| 204 case ROLE_NOTE: result += " NOTE"; break; | 204 case WebKit::WebAXRoleParagraph: result += " PARAGRAPH"; break; |
| 205 case ROLE_OUTLINE: result += " OUTLINE"; break; | 205 case WebKit::WebAXRolePopUpButton: result += " POPUP_BUTTON"; break; |
| 206 case ROLE_PARAGRAPH: result += " PARAGRAPH"; break; | 206 case WebKit::WebAXRolePresentational: result += " PRESENTATIONAL"; break; |
| 207 case ROLE_POPUP_BUTTON: result += " POPUP_BUTTON"; break; | 207 case WebKit::WebAXRoleProgressIndicator: |
| 208 case ROLE_PRESENTATIONAL: result += " PRESENTATIONAL"; break; | 208 result += " PROGRESS_INDICATOR"; break; |
| 209 case ROLE_PROGRESS_INDICATOR: result += " PROGRESS_INDICATOR"; break; | 209 case WebKit::WebAXRoleRadioButton: result += " RADIO_BUTTON"; break; |
| 210 case ROLE_RADIO_BUTTON: result += " RADIO_BUTTON"; break; | 210 case WebKit::WebAXRoleRadioGroup: result += " RADIO_GROUP"; break; |
| 211 case ROLE_RADIO_GROUP: result += " RADIO_GROUP"; break; | 211 case WebKit::WebAXRoleRegion: result += " REGION"; break; |
| 212 case ROLE_REGION: result += " REGION"; break; | 212 case WebKit::WebAXRoleRootWebArea: result += " ROOT_WEB_AREA"; break; |
| 213 case ROLE_ROOT_WEB_AREA: result += " ROOT_WEB_AREA"; break; | 213 case WebKit::WebAXRoleRow: result += " ROW"; break; |
| 214 case ROLE_ROW: result += " ROW"; break; | 214 case WebKit::WebAXRoleRowHeader: result += " ROW_HEADER"; break; |
| 215 case ROLE_ROW_HEADER: result += " ROW_HEADER"; break; | 215 case WebKit::WebAXRoleRuler: result += " RULER"; break; |
| 216 case ROLE_RULER: result += " RULER"; break; | 216 case WebKit::WebAXRoleRulerMarker: result += " RULER_MARKER"; break; |
| 217 case ROLE_RULER_MARKER: result += " RULER_MARKER"; break; | 217 case WebKit::WebAXRoleSVGRoot: result += " SVG_ROOT"; break; |
| 218 case ROLE_SCROLLAREA: result += " SCROLLAREA"; break; | 218 case WebKit::WebAXRoleScrollArea: result += " SCROLLAREA"; break; |
| 219 case ROLE_SCROLLBAR: result += " SCROLLBAR"; break; | 219 case WebKit::WebAXRoleScrollBar: result += " SCROLLBAR"; break; |
| 220 case ROLE_SHEET: result += " SHEET"; break; | 220 case WebKit::WebAXRoleSearch: result += " L_SEARCH"; break; |
| 221 case ROLE_SLIDER: result += " SLIDER"; break; | 221 case WebKit::WebAXRoleSheet: result += " SHEET"; break; |
| 222 case ROLE_SLIDER_THUMB: result += " SLIDER_THUMB"; break; | 222 case WebKit::WebAXRoleSlider: result += " SLIDER"; break; |
| 223 case ROLE_SPIN_BUTTON: result += " SPIN_BUTTON"; break; | 223 case WebKit::WebAXRoleSliderThumb: result += " SLIDER_THUMB"; break; |
| 224 case ROLE_SPIN_BUTTON_PART: result += " SPIN_BUTTON_PART"; break; | 224 case WebKit::WebAXRoleSpinButton: result += " SPIN_BUTTON"; break; |
| 225 case ROLE_SPLITTER: result += " SPLITTER"; break; | 225 case WebKit::WebAXRoleSpinButtonPart: result += " SPIN_BUTTON_PART"; break; |
| 226 case ROLE_SPLIT_GROUP: result += " SPLIT_GROUP"; break; | 226 case WebKit::WebAXRoleSplitGroup: result += " SPLIT_GROUP"; break; |
| 227 case ROLE_STATIC_TEXT: result += " STATIC_TEXT"; break; | 227 case WebKit::WebAXRoleSplitter: result += " SPLITTER"; break; |
| 228 case ROLE_STATUS: result += " STATUS"; break; | 228 case WebKit::WebAXRoleStaticText: result += " STATIC_TEXT"; break; |
| 229 case ROLE_SVG_ROOT: result += " SVG_ROOT"; break; | 229 case WebKit::WebAXRoleStatus: result += " STATUS"; break; |
| 230 case ROLE_SYSTEM_WIDE: result += " SYSTEM_WIDE"; break; | 230 case WebKit::WebAXRoleSystemWide: result += " SYSTEM_WIDE"; break; |
| 231 case ROLE_TAB: result += " TAB"; break; | 231 case WebKit::WebAXRoleTab: result += " TAB"; break; |
| 232 case ROLE_TABLE: result += " TABLE"; break; | 232 case WebKit::WebAXRoleTabList: result += " TAB_LIST"; break; |
| 233 case ROLE_TABLE_HEADER_CONTAINER: result += " TABLE_HDR_CONTAINER"; break; | 233 case WebKit::WebAXRoleTabPanel: result += " TAB_PANEL"; break; |
| 234 case ROLE_TAB_GROUP_UNUSED: result += " TAB_GROUP_UNUSED"; break; | 234 case WebKit::WebAXRoleTable: result += " TABLE"; break; |
| 235 case ROLE_TAB_LIST: result += " TAB_LIST"; break; | 235 case WebKit::WebAXRoleTableHeaderContainer: |
| 236 case ROLE_TAB_PANEL: result += " TAB_PANEL"; break; | 236 result += " TABLE_HDR_CONTAINER"; break; |
| 237 case ROLE_TEXTAREA: result += " TEXTAREA"; break; | 237 case WebKit::WebAXRoleTextArea: result += " TEXTAREA"; break; |
| 238 case ROLE_TEXT_FIELD: result += " TEXT_FIELD"; break; | 238 case WebKit::WebAXRoleTextField: result += " TEXT_FIELD"; break; |
| 239 case ROLE_TIMER: result += " TIMER"; break; | 239 case WebKit::WebAXRoleTimer: result += " TIMER"; break; |
| 240 case ROLE_TOGGLE_BUTTON: result += " TOGGLE_BUTTON"; break; | 240 case WebKit::WebAXRoleToggleButton: result += " TOGGLE_BUTTON"; break; |
| 241 case ROLE_TOOLBAR: result += " TOOLBAR"; break; | 241 case WebKit::WebAXRoleToolbar: result += " TOOLBAR"; break; |
| 242 case ROLE_TOOLTIP: result += " TOOLTIP"; break; | 242 case WebKit::WebAXRoleTree: result += " TREE"; break; |
| 243 case ROLE_TREE: result += " TREE"; break; | 243 case WebKit::WebAXRoleTreeGrid: result += " TREE_GRID"; break; |
| 244 case ROLE_TREE_GRID: result += " TREE_GRID"; break; | 244 case WebKit::WebAXRoleTreeItem: result += " TREE_ITEM"; break; |
| 245 case ROLE_TREE_ITEM: result += " TREE_ITEM"; break; | 245 case WebKit::WebAXRoleUnknown: result += " UNKNOWN"; break; |
| 246 case ROLE_UNKNOWN: result += " UNKNOWN"; break; | 246 case WebKit::WebAXRoleUserInterfaceTooltip: result += " TOOLTIP"; break; |
| 247 case ROLE_VALUE_INDICATOR: result += " VALUE_INDICATOR"; break; | 247 case WebKit::WebAXRoleValueIndicator: result += " VALUE_INDICATOR"; break; |
| 248 case ROLE_WEBCORE_LINK: result += " WEBCORE_LINK"; break; | 248 case WebKit::WebAXRoleWebArea: result += " WEB_AREA"; break; |
| 249 case ROLE_WEB_AREA: result += " WEB_AREA"; break; | 249 case WebKit::WebAXRoleWindow: result += " WINDOW"; break; |
| 250 case ROLE_WINDOW: result += " WINDOW"; break; | |
| 251 default: | 250 default: |
| 252 assert(false); | 251 assert(false); |
| 253 } | 252 } |
| 254 | 253 |
| 255 if (state & (1 << STATE_BUSY)) | 254 if (state & (1 << WebKit::WebAXStateBusy)) |
| 256 result += " BUSY"; | 255 result += " BUSY"; |
| 257 if (state & (1 << STATE_CHECKED)) | 256 if (state & (1 << WebKit::WebAXStateChecked)) |
| 258 result += " CHECKED"; | 257 result += " CHECKED"; |
| 259 if (state & (1 << STATE_COLLAPSED)) | 258 if (state & (1 << WebKit::WebAXStateCollapsed)) |
| 260 result += " COLLAPSED"; | 259 result += " COLLAPSED"; |
| 261 if (state & (1 << STATE_EXPANDED)) | 260 if (state & (1 << WebKit::WebAXStateExpanded)) |
| 262 result += " EXPANDED"; | 261 result += " EXPANDED"; |
| 263 if (state & (1 << STATE_FOCUSABLE)) | 262 if (state & (1 << WebKit::WebAXStateFocusable)) |
| 264 result += " FOCUSABLE"; | 263 result += " FOCUSABLE"; |
| 265 if (state & (1 << STATE_FOCUSED)) | 264 if (state & (1 << WebKit::WebAXStateFocused)) |
| 266 result += " FOCUSED"; | 265 result += " FOCUSED"; |
| 267 if (state & (1 << STATE_HASPOPUP)) | 266 if (state & (1 << WebKit::WebAXStateHaspopup)) |
| 268 result += " HASPOPUP"; | 267 result += " HASPOPUP"; |
| 269 if (state & (1 << STATE_HOTTRACKED)) | 268 if (state & (1 << WebKit::WebAXStateHovered)) |
| 270 result += " HOTTRACKED"; | 269 result += " HOTTRACKED"; |
| 271 if (state & (1 << STATE_INDETERMINATE)) | 270 if (state & (1 << WebKit::WebAXStateIndeterminate)) |
| 272 result += " INDETERMINATE"; | 271 result += " INDETERMINATE"; |
| 273 if (state & (1 << STATE_INVISIBLE)) | 272 if (state & (1 << WebKit::WebAXStateInvisible)) |
| 274 result += " INVISIBLE"; | 273 result += " INVISIBLE"; |
| 275 if (state & (1 << STATE_LINKED)) | 274 if (state & (1 << WebKit::WebAXStateLinked)) |
| 276 result += " LINKED"; | 275 result += " LINKED"; |
| 277 if (state & (1 << STATE_MULTISELECTABLE)) | 276 if (state & (1 << WebKit::WebAXStateMultiselectable)) |
| 278 result += " MULTISELECTABLE"; | 277 result += " MULTISELECTABLE"; |
| 279 if (state & (1 << STATE_OFFSCREEN)) | 278 if (state & (1 << WebKit::WebAXStateOffscreen)) |
| 280 result += " OFFSCREEN"; | 279 result += " OFFSCREEN"; |
| 281 if (state & (1 << STATE_PRESSED)) | 280 if (state & (1 << WebKit::WebAXStatePressed)) |
| 282 result += " PRESSED"; | 281 result += " PRESSED"; |
| 283 if (state & (1 << STATE_PROTECTED)) | 282 if (state & (1 << WebKit::WebAXStateProtected)) |
| 284 result += " PROTECTED"; | 283 result += " PROTECTED"; |
| 285 if (state & (1 << STATE_READONLY)) | 284 if (state & (1 << WebKit::WebAXStateReadonly)) |
| 286 result += " READONLY"; | 285 result += " READONLY"; |
| 287 if (state & (1 << STATE_REQUIRED)) | 286 if (state & (1 << WebKit::WebAXStateRequired)) |
| 288 result += " REQUIRED"; | 287 result += " REQUIRED"; |
| 289 if (state & (1 << STATE_SELECTABLE)) | 288 if (state & (1 << WebKit::WebAXStateSelectable)) |
| 290 result += " SELECTABLE"; | 289 result += " SELECTABLE"; |
| 291 if (state & (1 << STATE_SELECTED)) | 290 if (state & (1 << WebKit::WebAXStateSelected)) |
| 292 result += " SELECTED"; | 291 result += " SELECTED"; |
| 293 if (state & (1 << STATE_TRAVERSED)) | 292 if (state & (1 << WebKit::WebAXStateVertical)) |
| 294 result += " TRAVERSED"; | |
| 295 if (state & (1 << STATE_UNAVAILABLE)) | |
| 296 result += " UNAVAILABLE"; | |
| 297 if (state & (1 << STATE_VERTICAL)) | |
| 298 result += " VERTICAL"; | 293 result += " VERTICAL"; |
| 299 if (state & (1 << STATE_VISITED)) | 294 if (state & (1 << WebKit::WebAXStateVisited)) |
| 300 result += " VISITED"; | 295 result += " VISITED"; |
| 301 | 296 |
| 302 result += " (" + IntToString(location.x()) + ", " + | 297 result += " (" + IntToString(location.x()) + ", " + |
| 303 IntToString(location.y()) + ")-(" + | 298 IntToString(location.y()) + ")-(" + |
| 304 IntToString(location.width()) + ", " + | 299 IntToString(location.width()) + ", " + |
| 305 IntToString(location.height()) + ")"; | 300 IntToString(location.height()) + ")"; |
| 306 | 301 |
| 307 for (size_t i = 0; i < int_attributes.size(); ++i) { | 302 for (size_t i = 0; i < int_attributes.size(); ++i) { |
| 308 std::string value = IntToString(int_attributes[i].second); | 303 std::string value = IntToString(int_attributes[i].second); |
| 309 switch (int_attributes[i].first) { | 304 switch (int_attributes[i].first) { |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 break; | 481 break; |
| 487 case ATTR_ARIA_READONLY: | 482 case ATTR_ARIA_READONLY: |
| 488 result += " aria_readonly=" + value; | 483 result += " aria_readonly=" + value; |
| 489 break; | 484 break; |
| 490 case ATTR_CAN_SET_VALUE: | 485 case ATTR_CAN_SET_VALUE: |
| 491 result += " can_set_value=" + value; | 486 result += " can_set_value=" + value; |
| 492 break; | 487 break; |
| 493 case ATTR_UPDATE_LOCATION_ONLY: | 488 case ATTR_UPDATE_LOCATION_ONLY: |
| 494 result += " update_location_only=" + value; | 489 result += " update_location_only=" + value; |
| 495 break; | 490 break; |
| 491 case ATTR_CANVAS_HAS_FALLBACK: |
| 492 result += " has_fallback=" + value; |
| 493 break; |
| 496 } | 494 } |
| 497 } | 495 } |
| 498 | 496 |
| 499 for (size_t i = 0; i < intlist_attributes.size(); ++i) { | 497 for (size_t i = 0; i < intlist_attributes.size(); ++i) { |
| 500 const std::vector<int32>& values = intlist_attributes[i].second; | 498 const std::vector<int32>& values = intlist_attributes[i].second; |
| 501 switch (intlist_attributes[i].first) { | 499 switch (intlist_attributes[i].first) { |
| 502 case ATTR_INDIRECT_CHILD_IDS: | 500 case ATTR_INDIRECT_CHILD_IDS: |
| 503 result += " indirect_child_ids=" + IntVectorToString(values); | 501 result += " indirect_child_ids=" + IntVectorToString(values); |
| 504 break; | 502 break; |
| 505 case ATTR_LINE_BREAKS: | 503 case ATTR_LINE_BREAKS: |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 result += children[i].DebugString(true); | 535 result += children[i].DebugString(true); |
| 538 --indent; | 536 --indent; |
| 539 } | 537 } |
| 540 | 538 |
| 541 return result; | 539 return result; |
| 542 } | 540 } |
| 543 | 541 |
| 544 #endif // ifndef NDEBUG | 542 #endif // ifndef NDEBUG |
| 545 | 543 |
| 546 } // namespace content | 544 } // namespace content |
| OLD | NEW |