<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190648] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190648">190648</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2015-10-06 14:46:08 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: ARIA 1.1: aria-orientation now defaults to undefined, supported on more elements, and role-specific defaults are defined.
https://bugs.webkit.org/show_bug.cgi?id=132177
Reviewed by Chris Fleizach.
Source/WebCore:
Added role-specific defaults and changed general default to undefined.
Also added more elements to support aria-orientation on Mac.
Test: accessibility/mac/aria-orientation.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::orientation):
(WebCore::AccessibilityObject::isDescendantOfObject):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::isColorWell):
(WebCore::AccessibilityObject::isSplitter):
(WebCore::AccessibilityObject::isToolbar):
(WebCore::AccessibilityObject::isChecked):
(WebCore::AccessibilityObject::isEnabled):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::orientation):
* accessibility/AccessibilityScrollView.cpp:
(WebCore::AccessibilityScrollView::scrollBar):
* accessibility/AccessibilityScrollbar.cpp:
(WebCore::AccessibilityScrollbar::orientation):
(WebCore::AccessibilityScrollbar::isEnabled):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
LayoutTests:
* accessibility/mac/aria-orientation-expected.txt: Added.
* accessibility/mac/aria-orientation.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollViewcpp">trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollbarcpp">trunk/Source/WebCore/accessibility/AccessibilityScrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacariaorientationexpectedtxt">trunk/LayoutTests/accessibility/mac/aria-orientation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacariaorientationhtml">trunk/LayoutTests/accessibility/mac/aria-orientation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/LayoutTests/ChangeLog 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-06 Nan Wang <n_wang@apple.com>
+
+ AX: ARIA 1.1: aria-orientation now defaults to undefined, supported on more elements, and role-specific defaults are defined.
+ https://bugs.webkit.org/show_bug.cgi?id=132177
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/aria-orientation-expected.txt: Added.
+ * accessibility/mac/aria-orientation.html: Added.
+
</ins><span class="cx"> 2015-10-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark compositing/geometry/limit-layer-bounds-opacity-transition.html as failing
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariaorientationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-orientation-expected.txt (0 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-orientation-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-orientation-expected.txt 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+Implicit defaults
+
+Option
+Menu item 1
+menubar
+item one
+tree item
+
+Authored orientation
+radio 1
+cell
+cell2
+X
+This test makes sure that aria-orientation works correctly and the implicit defaults are defined on different roles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS slider.orientation is 'AXOrientation: AXHorizontalOrientation'
+PASS combobox.orientation is 'AXOrientation: AXVerticalOrientation'
+PASS listbox.orientation is 'AXOrientation: AXVerticalOrientation'
+PASS menu.orientation is 'AXOrientation: AXVerticalOrientation'
+PASS menubar.orientation is 'AXOrientation: AXHorizontalOrientation'
+PASS tablist.orientation is 'AXOrientation: AXHorizontalOrientation'
+PASS toolbar.orientation is 'AXOrientation: AXHorizontalOrientation'
+PASS tree.orientation is 'AXOrientation: AXVerticalOrientation'
+PASS radiogroup.orientation is 'AXOrientation: AXVerticalOrientation'
+PASS treegrid.orientation is 'AXOrientation: AXHorizontalOrientation'
+PASS slider2.orientation is 'AXOrientation: AXUnknownOrientation'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariaorientationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-orientation.html (0 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/aria-orientation.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-orientation.html 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div>Implicit defaults</div>
+<input type="range" id="slider">
+<input id="combo" type="text" role="combobox" placeholder="Placeholder" value="text">
+<div id="listbox" role="listbox">
+ <div id="option1" role="option" aria-selected="true">Option</div>
+</div>
+<div id="menu" role="menu">
+ <div role="menuitem" id="item1" tabindex="0">Menu item 1</div>
+</div>
+<div id="menubar" role="menubar">menubar</div>
+<div role="tablist" id="tablist">
+<div role="toolbar" id="toolbar" aria-label="test toolbar"><li>item one</div>
+<ul id="tree" role="tree">
+ <li id="treeitem1" role="treeitem">tree item</li>
+</ul>
+
+<br>
+<div>Authored orientation</div>
+<div role="radiogroup" id="radiogroup" aria-orientation="vertical">
+ <div role="radio" aria-label="radio 1" aria-checked=false>radio 1</div>
+</div>
+<table id="treegrid" role="treegrid" aria-orientation="horizontal">
+<tbody>
+ <tr><td role="gridcell" colspan="3">cell</tr>
+ <tr><td role="gridcell" colspan="3">cell2</tr>
+</tbody>
+</table>
+<span role="slider" id="slider2" aria-orientation="undefined" aria-valuenow=5 aria-valuemin=0 aria-valuemax=10>X</span>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This test makes sure that aria-orientation works correctly and the implicit defaults are defined on different roles.");
+
+ if (window.accessibilityController) {
+ // Test implicit defaults on some roles.
+ var slider = accessibilityController.accessibleElementById("slider");
+ shouldBe("slider.orientation", "'AXOrientation: AXHorizontalOrientation'");
+
+ var combobox = accessibilityController.accessibleElementById("combo");
+ shouldBe("combobox.orientation", "'AXOrientation: AXVerticalOrientation'");
+
+ var listbox = accessibilityController.accessibleElementById("listbox");
+ shouldBe("listbox.orientation", "'AXOrientation: AXVerticalOrientation'");
+
+ var menu = accessibilityController.accessibleElementById("menu");
+ shouldBe("menu.orientation", "'AXOrientation: AXVerticalOrientation'");
+
+ var menubar = accessibilityController.accessibleElementById("menubar");
+ shouldBe("menubar.orientation", "'AXOrientation: AXHorizontalOrientation'");
+
+ var tablist = accessibilityController.accessibleElementById("tablist");
+ shouldBe("tablist.orientation", "'AXOrientation: AXHorizontalOrientation'");
+
+ var toolbar = accessibilityController.accessibleElementById("toolbar");
+ shouldBe("toolbar.orientation", "'AXOrientation: AXHorizontalOrientation'");
+
+ var tree = accessibilityController.accessibleElementById("tree");
+ shouldBe("tree.orientation", "'AXOrientation: AXVerticalOrientation'");
+
+ // Test authored aria-orientation are correct.
+ var radiogroup = accessibilityController.accessibleElementById("radiogroup");
+ shouldBe("radiogroup.orientation", "'AXOrientation: AXVerticalOrientation'");
+
+ var treegrid = accessibilityController.accessibleElementById("treegrid");
+ shouldBe("treegrid.orientation", "'AXOrientation: AXHorizontalOrientation'");
+
+ var slider2 = accessibilityController.accessibleElementById("slider2");
+ shouldBe("slider2.orientation", "'AXOrientation: AXUnknownOrientation'");
+ }
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/ChangeLog 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-10-06 Nan Wang <n_wang@apple.com>
+
+ AX: ARIA 1.1: aria-orientation now defaults to undefined, supported on more elements, and role-specific defaults are defined.
+ https://bugs.webkit.org/show_bug.cgi?id=132177
+
+ Reviewed by Chris Fleizach.
+
+ Added role-specific defaults and changed general default to undefined.
+ Also added more elements to support aria-orientation on Mac.
+
+ Test: accessibility/mac/aria-orientation.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::orientation):
+ (WebCore::AccessibilityObject::isDescendantOfObject):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::isColorWell):
+ (WebCore::AccessibilityObject::isSplitter):
+ (WebCore::AccessibilityObject::isToolbar):
+ (WebCore::AccessibilityObject::isChecked):
+ (WebCore::AccessibilityObject::isEnabled):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::orientation):
+ * accessibility/AccessibilityScrollView.cpp:
+ (WebCore::AccessibilityScrollView::scrollBar):
+ * accessibility/AccessibilityScrollbar.cpp:
+ (WebCore::AccessibilityScrollbar::orientation):
+ (WebCore::AccessibilityScrollbar::isEnabled):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
+
</ins><span class="cx"> 2015-10-06 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] GStreamer compile errors.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -1877,8 +1877,7 @@
</span><span class="cx"> if (bounds.size().height() > bounds.size().width())
</span><span class="cx"> return AccessibilityOrientationVertical;
</span><span class="cx">
</span><del>- // A tie goes to horizontal.
- return AccessibilityOrientationHorizontal;
</del><ins>+ return AccessibilityOrientationUndefined;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityObject::isDescendantOfObject(const AccessibilityObject* axObject) const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -279,6 +279,7 @@
</span><span class="cx"> enum AccessibilityOrientation {
</span><span class="cx"> AccessibilityOrientationVertical,
</span><span class="cx"> AccessibilityOrientationHorizontal,
</span><ins>+ AccessibilityOrientationUndefined,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum AccessibilityObjectInclusion {
</span><span class="lines">@@ -536,6 +537,8 @@
</span><span class="cx"> bool isColorWell() const { return roleValue() == ColorWellRole; }
</span><span class="cx"> bool isRangeControl() const;
</span><span class="cx"> bool isMeter() const;
</span><ins>+ bool isSplitter() const { return roleValue() == SplitterRole; }
+ bool isToolbar() const { return roleValue() == ToolbarRole; }
</ins><span class="cx">
</span><span class="cx"> virtual bool isChecked() const { return false; }
</span><span class="cx"> virtual bool isEnabled() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -2717,10 +2717,17 @@
</span><span class="cx"> return AccessibilityOrientationHorizontal;
</span><span class="cx"> if (equalIgnoringCase(ariaOrientation, "vertical"))
</span><span class="cx"> return AccessibilityOrientationVertical;
</span><ins>+ if (equalIgnoringCase(ariaOrientation, "undefined"))
+ return AccessibilityOrientationUndefined;
</ins><span class="cx">
</span><del>- if (isScrollbar())
</del><ins>+ // ARIA 1.1 Implicit defaults are defined on some roles.
+ // http://www.w3.org/TR/wai-aria-1.1/#aria-orientation
+ if (isScrollbar() || isComboBox() || isListBox() || isMenu() || isTree())
</ins><span class="cx"> return AccessibilityOrientationVertical;
</span><span class="cx">
</span><ins>+ if (isMenuBar() || isSplitter() || isTabList() || isToolbar())
+ return AccessibilityOrientationHorizontal;
+
</ins><span class="cx"> return AccessibilityObject::orientation();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx"> updateScrollbars();
</span><span class="cx">
</span><span class="cx"> switch (orientation) {
</span><ins>+ // ARIA 1.1 Elements with the role scrollbar have an implicit aria-orientation value of vertical.
+ case AccessibilityOrientationUndefined:
</ins><span class="cx"> case AccessibilityOrientationVertical:
</span><span class="cx"> return m_verticalScrollbar ? m_verticalScrollbar.get() : nullptr;
</span><span class="cx"> case AccessibilityOrientationHorizontal:
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollbar.cpp (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollbar.cpp 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollbar.cpp 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -65,15 +65,16 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityOrientation AccessibilityScrollbar::orientation() const
</span><span class="cx"> {
</span><ins>+ // ARIA 1.1 Elements with the role scrollbar have an implicit aria-orientation value of vertical.
</ins><span class="cx"> if (!m_scrollbar)
</span><del>- return AccessibilityOrientationHorizontal;
</del><ins>+ return AccessibilityOrientationVertical;
</ins><span class="cx">
</span><span class="cx"> if (m_scrollbar->orientation() == HorizontalScrollbar)
</span><span class="cx"> return AccessibilityOrientationHorizontal;
</span><span class="cx"> if (m_scrollbar->orientation() == VerticalScrollbar)
</span><span class="cx"> return AccessibilityOrientationVertical;
</span><span class="cx">
</span><del>- return AccessibilityOrientationHorizontal;
</del><ins>+ return AccessibilityOrientationVertical;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityScrollbar::isEnabled() const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (190647 => 190648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-10-06 21:41:56 UTC (rev 190647)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-10-06 21:46:08 UTC (rev 190648)
</span><span class="lines">@@ -1236,7 +1236,10 @@
</span><span class="cx"> if (m_object->supportsExpanded())
</span><span class="cx"> [additional addObject:NSAccessibilityExpandedAttribute];
</span><span class="cx">
</span><del>- if (m_object->isScrollbar())
</del><ins>+ if (m_object->isScrollbar()
+ || m_object->isRadioGroup()
+ || m_object->isSplitter()
+ || m_object->isToolbar())
</ins><span class="cx"> [additional addObject:NSAccessibilityOrientationAttribute];
</span><span class="cx">
</span><span class="cx"> if (m_object->supportsARIADragging())
</span><span class="lines">@@ -1439,6 +1442,7 @@
</span><span class="cx"> [tempArray addObject:NSAccessibilityAccessKeyAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityRequiredAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityInvalidAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityOrientationAttribute];
</ins><span class="cx"> listBoxAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -1457,6 +1461,7 @@
</span><span class="cx"> [tempArray addObject:NSAccessibilitySelectedChildrenAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityVisibleChildrenAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityTitleUIElementAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityOrientationAttribute];
</ins><span class="cx"> menuBarAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -1465,6 +1470,7 @@
</span><span class="cx"> [tempArray addObject:NSAccessibilitySelectedChildrenAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityVisibleChildrenAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityTitleUIElementAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityOrientationAttribute];
</ins><span class="cx"> menuAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -1529,6 +1535,7 @@
</span><span class="cx"> if (comboBoxAttrs == nil) {
</span><span class="cx"> tempArray = [[NSMutableArray alloc] initWithArray:controlAttrs];
</span><span class="cx"> [tempArray addObject:NSAccessibilityExpandedAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityOrientationAttribute];
</ins><span class="cx"> comboBoxAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -1597,6 +1604,7 @@
</span><span class="cx"> tempArray = [[NSMutableArray alloc] initWithArray:attributes];
</span><span class="cx"> [tempArray addObject:NSAccessibilityTabsAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityContentsAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityOrientationAttribute];
</ins><span class="cx"> tabListAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -1605,6 +1613,7 @@
</span><span class="cx"> [tempArray addObject:NSAccessibilitySelectedRowsAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityRowsAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityColumnsAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityOrientationAttribute];
</ins><span class="cx"> outlineAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -2927,6 +2936,8 @@
</span><span class="cx"> return NSAccessibilityVerticalOrientationValue;
</span><span class="cx"> if (elementOrientation == AccessibilityOrientationHorizontal)
</span><span class="cx"> return NSAccessibilityHorizontalOrientationValue;
</span><ins>+ if (elementOrientation == AccessibilityOrientationUndefined)
+ return NSAccessibilityUnknownOrientationValue;
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>