Title: [224076] trunk/Source/WebKitLegacy/win
- Revision
- 224076
- Author
- [email protected]
- Date
- 2017-10-26 18:14:25 -0700 (Thu, 26 Oct 2017)
Log Message
Fix Windows build
https://bugs.webkit.org/show_bug.cgi?id=178892
* AccessibleBase.cpp:
(AccessibleBase::state const):
(MSAARole):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/win/AccessibleBase.cpp (224075 => 224076)
--- trunk/Source/WebKitLegacy/win/AccessibleBase.cpp 2017-10-27 00:54:23 UTC (rev 224075)
+++ trunk/Source/WebKitLegacy/win/AccessibleBase.cpp 2017-10-27 01:14:25 UTC (rev 224076)
@@ -530,7 +530,7 @@
if (m_object->isCollapsed())
state |= STATE_SYSTEM_COLLAPSED;
- if (m_object->roleValue() == PopUpButtonRole) {
+ if (m_object->roleValue() == AccessibilityRole::PopUpButton) {
state |= STATE_SYSTEM_HASPOPUP;
if (!m_object->isCollapsed())
@@ -859,153 +859,153 @@
static long MSAARole(AccessibilityRole role)
{
switch (role) {
- case WebCore::ButtonRole:
- return ROLE_SYSTEM_PUSHBUTTON;
- case WebCore::RadioButtonRole:
- return ROLE_SYSTEM_RADIOBUTTON;
- case WebCore::CheckBoxRole:
- case WebCore::ToggleButtonRole:
- case WebCore::SwitchRole:
- return ROLE_SYSTEM_CHECKBUTTON;
- case WebCore::SliderRole:
- return ROLE_SYSTEM_SLIDER;
- case WebCore::TabGroupRole:
- case WebCore::TabListRole:
- return ROLE_SYSTEM_PAGETABLIST;
- case WebCore::TextFieldRole:
- case WebCore::TextAreaRole:
- case WebCore::EditableTextRole:
- return ROLE_SYSTEM_TEXT;
- case WebCore::HeadingRole:
- case WebCore::ListMarkerRole:
- case WebCore::StaticTextRole:
- case WebCore::LabelRole:
- return ROLE_SYSTEM_STATICTEXT;
- case WebCore::OutlineRole:
- return ROLE_SYSTEM_OUTLINE;
- case WebCore::ColumnRole:
- return ROLE_SYSTEM_COLUMN;
- case WebCore::RowRole:
- return ROLE_SYSTEM_ROW;
- case WebCore::ApplicationGroupRole:
- case WebCore::GroupRole:
- case WebCore::RadioGroupRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::DescriptionListRole:
- case WebCore::DirectoryRole:
- case WebCore::ListRole:
- case WebCore::ListBoxRole:
- case WebCore::MenuListPopupRole:
- return ROLE_SYSTEM_LIST;
- case WebCore::GridRole:
- case WebCore::TableRole:
- return ROLE_SYSTEM_TABLE;
- case WebCore::ImageMapLinkRole:
- case WebCore::LinkRole:
- case WebCore::WebCoreLinkRole:
- return ROLE_SYSTEM_LINK;
- case WebCore::CanvasRole:
- case WebCore::ImageMapRole:
- case WebCore::ImageRole:
- return ROLE_SYSTEM_GRAPHIC;
- case WebCore::ListItemRole:
- return ROLE_SYSTEM_LISTITEM;
- case WebCore::ListBoxOptionRole:
- case WebCore::MenuListOptionRole:
- return ROLE_SYSTEM_STATICTEXT;
- case WebCore::ComboBoxRole:
- case WebCore::PopUpButtonRole:
- return ROLE_SYSTEM_COMBOBOX;
- case WebCore::DivRole:
- case WebCore::FooterRole:
- case WebCore::FormRole:
- case WebCore::ParagraphRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::HorizontalRuleRole:
- case WebCore::SplitterRole:
- return ROLE_SYSTEM_SEPARATOR;
- case WebCore::ApplicationAlertRole:
- case WebCore::ApplicationAlertDialogRole:
- return ROLE_SYSTEM_ALERT;
- case WebCore::DisclosureTriangleRole:
- return ROLE_SYSTEM_BUTTONDROPDOWN;
- case WebCore::IncrementorRole:
- case WebCore::SpinButtonRole:
- return ROLE_SYSTEM_SPINBUTTON;
- case WebCore::SpinButtonPartRole:
- return ROLE_SYSTEM_PUSHBUTTON;
- case WebCore::ToolbarRole:
- return ROLE_SYSTEM_TOOLBAR;
- case WebCore::UserInterfaceTooltipRole:
- return ROLE_SYSTEM_TOOLTIP;
- case WebCore::TreeRole:
- case WebCore::TreeGridRole:
- return ROLE_SYSTEM_OUTLINE;
- case WebCore::TreeItemRole:
- return ROLE_SYSTEM_OUTLINEITEM;
- case WebCore::TabPanelRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::TabRole:
- return ROLE_SYSTEM_PAGETAB;
- case WebCore::ApplicationRole:
- return ROLE_SYSTEM_APPLICATION;
- case WebCore::ApplicationDialogRole:
- return ROLE_SYSTEM_DIALOG;
- case WebCore::ApplicationLogRole:
- case WebCore::ApplicationMarqueeRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::ApplicationStatusRole:
- return ROLE_SYSTEM_STATUSBAR;
- case WebCore::ApplicationTimerRole:
- return ROLE_SYSTEM_CLOCK;
- case WebCore::CellRole:
- return ROLE_SYSTEM_CELL;
- case WebCore::ColumnHeaderRole:
- return ROLE_SYSTEM_COLUMNHEADER;
- case WebCore::DefinitionRole:
- case WebCore::DescriptionListDetailRole:
- case WebCore::DescriptionListTermRole:
- case WebCore::DocumentRole:
- case WebCore::DocumentArticleRole:
- case WebCore::DocumentNoteRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::DocumentMathRole:
- case WebCore::MathElementRole:
- return ROLE_SYSTEM_EQUATION;
- case WebCore::HelpTagRole:
- return ROLE_SYSTEM_HELPBALLOON;
- case WebCore::WebApplicationRole:
- case WebCore::LandmarkBannerRole:
- case WebCore::LandmarkComplementaryRole:
- case WebCore::LandmarkContentInfoRole:
- case WebCore::LandmarkMainRole:
- case WebCore::LandmarkNavigationRole:
- case WebCore::LandmarkRegionRole:
- case WebCore::LandmarkSearchRole:
- case WebCore::LegendRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::MenuRole:
- return ROLE_SYSTEM_MENUPOPUP;
- case WebCore::MenuItemRole:
- case WebCore::MenuButtonRole:
- return ROLE_SYSTEM_MENUITEM;
- case WebCore::MenuBarRole:
- return ROLE_SYSTEM_MENUBAR;
- case WebCore::ProgressIndicatorRole:
- return ROLE_SYSTEM_PROGRESSBAR;
- case WebCore::RowHeaderRole:
- return ROLE_SYSTEM_ROWHEADER;
- case WebCore::ScrollBarRole:
- return ROLE_SYSTEM_SCROLLBAR;
- case WebCore::SVGRootRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::TableHeaderContainerRole:
- return ROLE_SYSTEM_GROUPING;
- case WebCore::WindowRole:
- return ROLE_SYSTEM_WINDOW;
- default:
- // This is the default role for MSAA.
- return ROLE_SYSTEM_CLIENT;
+ case AccessibilityRole::Button:
+ return ROLE_SYSTEM_PUSHBUTTON;
+ case AccessibilityRole::RadioButton:
+ return ROLE_SYSTEM_RADIOBUTTON;
+ case AccessibilityRole::CheckBox:
+ case AccessibilityRole::ToggleButton:
+ case AccessibilityRole::Switch:
+ return ROLE_SYSTEM_CHECKBUTTON;
+ case AccessibilityRole::Slider:
+ return ROLE_SYSTEM_SLIDER;
+ case AccessibilityRole::TabGroup:
+ case AccessibilityRole::TabList:
+ return ROLE_SYSTEM_PAGETABLIST;
+ case AccessibilityRole::TextField:
+ case AccessibilityRole::TextArea:
+ case AccessibilityRole::EditableText:
+ return ROLE_SYSTEM_TEXT;
+ case AccessibilityRole::Heading:
+ case AccessibilityRole::ListMarker:
+ case AccessibilityRole::StaticText:
+ case AccessibilityRole::Label:
+ return ROLE_SYSTEM_STATICTEXT;
+ case AccessibilityRole::Outline:
+ return ROLE_SYSTEM_OUTLINE;
+ case AccessibilityRole::Column:
+ return ROLE_SYSTEM_COLUMN;
+ case AccessibilityRole::Row:
+ return ROLE_SYSTEM_ROW;
+ case AccessibilityRole::ApplicationGroup:
+ case AccessibilityRole::Group:
+ case AccessibilityRole::RadioGroup:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::DescriptionList:
+ case AccessibilityRole::Directory:
+ case AccessibilityRole::List:
+ case AccessibilityRole::ListBox:
+ case AccessibilityRole::MenuListPopup:
+ return ROLE_SYSTEM_LIST;
+ case AccessibilityRole::Grid:
+ case AccessibilityRole::Table:
+ return ROLE_SYSTEM_TABLE;
+ case AccessibilityRole::ImageMapLink:
+ case AccessibilityRole::Link:
+ case AccessibilityRole::WebCoreLink:
+ return ROLE_SYSTEM_LINK;
+ case AccessibilityRole::Canvas:
+ case AccessibilityRole::ImageMap:
+ case AccessibilityRole::Image:
+ return ROLE_SYSTEM_GRAPHIC;
+ case AccessibilityRole::ListItem:
+ return ROLE_SYSTEM_LISTITEM;
+ case AccessibilityRole::ListBoxOption:
+ case AccessibilityRole::MenuListOption:
+ return ROLE_SYSTEM_STATICTEXT;
+ case AccessibilityRole::ComboBox:
+ case AccessibilityRole::PopUpButton:
+ return ROLE_SYSTEM_COMBOBOX;
+ case AccessibilityRole::Div:
+ case AccessibilityRole::Footer:
+ case AccessibilityRole::Form:
+ case AccessibilityRole::Paragraph:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::HorizontalRule:
+ case AccessibilityRole::Splitter:
+ return ROLE_SYSTEM_SEPARATOR;
+ case AccessibilityRole::ApplicationAlert:
+ case AccessibilityRole::ApplicationAlertDialog:
+ return ROLE_SYSTEM_ALERT;
+ case AccessibilityRole::DisclosureTriangle:
+ return ROLE_SYSTEM_BUTTONDROPDOWN;
+ case AccessibilityRole::Incrementor:
+ case AccessibilityRole::SpinButton:
+ return ROLE_SYSTEM_SPINBUTTON;
+ case AccessibilityRole::SpinButtonPart:
+ return ROLE_SYSTEM_PUSHBUTTON;
+ case Accessibility::Toolbar:
+ return ROLE_SYSTEM_TOOLBAR;
+ case AccessibilityRole::UserInterfaceTooltip:
+ return ROLE_SYSTEM_TOOLTIP;
+ case AccessibilityRole::Tree:
+ case AccessibilityRole::TreeGrid:
+ return ROLE_SYSTEM_OUTLINE;
+ case AccessibilityRole::TreeItem:
+ return ROLE_SYSTEM_OUTLINEITEM;
+ case AccessibilityRole::TabPanel:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::Tab:
+ return ROLE_SYSTEM_PAGETAB;
+ case AccessibilityRole::Application:
+ return ROLE_SYSTEM_APPLICATION;
+ case AccessibilityRole::ApplicationDialog:
+ return ROLE_SYSTEM_DIALOG;
+ case AccessibilityRole::ApplicationLog:
+ case AccessibilityRole::ApplicationMarquee:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::ApplicationStatus:
+ return ROLE_SYSTEM_STATUSBAR;
+ case AccessibilityRole::ApplicationTimer:
+ return ROLE_SYSTEM_CLOCK;
+ case AccessibilityRole::Cell:
+ return ROLE_SYSTEM_CELL;
+ case AccessibilityRole::ColumnHeader:
+ return ROLE_SYSTEM_COLUMNHEADER;
+ case AccessibilityRole::Definition:
+ case AccessibilityRole::DescriptionListDetail:
+ case AccessibilityRole::DescriptionListTerm:
+ case AccessibilityRole::Document:
+ case AccessibilityRole::DocumentArticle:
+ case AccessibilityRole::DocumentNote:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::DocumentMath:
+ case AccessibilityRole::MathElement:
+ return ROLE_SYSTEM_EQUATION;
+ case AccessibilityRole::HelpTag:
+ return ROLE_SYSTEM_HELPBALLOON;
+ case AccessibilityRole::WebApplication:
+ case AccessibilityRole::LandmarkBanner:
+ case AccessibilityRole::LandmarkComplementary:
+ case AccessibilityRole::LandmarkContentInfo:
+ case AccessibilityRole::LandmarkMain:
+ case AccessibilityRole::LandmarkNavigation:
+ case AccessibilityRole::LandmarkRegion:
+ case AccessibilityRole::LandmarkSearch:
+ case AccessibilityRole::Legend:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::Menu:
+ return ROLE_SYSTEM_MENUPOPUP;
+ case AccessibilityRole::MenuItem:
+ case AccessibilityRole::MenuButton:
+ return ROLE_SYSTEM_MENUITEM;
+ case AccessibilityRole::MenuBar:
+ return ROLE_SYSTEM_MENUBAR;
+ case AccessibilityRole::ProgressIndicator:
+ return ROLE_SYSTEM_PROGRESSBAR;
+ case AccessibilityRole::RowHeader:
+ return ROLE_SYSTEM_ROWHEADER;
+ case AccessibilityRole::ScrollBar:
+ return ROLE_SYSTEM_SCROLLBAR;
+ case AccessibilityRole::SVGRoot:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::TableHeaderContainer:
+ return ROLE_SYSTEM_GROUPING;
+ case AccessibilityRole::Window:
+ return ROLE_SYSTEM_WINDOW;
+ default:
+ // This is the default role for MSAA.
+ return ROLE_SYSTEM_CLIENT;
}
}
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (224075 => 224076)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2017-10-27 00:54:23 UTC (rev 224075)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2017-10-27 01:14:25 UTC (rev 224076)
@@ -1,3 +1,12 @@
+2017-10-26 Alex Christensen <[email protected]>
+
+ Fix Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=178892
+
+ * AccessibleBase.cpp:
+ (AccessibleBase::state const):
+ (MSAARole):
+
2017-10-25 Youenn Fablet <[email protected]>
Enable ServiceWorker to fetch resources
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
