Changeset 224076 in webkit


Ignore:
Timestamp:
Oct 26, 2017 6:14:25 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Fix Windows build
​https://bugs.webkit.org/show_bug.cgi?id=178892

  • AccessibleBase.cpp:

(AccessibleBase::state const):
(MSAARole):

Location:
trunk/Source/WebKitLegacy/win
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKitLegacy/win/AccessibleBase.cpp

    r220930 r224076  
    531531        state |= STATE_SYSTEM_COLLAPSED;
    532532
    533     if (m_object->roleValue() == PopUpButtonRole) {
     533    if (m_object->roleValue() == AccessibilityRole::PopUpButton) {
    534534        state |= STATE_SYSTEM_HASPOPUP;
    535535
    … …  
    860860{
    861861    switch (role) {
    862         case WebCore::ButtonRole:
    863             return ROLE_SYSTEM_PUSHBUTTON;
    864         case WebCore::RadioButtonRole:
    865             return ROLE_SYSTEM_RADIOBUTTON;
    866         case WebCore::CheckBoxRole:
    867         case WebCore::ToggleButtonRole:
    868         case WebCore::SwitchRole:
    869             return ROLE_SYSTEM_CHECKBUTTON;
    870         case WebCore::SliderRole:
    871             return ROLE_SYSTEM_SLIDER;
    872         case WebCore::TabGroupRole:
    873         case WebCore::TabListRole:
    874             return ROLE_SYSTEM_PAGETABLIST;
    875         case WebCore::TextFieldRole:
    876         case WebCore::TextAreaRole:
    877         case WebCore::EditableTextRole:
    878             return ROLE_SYSTEM_TEXT;
    879         case WebCore::HeadingRole:
    880         case WebCore::ListMarkerRole:
    881         case WebCore::StaticTextRole:
    882         case WebCore::LabelRole:
    883             return ROLE_SYSTEM_STATICTEXT;
    884         case WebCore::OutlineRole:
    885             return ROLE_SYSTEM_OUTLINE;
    886         case WebCore::ColumnRole:
    887             return ROLE_SYSTEM_COLUMN;
    888         case WebCore::RowRole:
    889             return ROLE_SYSTEM_ROW;
    890         case WebCore::ApplicationGroupRole:
    891         case WebCore::GroupRole:
    892         case WebCore::RadioGroupRole:
    893             return ROLE_SYSTEM_GROUPING;
    894         case WebCore::DescriptionListRole:
    895         case WebCore::DirectoryRole:
    896         case WebCore::ListRole:
    897         case WebCore::ListBoxRole:
    898         case WebCore::MenuListPopupRole:
    899             return ROLE_SYSTEM_LIST;
    900         case WebCore::GridRole:
    901         case WebCore::TableRole:
    902             return ROLE_SYSTEM_TABLE;
    903         case WebCore::ImageMapLinkRole:
    904         case WebCore::LinkRole:
    905         case WebCore::WebCoreLinkRole:
    906             return ROLE_SYSTEM_LINK;
    907         case WebCore::CanvasRole:
    908         case WebCore::ImageMapRole:
    909         case WebCore::ImageRole:
    910             return ROLE_SYSTEM_GRAPHIC;
    911         case WebCore::ListItemRole:
    912             return ROLE_SYSTEM_LISTITEM;
    913         case WebCore::ListBoxOptionRole:
    914         case WebCore::MenuListOptionRole:
    915             return ROLE_SYSTEM_STATICTEXT;
    916         case WebCore::ComboBoxRole:
    917         case WebCore::PopUpButtonRole:
    918             return ROLE_SYSTEM_COMBOBOX;
    919         case WebCore::DivRole:
    920         case WebCore::FooterRole:
    921         case WebCore::FormRole:
    922         case WebCore::ParagraphRole:
    923             return ROLE_SYSTEM_GROUPING;
    924         case WebCore::HorizontalRuleRole:
    925         case WebCore::SplitterRole:
    926             return ROLE_SYSTEM_SEPARATOR;
    927         case WebCore::ApplicationAlertRole:
    928         case WebCore::ApplicationAlertDialogRole:
    929             return ROLE_SYSTEM_ALERT;
    930         case WebCore::DisclosureTriangleRole:
    931             return ROLE_SYSTEM_BUTTONDROPDOWN;
    932         case WebCore::IncrementorRole:
    933         case WebCore::SpinButtonRole:
    934             return ROLE_SYSTEM_SPINBUTTON;
    935         case WebCore::SpinButtonPartRole:
    936             return ROLE_SYSTEM_PUSHBUTTON;
    937         case WebCore::ToolbarRole:
    938             return ROLE_SYSTEM_TOOLBAR;
    939         case WebCore::UserInterfaceTooltipRole:
    940             return ROLE_SYSTEM_TOOLTIP;
    941         case WebCore::TreeRole:
    942         case WebCore::TreeGridRole:
    943             return ROLE_SYSTEM_OUTLINE;
    944         case WebCore::TreeItemRole:
    945             return ROLE_SYSTEM_OUTLINEITEM;
    946         case WebCore::TabPanelRole:
    947             return ROLE_SYSTEM_GROUPING;
    948         case WebCore::TabRole:
    949             return ROLE_SYSTEM_PAGETAB;
    950         case WebCore::ApplicationRole:
    951             return ROLE_SYSTEM_APPLICATION;
    952         case WebCore::ApplicationDialogRole:
    953             return ROLE_SYSTEM_DIALOG;
    954         case WebCore::ApplicationLogRole:
    955         case WebCore::ApplicationMarqueeRole:
    956             return ROLE_SYSTEM_GROUPING;
    957         case WebCore::ApplicationStatusRole:
    958             return ROLE_SYSTEM_STATUSBAR;
    959         case WebCore::ApplicationTimerRole:
    960             return ROLE_SYSTEM_CLOCK;
    961         case WebCore::CellRole:
    962             return ROLE_SYSTEM_CELL;
    963         case WebCore::ColumnHeaderRole:
    964             return ROLE_SYSTEM_COLUMNHEADER;
    965         case WebCore::DefinitionRole:
    966         case WebCore::DescriptionListDetailRole:
    967         case WebCore::DescriptionListTermRole:
    968         case WebCore::DocumentRole:
    969         case WebCore::DocumentArticleRole:
    970         case WebCore::DocumentNoteRole:
    971             return ROLE_SYSTEM_GROUPING;
    972         case WebCore::DocumentMathRole:
    973         case WebCore::MathElementRole:
    974             return ROLE_SYSTEM_EQUATION;
    975         case WebCore::HelpTagRole:
    976             return ROLE_SYSTEM_HELPBALLOON;
    977         case WebCore::WebApplicationRole:
    978         case WebCore::LandmarkBannerRole:
    979         case WebCore::LandmarkComplementaryRole:
    980         case WebCore::LandmarkContentInfoRole:
    981         case WebCore::LandmarkMainRole:
    982         case WebCore::LandmarkNavigationRole:
    983         case WebCore::LandmarkRegionRole:
    984         case WebCore::LandmarkSearchRole:
    985         case WebCore::LegendRole:
    986             return ROLE_SYSTEM_GROUPING;
    987         case WebCore::MenuRole:
    988             return ROLE_SYSTEM_MENUPOPUP;
    989         case WebCore::MenuItemRole:
    990         case WebCore::MenuButtonRole:
    991             return ROLE_SYSTEM_MENUITEM;
    992         case WebCore::MenuBarRole:
    993             return ROLE_SYSTEM_MENUBAR;
    994         case WebCore::ProgressIndicatorRole:
    995             return ROLE_SYSTEM_PROGRESSBAR;
    996         case WebCore::RowHeaderRole:
    997             return ROLE_SYSTEM_ROWHEADER;
    998         case WebCore::ScrollBarRole:
    999             return ROLE_SYSTEM_SCROLLBAR;
    1000         case WebCore::SVGRootRole:
    1001             return ROLE_SYSTEM_GROUPING;
    1002         case WebCore::TableHeaderContainerRole:
    1003             return ROLE_SYSTEM_GROUPING;
    1004         case WebCore::WindowRole:
    1005             return ROLE_SYSTEM_WINDOW;
    1006         default:
    1007             // This is the default role for MSAA.
    1008             return ROLE_SYSTEM_CLIENT;
     862    case AccessibilityRole::Button:
     863        return ROLE_SYSTEM_PUSHBUTTON;
     864    case AccessibilityRole::RadioButton:
     865        return ROLE_SYSTEM_RADIOBUTTON;
     866    case AccessibilityRole::CheckBox:
     867    case AccessibilityRole::ToggleButton:
     868    case AccessibilityRole::Switch:
     869        return ROLE_SYSTEM_CHECKBUTTON;
     870    case AccessibilityRole::Slider:
     871        return ROLE_SYSTEM_SLIDER;
     872    case AccessibilityRole::TabGroup:
     873    case AccessibilityRole::TabList:
     874        return ROLE_SYSTEM_PAGETABLIST;
     875    case AccessibilityRole::TextField:
     876    case AccessibilityRole::TextArea:
     877    case AccessibilityRole::EditableText:
     878        return ROLE_SYSTEM_TEXT;
     879    case AccessibilityRole::Heading:
     880    case AccessibilityRole::ListMarker:
     881    case AccessibilityRole::StaticText:
     882    case AccessibilityRole::Label:
     883        return ROLE_SYSTEM_STATICTEXT;
     884    case AccessibilityRole::Outline:
     885        return ROLE_SYSTEM_OUTLINE;
     886    case AccessibilityRole::Column:
     887        return ROLE_SYSTEM_COLUMN;
     888    case AccessibilityRole::Row:
     889        return ROLE_SYSTEM_ROW;
     890    case AccessibilityRole::ApplicationGroup:
     891    case AccessibilityRole::Group:
     892    case AccessibilityRole::RadioGroup:
     893        return ROLE_SYSTEM_GROUPING;
     894    case AccessibilityRole::DescriptionList:
     895    case AccessibilityRole::Directory:
     896    case AccessibilityRole::List:
     897    case AccessibilityRole::ListBox:
     898    case AccessibilityRole::MenuListPopup:
     899        return ROLE_SYSTEM_LIST;
     900    case AccessibilityRole::Grid:
     901    case AccessibilityRole::Table:
     902        return ROLE_SYSTEM_TABLE;
     903    case AccessibilityRole::ImageMapLink:
     904    case AccessibilityRole::Link:
     905    case AccessibilityRole::WebCoreLink:
     906        return ROLE_SYSTEM_LINK;
     907    case AccessibilityRole::Canvas:
     908    case AccessibilityRole::ImageMap:
     909    case AccessibilityRole::Image:
     910        return ROLE_SYSTEM_GRAPHIC;
     911    case AccessibilityRole::ListItem:
     912        return ROLE_SYSTEM_LISTITEM;
     913    case AccessibilityRole::ListBoxOption:
     914    case AccessibilityRole::MenuListOption:
     915        return ROLE_SYSTEM_STATICTEXT;
     916    case AccessibilityRole::ComboBox:
     917    case AccessibilityRole::PopUpButton:
     918        return ROLE_SYSTEM_COMBOBOX;
     919    case AccessibilityRole::Div:
     920    case AccessibilityRole::Footer:
     921    case AccessibilityRole::Form:
     922    case AccessibilityRole::Paragraph:
     923        return ROLE_SYSTEM_GROUPING;
     924    case AccessibilityRole::HorizontalRule:
     925    case AccessibilityRole::Splitter:
     926        return ROLE_SYSTEM_SEPARATOR;
     927    case AccessibilityRole::ApplicationAlert:
     928    case AccessibilityRole::ApplicationAlertDialog:
     929        return ROLE_SYSTEM_ALERT;
     930    case AccessibilityRole::DisclosureTriangle:
     931        return ROLE_SYSTEM_BUTTONDROPDOWN;
     932    case AccessibilityRole::Incrementor:
     933    case AccessibilityRole::SpinButton:
     934        return ROLE_SYSTEM_SPINBUTTON;
     935    case AccessibilityRole::SpinButtonPart:
     936        return ROLE_SYSTEM_PUSHBUTTON;
     937    case Accessibility::Toolbar:
     938        return ROLE_SYSTEM_TOOLBAR;
     939    case AccessibilityRole::UserInterfaceTooltip:
     940        return ROLE_SYSTEM_TOOLTIP;
     941    case AccessibilityRole::Tree:
     942    case AccessibilityRole::TreeGrid:
     943        return ROLE_SYSTEM_OUTLINE;
     944    case AccessibilityRole::TreeItem:
     945        return ROLE_SYSTEM_OUTLINEITEM;
     946    case AccessibilityRole::TabPanel:
     947        return ROLE_SYSTEM_GROUPING;
     948    case AccessibilityRole::Tab:
     949        return ROLE_SYSTEM_PAGETAB;
     950    case AccessibilityRole::Application:
     951        return ROLE_SYSTEM_APPLICATION;
     952    case AccessibilityRole::ApplicationDialog:
     953        return ROLE_SYSTEM_DIALOG;
     954    case AccessibilityRole::ApplicationLog:
     955    case AccessibilityRole::ApplicationMarquee:
     956        return ROLE_SYSTEM_GROUPING;
     957    case AccessibilityRole::ApplicationStatus:
     958        return ROLE_SYSTEM_STATUSBAR;
     959    case AccessibilityRole::ApplicationTimer:
     960        return ROLE_SYSTEM_CLOCK;
     961    case AccessibilityRole::Cell:
     962        return ROLE_SYSTEM_CELL;
     963    case AccessibilityRole::ColumnHeader:
     964        return ROLE_SYSTEM_COLUMNHEADER;
     965    case AccessibilityRole::Definition:
     966    case AccessibilityRole::DescriptionListDetail:
     967    case AccessibilityRole::DescriptionListTerm:
     968    case AccessibilityRole::Document:
     969    case AccessibilityRole::DocumentArticle:
     970    case AccessibilityRole::DocumentNote:
     971        return ROLE_SYSTEM_GROUPING;
     972    case AccessibilityRole::DocumentMath:
     973    case AccessibilityRole::MathElement:
     974        return ROLE_SYSTEM_EQUATION;
     975    case AccessibilityRole::HelpTag:
     976        return ROLE_SYSTEM_HELPBALLOON;
     977    case AccessibilityRole::WebApplication:
     978    case AccessibilityRole::LandmarkBanner:
     979    case AccessibilityRole::LandmarkComplementary:
     980    case AccessibilityRole::LandmarkContentInfo:
     981    case AccessibilityRole::LandmarkMain:
     982    case AccessibilityRole::LandmarkNavigation:
     983    case AccessibilityRole::LandmarkRegion:
     984    case AccessibilityRole::LandmarkSearch:
     985    case AccessibilityRole::Legend:
     986        return ROLE_SYSTEM_GROUPING;
     987    case AccessibilityRole::Menu:
     988        return ROLE_SYSTEM_MENUPOPUP;
     989    case AccessibilityRole::MenuItem:
     990    case AccessibilityRole::MenuButton:
     991        return ROLE_SYSTEM_MENUITEM;
     992    case AccessibilityRole::MenuBar:
     993        return ROLE_SYSTEM_MENUBAR;
     994    case AccessibilityRole::ProgressIndicator:
     995        return ROLE_SYSTEM_PROGRESSBAR;
     996    case AccessibilityRole::RowHeader:
     997        return ROLE_SYSTEM_ROWHEADER;
     998    case AccessibilityRole::ScrollBar:
     999        return ROLE_SYSTEM_SCROLLBAR;
     1000    case AccessibilityRole::SVGRoot:
     1001        return ROLE_SYSTEM_GROUPING;
     1002    case AccessibilityRole::TableHeaderContainer:
     1003        return ROLE_SYSTEM_GROUPING;
     1004    case AccessibilityRole::Window:
     1005        return ROLE_SYSTEM_WINDOW;
     1006    default:
     1007        // This is the default role for MSAA.
     1008        return ROLE_SYSTEM_CLIENT;
    10091009    }
    10101010}

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r223981 r224076  
     12017-10-26  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix Windows build
     4        https://bugs.webkit.org/show_bug.cgi?id=178892
     5
     6        * AccessibleBase.cpp:
     7        (AccessibleBase::state const):
     8        (MSAARole):
     9
    1102017-10-25  Youenn Fablet  <youenn@apple.com>
    211
Note: See TracChangeset for help on using the changeset viewer.