Index: third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h |
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h |
index c91d93854a2b0027156e9a682797a8dd00419ac5..141b3c5a4f69539261ab29e62fe8fa8470891466 100644 |
--- a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h |
+++ b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h |
@@ -58,8 +58,8 @@ enum class AOMStringProperty; |
typedef unsigned AXID; |
enum AccessibilityRole { |
- kUnknownRole = 0, |
- kAbbrRole, // No mapping to ARIA role. |
+ kUnknownRole = 0, // Not mapped in platform APIs, generally indicates a bug |
+ kAbbrRole, // No mapping to ARIA role. |
kAlertDialogRole, |
kAlertRole, |
kAnchorRole, // No mapping to ARIA role. |
@@ -91,7 +91,6 @@ enum AccessibilityRole { |
kDialogRole, |
kDirectoryRole, |
kDisclosureTriangleRole, // No mapping to ARIA role. |
- kDivRole, // No mapping to ARIA role. |
kDocumentRole, |
kEmbeddedObjectRole, // No mapping to ARIA role. |
kFeedRole, |
@@ -99,6 +98,7 @@ enum AccessibilityRole { |
kFigureRole, |
kFooterRole, |
kFormRole, |
+ kGenericContainerRole, // No role was defined for this container |
kGridRole, |
kGroupRole, |
kHeadingRole, |
@@ -134,7 +134,7 @@ enum AccessibilityRole { |
kMenuRole, |
kMeterRole, |
kNavigationRole, |
- kNoneRole, // No mapping to ARIA role. |
+ kNoneRole, // ARIA role of "none" |
kNoteRole, |
kOutlineRole, // No mapping to ARIA role. |
kParagraphRole, // No mapping to ARIA role. |
@@ -1095,7 +1095,8 @@ class MODULES_EXPORT AXObjectImpl |
return 0; |
} |
- virtual bool NameFromContents() const; |
+ bool CanReceiveAccessibilityFocus() const; |
+ virtual bool NameFromContents(const bool recursive) const; |
AccessibilityRole ButtonRoleType() const; |