diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/accessibility/gtk | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/accessibility/gtk')
| -rw-r--r-- | WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp | 4 | ||||
| -rw-r--r-- | WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp index ca3e8cc..e32340a 100644 --- a/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp +++ b/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp @@ -38,8 +38,8 @@ AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesO if (!parent) return DefaultBehavior; - if (isMenuListPopup() || isMenuListOption()) - return IgnoreObject; + if (roleValue() == SplitterRole) + return IncludeObject; if (isGroup()) { // When a list item is made up entirely of children (e.g. paragraphs) diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp index ffef2a8..d09877f 100644 --- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp +++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp @@ -360,8 +360,10 @@ static AtkRole atkRole(AccessibilityRole role) return ATK_ROLE_TREE; case MenuBarRole: return ATK_ROLE_MENU_BAR; + case MenuListPopupRole: case MenuRole: return ATK_ROLE_MENU; + case MenuListOptionRole: case MenuItemRole: return ATK_ROLE_MENU_ITEM; case ColumnRole: @@ -379,6 +381,7 @@ static AtkRole atkRole(AccessibilityRole role) return ATK_ROLE_PROGRESS_BAR; case WindowRole: return ATK_ROLE_WINDOW; + case PopUpButtonRole: case ComboBoxRole: return ATK_ROLE_COMBO_BOX; case SplitGroupRole: |