Chromium Code Reviews| Index: Source/modules/accessibility/AXRenderObject.cpp |
| diff --git a/Source/modules/accessibility/AXRenderObject.cpp b/Source/modules/accessibility/AXRenderObject.cpp |
| index 690596b2cebd0aefc6b074ffc6fe339854812b66..a025bfacbbb49de4047bfaf4b23714805f9d3148 100644 |
| --- a/Source/modules/accessibility/AXRenderObject.cpp |
| +++ b/Source/modules/accessibility/AXRenderObject.cpp |
| @@ -847,14 +847,39 @@ const AtomicString& AXRenderObject::accessKey() const |
| AccessibilityOrientation AXRenderObject::orientation() const |
| { |
| - const AtomicString& ariaOrientation = getAttribute(aria_orientationAttr); |
| - if (equalIgnoringCase(ariaOrientation, "horizontal")) |
| - return AccessibilityOrientationHorizontal; |
| - if (equalIgnoringCase(ariaOrientation, "vertical")) |
| - return AccessibilityOrientationVertical; |
| - |
| - if (isScrollbar()) |
| - return AccessibilityOrientationVertical; |
| + if (ariaRoleAttribute() == ComboBoxRole |
|
dmazzoni
2014/11/20 16:48:06
You're only checking the aria role, but some of th
|
| + || ariaRoleAttribute() == ListBoxRole |
| + || ariaRoleAttribute() == MenuRole |
| + || ariaRoleAttribute() == MenuBarRole |
| + || ariaRoleAttribute() == RadioGroupRole |
| + || ariaRoleAttribute() == ScrollBarRole |
| + || ariaRoleAttribute() == SliderRole |
| + || ariaRoleAttribute() == SplitterRole |
| + || ariaRoleAttribute() == TabListRole |
| + || ariaRoleAttribute() == ToolbarRole |
| + || ariaRoleAttribute() == TreeRole |
| + || ariaRoleAttribute() == TreeGridRole) { |
| + |
| + const AtomicString& ariaOrientation = getAttribute(aria_orientationAttr); |
| + |
| + // Adding implicit horizontal orientation |
| + if (equalIgnoringCase(ariaOrientation, "horizontal") |
| + || ariaRoleAttribute() == MenuBarRole |
| + || ariaRoleAttribute() == SplitterRole |
| + || ariaRoleAttribute() == SliderRole |
| + || ariaRoleAttribute() == TabListRole |
| + || ariaRoleAttribute() == ToolbarRole) |
| + return AccessibilityOrientationHorizontal; |
| + |
| + // Adding implicit vertical orientation |
| + if (equalIgnoringCase(ariaOrientation, "vertical") |
| + || ariaRoleAttribute() == ComboBoxRole |
| + || ariaRoleAttribute() == ListBoxRole |
| + || ariaRoleAttribute() == MenuRole |
| + || ariaRoleAttribute() == ScrollBarRole |
| + || ariaRoleAttribute() == TreeRole) |
| + return AccessibilityOrientationVertical; |
| + } |
| return AXObject::orientation(); |
| } |