Title: [265278] trunk/Source/WebCore
Revision
265278
Author
[email protected]
Date
2020-08-05 00:22:07 -0700 (Wed, 05 Aug 2020)

Log Message

AX: WebCore should provide a way to get raw role for accessibility objects
https://bugs.webkit.org/show_bug.cgi?id=215149

Patch by Eric Liang <[email protected]> on 2020-08-05
Reviewed by Chris Fleizach.

Added a conversion from WebRole to string for accessibility.
This allows us to get it in the WebKit bundle.

* accessibility/AXLogger.cpp:
(WebCore::operator<<):
* accessibility/AccessibilityObjectInterface.h:
(WebCore::accessibilityRoleToString):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityElementCount]):
(-[WebAccessibilityObjectWrapper _accessibilityWebRoleAsString]):
(-[WebAccessibilityObjectWrapper accessibilityTraits]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (265277 => 265278)


--- trunk/Source/WebCore/ChangeLog	2020-08-05 05:15:29 UTC (rev 265277)
+++ trunk/Source/WebCore/ChangeLog	2020-08-05 07:22:07 UTC (rev 265278)
@@ -1,3 +1,22 @@
+2020-08-05  Eric Liang  <[email protected]>
+
+        AX: WebCore should provide a way to get raw role for accessibility objects
+        https://bugs.webkit.org/show_bug.cgi?id=215149
+
+        Reviewed by Chris Fleizach.
+
+        Added a conversion from WebRole to string for accessibility.
+        This allows us to get it in the WebKit bundle.
+
+        * accessibility/AXLogger.cpp:
+        (WebCore::operator<<):
+        * accessibility/AccessibilityObjectInterface.h:
+        (WebCore::accessibilityRoleToString):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityElementCount]):
+        (-[WebAccessibilityObjectWrapper _accessibilityWebRoleAsString]):
+        (-[WebAccessibilityObjectWrapper accessibilityTraits]):
+
 2020-08-04  Devin Rousso  <[email protected]>
 
         "DoubleDown Casino" respin button stops working with trackpad

Modified: trunk/Source/WebCore/accessibility/AXLogger.cpp (265277 => 265278)


--- trunk/Source/WebCore/accessibility/AXLogger.cpp	2020-08-05 05:15:29 UTC (rev 265277)
+++ trunk/Source/WebCore/accessibility/AXLogger.cpp	2020-08-05 07:22:07 UTC (rev 265278)
@@ -126,462 +126,7 @@
 
 TextStream& operator<<(TextStream& stream, AccessibilityRole role)
 {
-    switch (role) {
-    case AccessibilityRole::Annotation:
-        stream << "Annotation";
-        break;
-    case AccessibilityRole::Application:
-        stream << "Application";
-        break;
-    case AccessibilityRole::ApplicationAlert:
-        stream << "ApplicationAlert";
-        break;
-    case AccessibilityRole::ApplicationAlertDialog:
-        stream << "ApplicationAlertDialog";
-        break;
-    case AccessibilityRole::ApplicationDialog:
-        stream << "ApplicationDialog";
-        break;
-    case AccessibilityRole::ApplicationGroup:
-        stream << "ApplicationGroup";
-        break;
-    case AccessibilityRole::ApplicationLog:
-        stream << "ApplicationLog";
-        break;
-    case AccessibilityRole::ApplicationMarquee:
-        stream << "ApplicationMarquee";
-        break;
-    case AccessibilityRole::ApplicationStatus:
-        stream << "ApplicationStatus";
-        break;
-    case AccessibilityRole::ApplicationTextGroup:
-        stream << "ApplicationTextGroup";
-        break;
-    case AccessibilityRole::ApplicationTimer:
-        stream << "ApplicationTimer";
-        break;
-    case AccessibilityRole::Audio:
-        stream << "Audio";
-        break;
-    case AccessibilityRole::Blockquote:
-        stream << "Blockquote";
-        break;
-    case AccessibilityRole::Browser:
-        stream << "Browser";
-        break;
-    case AccessibilityRole::BusyIndicator:
-        stream << "BusyIndicator";
-        break;
-    case AccessibilityRole::Button:
-        stream << "Button";
-        break;
-    case AccessibilityRole::Canvas:
-        stream << "Canvas";
-        break;
-    case AccessibilityRole::Caption:
-        stream << "Caption";
-        break;
-    case AccessibilityRole::Cell:
-        stream << "Cell";
-        break;
-    case AccessibilityRole::CheckBox:
-        stream << "CheckBox";
-        break;
-    case AccessibilityRole::ColorWell:
-        stream << "ColorWell";
-        break;
-    case AccessibilityRole::Column:
-        stream << "Column";
-        break;
-    case AccessibilityRole::ColumnHeader:
-        stream << "ColumnHeader";
-        break;
-    case AccessibilityRole::ComboBox:
-        stream << "ComboBox";
-        break;
-    case AccessibilityRole::Definition:
-        stream << "Definition";
-        break;
-    case AccessibilityRole::Deletion:
-        stream << "Deletion";
-        break;
-    case AccessibilityRole::DescriptionList:
-        stream << "DescriptionList";
-        break;
-    case AccessibilityRole::DescriptionListTerm:
-        stream << "DescriptionListTerm";
-        break;
-    case AccessibilityRole::DescriptionListDetail:
-        stream << "DescriptionListDetail";
-        break;
-    case AccessibilityRole::Details:
-        stream << "Details";
-        break;
-    case AccessibilityRole::Directory:
-        stream << "Directory";
-        break;
-    case AccessibilityRole::DisclosureTriangle:
-        stream << "DisclosureTriangle";
-        break;
-    case AccessibilityRole::Div:
-        stream << "Div";
-        break;
-    case AccessibilityRole::Document:
-        stream << "Document";
-        break;
-    case AccessibilityRole::DocumentArticle:
-        stream << "DocumentArticle";
-        break;
-    case AccessibilityRole::DocumentMath:
-        stream << "DocumentMath";
-        break;
-    case AccessibilityRole::DocumentNote:
-        stream << "DocumentNote";
-        break;
-    case AccessibilityRole::Drawer:
-        stream << "Drawer";
-        break;
-    case AccessibilityRole::EditableText:
-        stream << "EditableText";
-        break;
-    case AccessibilityRole::Feed:
-        stream << "Feed";
-        break;
-    case AccessibilityRole::Figure:
-        stream << "Figure";
-        break;
-    case AccessibilityRole::Footer:
-        stream << "Footer";
-        break;
-    case AccessibilityRole::Footnote:
-        stream << "Footnote";
-        break;
-    case AccessibilityRole::Form:
-        stream << "Form";
-        break;
-    case AccessibilityRole::GraphicsDocument:
-        stream << "GraphicsDocument";
-        break;
-    case AccessibilityRole::GraphicsObject:
-        stream << "GraphicsObject";
-        break;
-    case AccessibilityRole::GraphicsSymbol:
-        stream << "GraphicsSymbol";
-        break;
-    case AccessibilityRole::Grid:
-        stream << "Grid";
-        break;
-    case AccessibilityRole::GridCell:
-        stream << "GridCell";
-        break;
-    case AccessibilityRole::Group:
-        stream << "Group";
-        break;
-    case AccessibilityRole::GrowArea:
-        stream << "GrowArea";
-        break;
-    case AccessibilityRole::Heading:
-        stream << "Heading";
-        break;
-    case AccessibilityRole::HelpTag:
-        stream << "HelpTag";
-        break;
-    case AccessibilityRole::HorizontalRule:
-        stream << "HorizontalRule";
-        break;
-    case AccessibilityRole::Ignored:
-        stream << "Ignored";
-        break;
-    case AccessibilityRole::Inline:
-        stream << "Inline";
-        break;
-    case AccessibilityRole::Image:
-        stream << "Image";
-        break;
-    case AccessibilityRole::ImageMap:
-        stream << "ImageMap";
-        break;
-    case AccessibilityRole::ImageMapLink:
-        stream << "ImageMapLink";
-        break;
-    case AccessibilityRole::Incrementor:
-        stream << "Incrementor";
-        break;
-    case AccessibilityRole::Insertion:
-        stream << "Insertion";
-        break;
-    case AccessibilityRole::Label:
-        stream << "Label";
-        break;
-    case AccessibilityRole::LandmarkBanner:
-        stream << "LandmarkBanner";
-        break;
-    case AccessibilityRole::LandmarkComplementary:
-        stream << "LandmarkComplementary";
-        break;
-    case AccessibilityRole::LandmarkContentInfo:
-        stream << "LandmarkContentInfo";
-        break;
-    case AccessibilityRole::LandmarkDocRegion:
-        stream << "LandmarkDocRegion";
-        break;
-    case AccessibilityRole::LandmarkMain:
-        stream << "LandmarkMain";
-        break;
-    case AccessibilityRole::LandmarkNavigation:
-        stream << "LandmarkNavigation";
-        break;
-    case AccessibilityRole::LandmarkRegion:
-        stream << "LandmarkRegion";
-        break;
-    case AccessibilityRole::LandmarkSearch:
-        stream << "LandmarkSearch";
-        break;
-    case AccessibilityRole::Legend:
-        stream << "Legend";
-        break;
-    case AccessibilityRole::Link:
-        stream << "Link";
-        break;
-    case AccessibilityRole::List:
-        stream << "List";
-        break;
-    case AccessibilityRole::ListBox:
-        stream << "ListBox";
-        break;
-    case AccessibilityRole::ListBoxOption:
-        stream << "ListBoxOption";
-        break;
-    case AccessibilityRole::ListItem:
-        stream << "ListItem";
-        break;
-    case AccessibilityRole::ListMarker:
-        stream << "ListMarker";
-        break;
-    case AccessibilityRole::Mark:
-        stream << "Mark";
-        break;
-    case AccessibilityRole::MathElement:
-        stream << "MathElement";
-        break;
-    case AccessibilityRole::Matte:
-        stream << "Matte";
-        break;
-    case AccessibilityRole::Menu:
-        stream << "Menu";
-        break;
-    case AccessibilityRole::MenuBar:
-        stream << "MenuBar";
-        break;
-    case AccessibilityRole::MenuButton:
-        stream << "MenuButton";
-        break;
-    case AccessibilityRole::MenuItem:
-        stream << "MenuItem";
-        break;
-    case AccessibilityRole::MenuItemCheckbox:
-        stream << "MenuItemCheckbox";
-        break;
-    case AccessibilityRole::MenuItemRadio:
-        stream << "MenuItemRadio";
-        break;
-    case AccessibilityRole::MenuListPopup:
-        stream << "MenuListPopup";
-        break;
-    case AccessibilityRole::MenuListOption:
-        stream << "MenuListOption";
-        break;
-    case AccessibilityRole::Meter:
-        stream << "Meter";
-        break;
-    case AccessibilityRole::Outline:
-        stream << "Outline";
-        break;
-    case AccessibilityRole::Paragraph:
-        stream << "Paragraph";
-        break;
-    case AccessibilityRole::PopUpButton:
-        stream << "PopUpButton";
-        break;
-    case AccessibilityRole::Pre:
-        stream << "Pre";
-        break;
-    case AccessibilityRole::Presentational:
-        stream << "Presentational";
-        break;
-    case AccessibilityRole::ProgressIndicator:
-        stream << "ProgressIndicator";
-        break;
-    case AccessibilityRole::RadioButton:
-        stream << "RadioButton";
-        break;
-    case AccessibilityRole::RadioGroup:
-        stream << "RadioGroup";
-        break;
-    case AccessibilityRole::RowHeader:
-        stream << "RowHeader";
-        break;
-    case AccessibilityRole::Row:
-        stream << "Row";
-        break;
-    case AccessibilityRole::RowGroup:
-        stream << "RowGroup";
-        break;
-    case AccessibilityRole::RubyBase:
-        stream << "RubyBase";
-        break;
-    case AccessibilityRole::RubyBlock:
-        stream << "RubyBlock";
-        break;
-    case AccessibilityRole::RubyInline:
-        stream << "RubyInline";
-        break;
-    case AccessibilityRole::RubyRun:
-        stream << "RubyRun";
-        break;
-    case AccessibilityRole::RubyText:
-        stream << "RubyText";
-        break;
-    case AccessibilityRole::Ruler:
-        stream << "Ruler";
-        break;
-    case AccessibilityRole::RulerMarker:
-        stream << "RulerMarker";
-        break;
-    case AccessibilityRole::ScrollArea:
-        stream << "ScrollArea";
-        break;
-    case AccessibilityRole::ScrollBar:
-        stream << "ScrollBar";
-        break;
-    case AccessibilityRole::SearchField:
-        stream << "SearchField";
-        break;
-    case AccessibilityRole::Sheet:
-        stream << "Sheet";
-        break;
-    case AccessibilityRole::Slider:
-        stream << "Slider";
-        break;
-    case AccessibilityRole::SliderThumb:
-        stream << "SliderThumb";
-        break;
-    case AccessibilityRole::SpinButton:
-        stream << "SpinButton";
-        break;
-    case AccessibilityRole::SpinButtonPart:
-        stream << "SpinButtonPart";
-        break;
-    case AccessibilityRole::SplitGroup:
-        stream << "SplitGroup";
-        break;
-    case AccessibilityRole::Splitter:
-        stream << "Splitter";
-        break;
-    case AccessibilityRole::StaticText:
-        stream << "StaticText";
-        break;
-    case AccessibilityRole::Subscript:
-        stream << "Subscript";
-        break;
-    case AccessibilityRole::Summary:
-        stream << "Summary";
-        break;
-    case AccessibilityRole::Superscript:
-        stream << "Superscript";
-        break;
-    case AccessibilityRole::Switch:
-        stream << "Switch";
-        break;
-    case AccessibilityRole::SystemWide:
-        stream << "SystemWide";
-        break;
-    case AccessibilityRole::SVGRoot:
-        stream << "SVGRoot";
-        break;
-    case AccessibilityRole::SVGText:
-        stream << "SVGText";
-        break;
-    case AccessibilityRole::SVGTSpan:
-        stream << "SVGTSpan";
-        break;
-    case AccessibilityRole::SVGTextPath:
-        stream << "SVGTextPath";
-        break;
-    case AccessibilityRole::TabGroup:
-        stream << "TabGroup";
-        break;
-    case AccessibilityRole::TabList:
-        stream << "TabList";
-        break;
-    case AccessibilityRole::TabPanel:
-        stream << "TabPanel";
-        break;
-    case AccessibilityRole::Tab:
-        stream << "Tab";
-        break;
-    case AccessibilityRole::Table:
-        stream << "Table";
-        break;
-    case AccessibilityRole::TableHeaderContainer:
-        stream << "TableHeaderContainer";
-        break;
-    case AccessibilityRole::Term:
-        stream << "Term";
-        break;
-    case AccessibilityRole::TextArea:
-        stream << "TextArea";
-        break;
-    case AccessibilityRole::TextField:
-        stream << "TextField";
-        break;
-    case AccessibilityRole::TextGroup:
-        stream << "TextGroup";
-        break;
-    case AccessibilityRole::Time:
-        stream << "Time";
-        break;
-    case AccessibilityRole::Tree:
-        stream << "Tree";
-        break;
-    case AccessibilityRole::TreeGrid:
-        stream << "TreeGrid";
-        break;
-    case AccessibilityRole::TreeItem:
-        stream << "TreeItem";
-        break;
-    case AccessibilityRole::ToggleButton:
-        stream << "ToggleButton";
-        break;
-    case AccessibilityRole::Toolbar:
-        stream << "Toolbar";
-        break;
-    case AccessibilityRole::Unknown:
-        stream << "Unknown";
-        break;
-    case AccessibilityRole::UserInterfaceTooltip:
-        stream << "UserInterfaceTooltip";
-        break;
-    case AccessibilityRole::ValueIndicator:
-        stream << "ValueIndicator";
-        break;
-    case AccessibilityRole::Video:
-        stream << "Video";
-        break;
-    case AccessibilityRole::WebApplication:
-        stream << "WebApplication";
-        break;
-    case AccessibilityRole::WebArea:
-        stream << "WebArea";
-        break;
-    case AccessibilityRole::WebCoreLink:
-        stream << "WebCoreLink";
-        break;
-    case AccessibilityRole::Window:
-        stream << "Window";
-        break;
-    }
-
+    stream << accessibilityRoleToString(role);
     return stream;
 }
 

Modified: trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h (265277 => 265278)


--- trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h	2020-08-05 05:15:29 UTC (rev 265277)
+++ trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h	2020-08-05 07:22:07 UTC (rev 265278)
@@ -232,6 +232,316 @@
     Window,
 };
 
+ALWAYS_INLINE String accessibilityRoleToString(AccessibilityRole role)
+{
+    switch (role) {
+    case AccessibilityRole::Annotation:
+        return "Annotation";
+    case AccessibilityRole::Application:
+        return "Application";
+    case AccessibilityRole::ApplicationAlert:
+        return "ApplicationAlert";
+    case AccessibilityRole::ApplicationAlertDialog:
+        return "ApplicationAlertDialog";
+    case AccessibilityRole::ApplicationDialog:
+        return "ApplicationDialog";
+    case AccessibilityRole::ApplicationGroup:
+        return "ApplicationGroup";
+    case AccessibilityRole::ApplicationLog:
+        return "ApplicationLog";
+    case AccessibilityRole::ApplicationMarquee:
+        return "ApplicationMarquee";
+    case AccessibilityRole::ApplicationStatus:
+        return "ApplicationStatus";
+    case AccessibilityRole::ApplicationTextGroup:
+        return "ApplicationTextGroup";
+    case AccessibilityRole::ApplicationTimer:
+        return "ApplicationTimer";
+    case AccessibilityRole::Audio:
+        return "Audio";
+    case AccessibilityRole::Blockquote:
+        return "Blockquote";
+    case AccessibilityRole::Browser:
+        return "Browser";
+    case AccessibilityRole::BusyIndicator:
+        return "BusyIndicator";
+    case AccessibilityRole::Button:
+        return "Button";
+    case AccessibilityRole::Canvas:
+        return "Canvas";
+    case AccessibilityRole::Caption:
+        return "Caption";
+    case AccessibilityRole::Cell:
+        return "Cell";
+    case AccessibilityRole::CheckBox:
+        return "CheckBox";
+    case AccessibilityRole::ColorWell:
+        return "ColorWell";
+    case AccessibilityRole::Column:
+        return "Column";
+    case AccessibilityRole::ColumnHeader:
+        return "ColumnHeader";
+    case AccessibilityRole::ComboBox:
+        return "ComboBox";
+    case AccessibilityRole::Definition:
+        return "Definition";
+    case AccessibilityRole::Deletion:
+        return "Deletion";
+    case AccessibilityRole::DescriptionList:
+        return "DescriptionList";
+    case AccessibilityRole::DescriptionListTerm:
+        return "DescriptionListTerm";
+    case AccessibilityRole::DescriptionListDetail:
+        return "DescriptionListDetail";
+    case AccessibilityRole::Details:
+        return "Details";
+    case AccessibilityRole::Directory:
+        return "Directory";
+    case AccessibilityRole::DisclosureTriangle:
+        return "DisclosureTriangle";
+    case AccessibilityRole::Div:
+        return "Div";
+    case AccessibilityRole::Document:
+        return "Document";
+    case AccessibilityRole::DocumentArticle:
+        return "DocumentArticle";
+    case AccessibilityRole::DocumentMath:
+        return "DocumentMath";
+    case AccessibilityRole::DocumentNote:
+        return "DocumentNote";
+    case AccessibilityRole::Drawer:
+        return "Drawer";
+    case AccessibilityRole::EditableText:
+        return "EditableText";
+    case AccessibilityRole::Feed:
+        return "Feed";
+    case AccessibilityRole::Figure:
+        return "Figure";
+    case AccessibilityRole::Footer:
+        return "Footer";
+    case AccessibilityRole::Footnote:
+        return "Footnote";
+    case AccessibilityRole::Form:
+        return "Form";
+    case AccessibilityRole::GraphicsDocument:
+        return "GraphicsDocument";
+    case AccessibilityRole::GraphicsObject:
+        return "GraphicsObject";
+    case AccessibilityRole::GraphicsSymbol:
+        return "GraphicsSymbol";
+    case AccessibilityRole::Grid:
+        return "Grid";
+    case AccessibilityRole::GridCell:
+        return "GridCell";
+    case AccessibilityRole::Group:
+        return "Group";
+    case AccessibilityRole::GrowArea:
+        return "GrowArea";
+    case AccessibilityRole::Heading:
+        return "Heading";
+    case AccessibilityRole::HelpTag:
+        return "HelpTag";
+    case AccessibilityRole::HorizontalRule:
+        return "HorizontalRule";
+    case AccessibilityRole::Ignored:
+        return "Ignored";
+    case AccessibilityRole::Inline:
+        return "Inline";
+    case AccessibilityRole::Image:
+        return "Image";
+    case AccessibilityRole::ImageMap:
+        return "ImageMap";
+    case AccessibilityRole::ImageMapLink:
+        return "ImageMapLink";
+    case AccessibilityRole::Incrementor:
+        return "Incrementor";
+    case AccessibilityRole::Insertion:
+        return "Insertion";
+    case AccessibilityRole::Label:
+        return "Label";
+    case AccessibilityRole::LandmarkBanner:
+        return "LandmarkBanner";
+    case AccessibilityRole::LandmarkComplementary:
+        return "LandmarkComplementary";
+    case AccessibilityRole::LandmarkContentInfo:
+        return "LandmarkContentInfo";
+    case AccessibilityRole::LandmarkDocRegion:
+        return "LandmarkDocRegion";
+    case AccessibilityRole::LandmarkMain:
+        return "LandmarkMain";
+    case AccessibilityRole::LandmarkNavigation:
+        return "LandmarkNavigation";
+    case AccessibilityRole::LandmarkRegion:
+        return "LandmarkRegion";
+    case AccessibilityRole::LandmarkSearch:
+        return "LandmarkSearch";
+    case AccessibilityRole::Legend:
+        return "Legend";
+    case AccessibilityRole::Link:
+        return "Link";
+    case AccessibilityRole::List:
+        return "List";
+    case AccessibilityRole::ListBox:
+        return "ListBox";
+    case AccessibilityRole::ListBoxOption:
+        return "ListBoxOption";
+    case AccessibilityRole::ListItem:
+        return "ListItem";
+    case AccessibilityRole::ListMarker:
+        return "ListMarker";
+    case AccessibilityRole::Mark:
+        return "Mark";
+    case AccessibilityRole::MathElement:
+        return "MathElement";
+    case AccessibilityRole::Matte:
+        return "Matte";
+    case AccessibilityRole::Menu:
+        return "Menu";
+    case AccessibilityRole::MenuBar:
+        return "MenuBar";
+    case AccessibilityRole::MenuButton:
+        return "MenuButton";
+    case AccessibilityRole::MenuItem:
+        return "MenuItem";
+    case AccessibilityRole::MenuItemCheckbox:
+        return "MenuItemCheckbox";
+    case AccessibilityRole::MenuItemRadio:
+        return "MenuItemRadio";
+    case AccessibilityRole::MenuListPopup:
+        return "MenuListPopup";
+    case AccessibilityRole::MenuListOption:
+        return "MenuListOption";
+    case AccessibilityRole::Meter:
+        return "Meter";
+    case AccessibilityRole::Outline:
+        return "Outline";
+    case AccessibilityRole::Paragraph:
+        return "Paragraph";
+    case AccessibilityRole::PopUpButton:
+        return "PopUpButton";
+    case AccessibilityRole::Pre:
+        return "Pre";
+    case AccessibilityRole::Presentational:
+        return "Presentational";
+    case AccessibilityRole::ProgressIndicator:
+        return "ProgressIndicator";
+    case AccessibilityRole::RadioButton:
+        return "RadioButton";
+    case AccessibilityRole::RadioGroup:
+        return "RadioGroup";
+    case AccessibilityRole::RowHeader:
+        return "RowHeader";
+    case AccessibilityRole::Row:
+        return "Row";
+    case AccessibilityRole::RowGroup:
+        return "RowGroup";
+    case AccessibilityRole::RubyBase:
+        return "RubyBase";
+    case AccessibilityRole::RubyBlock:
+        return "RubyBlock";
+    case AccessibilityRole::RubyInline:
+        return "RubyInline";
+    case AccessibilityRole::RubyRun:
+        return "RubyRun";
+    case AccessibilityRole::RubyText:
+        return "RubyText";
+    case AccessibilityRole::Ruler:
+        return "Ruler";
+    case AccessibilityRole::RulerMarker:
+        return "RulerMarker";
+    case AccessibilityRole::ScrollArea:
+        return "ScrollArea";
+    case AccessibilityRole::ScrollBar:
+        return "ScrollBar";
+    case AccessibilityRole::SearchField:
+        return "SearchField";
+    case AccessibilityRole::Sheet:
+        return "Sheet";
+    case AccessibilityRole::Slider:
+        return "Slider";
+    case AccessibilityRole::SliderThumb:
+        return "SliderThumb";
+    case AccessibilityRole::SpinButton:
+        return "SpinButton";
+    case AccessibilityRole::SpinButtonPart:
+        return "SpinButtonPart";
+    case AccessibilityRole::SplitGroup:
+        return "SplitGroup";
+    case AccessibilityRole::Splitter:
+        return "Splitter";
+    case AccessibilityRole::StaticText:
+        return "StaticText";
+    case AccessibilityRole::Subscript:
+        return "Subscript";
+    case AccessibilityRole::Summary:
+        return "Summary";
+    case AccessibilityRole::Superscript:
+        return "Superscript";
+    case AccessibilityRole::Switch:
+        return "Switch";
+    case AccessibilityRole::SystemWide:
+        return "SystemWide";
+    case AccessibilityRole::SVGRoot:
+        return "SVGRoot";
+    case AccessibilityRole::SVGText:
+        return "SVGText";
+    case AccessibilityRole::SVGTSpan:
+        return "SVGTSpan";
+    case AccessibilityRole::SVGTextPath:
+        return "SVGTextPath";
+    case AccessibilityRole::TabGroup:
+        return "TabGroup";
+    case AccessibilityRole::TabList:
+        return "TabList";
+    case AccessibilityRole::TabPanel:
+        return "TabPanel";
+    case AccessibilityRole::Tab:
+        return "Tab";
+    case AccessibilityRole::Table:
+        return "Table";
+    case AccessibilityRole::TableHeaderContainer:
+        return "TableHeaderContainer";
+    case AccessibilityRole::Term:
+        return "Term";
+    case AccessibilityRole::TextArea:
+        return "TextArea";
+    case AccessibilityRole::TextField:
+        return "TextField";
+    case AccessibilityRole::TextGroup:
+        return "TextGroup";
+    case AccessibilityRole::Time:
+        return "Time";
+    case AccessibilityRole::Tree:
+        return "Tree";
+    case AccessibilityRole::TreeGrid:
+        return "TreeGrid";
+    case AccessibilityRole::TreeItem:
+        return "TreeItem";
+    case AccessibilityRole::ToggleButton:
+        return "ToggleButton";
+    case AccessibilityRole::Toolbar:
+        return "Toolbar";
+    case AccessibilityRole::Unknown:
+        return "Unknown";
+    case AccessibilityRole::UserInterfaceTooltip:
+        return "UserInterfaceTooltip";
+    case AccessibilityRole::ValueIndicator:
+        return "ValueIndicator";
+    case AccessibilityRole::Video:
+        return "Video";
+    case AccessibilityRole::WebApplication:
+        return "WebApplication";
+    case AccessibilityRole::WebArea:
+        return "WebArea";
+    case AccessibilityRole::WebCoreLink:
+        return "WebCoreLink";
+    case AccessibilityRole::Window:
+        return "Window";
+    }
+    UNREACHABLE();
+    return "";
+}
+
 enum class AccessibilityDetachmentType { CacheDestroyed, ElementDestroyed, ElementChange };
 
 enum class AccessibilityConversionSpace { Screen, Page };

Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (265277 => 265278)


--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	2020-08-05 05:15:29 UTC (rev 265277)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	2020-08-05 07:22:07 UTC (rev 265278)
@@ -431,7 +431,7 @@
         if (id attachmentView = [self attachmentView])
             return [attachmentView accessibilityElementCount];
     }
-    
+
     return self.axBackingObject->children().size();
 }
 
@@ -495,6 +495,14 @@
     return [self convertPathToScreenSpace:path];
 }
 
+- (NSString *)_accessibilityWebRoleAsString
+{
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
+    return accessibilityRoleToString(self.axBackingObject->roleValue());
+}
+
 - (BOOL)accessibilityHasPopup
 {
     if (![self _prepareAccessibilityCall])
@@ -777,7 +785,7 @@
 {
     if (![self _prepareAccessibilityCall])
         return 0;
-    
+
     AccessibilityRole role = self.axBackingObject->roleValue();
     uint64_t traits = [self _axWebContentTrait];
     switch (role) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to