<!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>[189044] 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/189044">189044</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-27 12:21:29 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Fix accessibility/select-element-at-index.html test
https://bugs.webkit.org/show_bug.cgi?id=148516
Patch by Nan Wang <n_wang@apple.com> on 2015-08-27
Reviewed by Chris Fleizach.
Tools:
Implemented setSelectedChildAtIndex and removeSelectionAtIndex for mac.
* DumpRenderTree/AccessibilityUIElement.cpp:
(setSelectedChildCallback):
(setSelectedChildAtIndexCallback):
(removeSelectionAtIndexCallback):
(elementAtPointCallback):
(sentenceAtOffsetCallback):
(stringForSelectionCallback):
(AccessibilityUIElement::getJSClass):
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::setSelectedChild):
(AccessibilityUIElement::setSelectedChildAtIndex):
(AccessibilityUIElement::removeSelectionAtIndex):
(AccessibilityUIElement::accessibilityValue):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::wordAtOffset):
(WTR::AccessibilityUIElement::lineAtOffset):
(WTR::AccessibilityUIElement::sentenceAtOffset):
(WTR::AccessibilityUIElement::isSelectable):
(WTR::AccessibilityUIElement::isMultiSelectable):
(WTR::AccessibilityUIElement::setSelectedChild):
(WTR::AccessibilityUIElement::setSelectedChildAtIndex):
(WTR::AccessibilityUIElement::removeSelectionAtIndex):
(WTR::AccessibilityUIElement::selectedChildrenCount):
(WTR::AccessibilityUIElement::selectedChildAtIndex):
(WTR::AccessibilityUIElement::isExpanded):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::setSelectedChild):
(WTR::AccessibilityUIElement::setSelectedChildAtIndex):
(WTR::AccessibilityUIElement::removeSelectionAtIndex):
(WTR::AccessibilityUIElement::accessibilityValue):
LayoutTests:
* accessibility/select-element-at-index.html:
* platform/mac/TestExpectations:
* platform/mac/accessibility/select-element-at-index-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityselectelementatindexhtml">trunk/LayoutTests/accessibility/select-element-at-index.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementcpp">trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselectelementatindexexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/select-element-at-index-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/LayoutTests/ChangeLog 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-08-27 Nan Wang <n_wang@apple.com>
+
+ AX: Fix accessibility/select-element-at-index.html test
+ https://bugs.webkit.org/show_bug.cgi?id=148516
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/select-element-at-index.html:
+ * platform/mac/TestExpectations:
+ * platform/mac/accessibility/select-element-at-index-expected.txt: Added.
+
</ins><span class="cx"> 2015-08-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Skip new High DPI test (Windows doesn't quite support this)
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityselectelementatindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/select-element-at-index.html (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/select-element-at-index.html 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/LayoutTests/accessibility/select-element-at-index.html 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -45,7 +45,14 @@
</span><span class="cx"> selectElement.setSelectedChildAtIndex(3);
</span><span class="cx"> shouldBe("selectElement.selectedChildrenCount", "3");
</span><span class="cx"> shouldBeTrue("option4.isSelected");
</span><del>- shouldBeTrue("selectElement.selectedChildAtIndex(3).isEqual(option4)");
</del><ins>+
+ // On mac, selectedChildAtIndex is using the index to retrieve the element
+ // from the selected children array. Here, the selected children array has
+ // size 3, so the index should be 2.
+ if (accessibilityController.platformName == "mac")
+ shouldBeTrue("selectElement.selectedChildAtIndex(2).isEqual(option4)");
+ else
+ shouldBeTrue("selectElement.selectedChildAtIndex(3).isEqual(option4)");
</ins><span class="cx">
</span><span class="cx"> selectElement.removeSelectionAtIndex(3);
</span><span class="cx"> shouldBeFalse("option4.isSelected");
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -44,9 +44,6 @@
</span><span class="cx"> accessibility/menu-list-sends-change-notification.html
</span><span class="cx"> accessibility/multiselect-list-reports-active-option.html
</span><span class="cx">
</span><del>-# Missing implementation of some functions in mac.
-webkit.org/b/129039 accessibility/select-element-at-index.html [ Skip ]
-
</del><span class="cx"> # Need to add functionality to DumpRenderTree to handle error pages
</span><span class="cx"> fast/history/back-forward-reset-after-error-handling.html
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselectelementatindexexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/select-element-at-index-expected.txt (0 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-element-at-index-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/select-element-at-index-expected.txt 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+
+Tests that checks whether setting selection at the given index works correctly
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS selectElement.selectedChildrenCount is 0
+PASS selectElement.selectedChildrenCount is 1
+PASS option1.isSelected is true
+PASS selectElement.selectedChildAtIndex(0).isEqual(option1) is true
+PASS selectElement.selectedChildrenCount is 2
+PASS option2.isSelected is true
+PASS selectElement.selectedChildAtIndex(1).isEqual(option2) is true
+PASS option3.isSelected is false
+PASS selectElement.selectedChildrenCount is 3
+PASS option4.isSelected is true
+PASS selectElement.selectedChildAtIndex(2).isEqual(option4) is true
+PASS option4.isSelected is false
+PASS selectElement.selectedChildrenCount is 2
+PASS option2.isSelected is false
+PASS selectElement.selectedChildrenCount is 1
+PASS option1.isSelected is false
+PASS selectElement.selectedChildrenCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/Tools/ChangeLog 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-08-27 Nan Wang <n_wang@apple.com>
+
+ AX: Fix accessibility/select-element-at-index.html test
+ https://bugs.webkit.org/show_bug.cgi?id=148516
+
+ Reviewed by Chris Fleizach.
+
+ Implemented setSelectedChildAtIndex and removeSelectionAtIndex for mac.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (setSelectedChildCallback):
+ (setSelectedChildAtIndexCallback):
+ (removeSelectionAtIndexCallback):
+ (elementAtPointCallback):
+ (sentenceAtOffsetCallback):
+ (stringForSelectionCallback):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::setSelectedChild):
+ (AccessibilityUIElement::setSelectedChildAtIndex):
+ (AccessibilityUIElement::removeSelectionAtIndex):
+ (AccessibilityUIElement::accessibilityValue):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::wordAtOffset):
+ (WTR::AccessibilityUIElement::lineAtOffset):
+ (WTR::AccessibilityUIElement::sentenceAtOffset):
+ (WTR::AccessibilityUIElement::isSelectable):
+ (WTR::AccessibilityUIElement::isMultiSelectable):
+ (WTR::AccessibilityUIElement::setSelectedChild):
+ (WTR::AccessibilityUIElement::setSelectedChildAtIndex):
+ (WTR::AccessibilityUIElement::removeSelectionAtIndex):
+ (WTR::AccessibilityUIElement::selectedChildrenCount):
+ (WTR::AccessibilityUIElement::selectedChildAtIndex):
+ (WTR::AccessibilityUIElement::isExpanded):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::setSelectedChild):
+ (WTR::AccessibilityUIElement::setSelectedChildAtIndex):
+ (WTR::AccessibilityUIElement::removeSelectionAtIndex):
+ (WTR::AccessibilityUIElement::accessibilityValue):
+
</ins><span class="cx"> 2015-08-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build fix after r188982
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -482,6 +482,24 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef setSelectedChildAtIndexCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount == 1) {
+ unsigned indexNumber = JSValueToNumber(context, arguments[0], exception);
+ toAXElement(thisObject)->setSelectedChildAtIndex(indexNumber);
+ }
+ return JSValueMakeUndefined(context);
+}
+
+static JSValueRef removeSelectionAtIndexCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount == 1) {
+ unsigned indexNumber = JSValueToNumber(context, arguments[0], exception);
+ toAXElement(thisObject)->removeSelectionAtIndex(indexNumber);
+ }
+ return JSValueMakeUndefined(context);
+}
+
</ins><span class="cx"> static JSValueRef elementAtPointCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> int x = 0;
</span><span class="lines">@@ -1294,28 +1312,6 @@
</span><span class="cx"> return JSValueMakeString(context, sentenceAtOffset.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValueRef setSelectedChildAtIndexCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- int indexNumber = -1;
- if (argumentCount == 1);
- indexNumber = JSValueToNumber(context, arguments[0], exception);
-
- if (indexNumber >= 0)
- toAXElement(thisObject)->setSelectedChildAtIndex(indexNumber);
- return JSValueMakeUndefined(context);
-}
-
-static JSValueRef removeSelectionAtIndexCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- int indexNumber = -1;
- if (argumentCount == 1)
- indexNumber = JSValueToNumber(context, arguments[0], exception);
-
- if (indexNumber >= 0)
- toAXElement(thisObject)->removeSelectionAtIndex(indexNumber);
- return JSValueMakeUndefined(context);
-}
-
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> static JSValueRef stringForSelectionCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
</span><span class="lines">@@ -1380,6 +1376,8 @@
</span><span class="cx"> JSStringRef AccessibilityUIElement::rangeForLine(int line) { return 0; }
</span><span class="cx"> JSStringRef AccessibilityUIElement::rangeForPosition(int, int) { return 0; }
</span><span class="cx"> void AccessibilityUIElement::setSelectedChild(AccessibilityUIElement*) const { }
</span><ins>+void AccessibilityUIElement::setSelectedChildAtIndex(unsigned) const { }
+void AccessibilityUIElement::removeSelectionAtIndex(unsigned) const { }
</ins><span class="cx"> AccessibilityUIElement AccessibilityUIElement::horizontalScrollbar() const { return 0; }
</span><span class="cx"> AccessibilityUIElement AccessibilityUIElement::verticalScrollbar() const { return 0; }
</span><span class="cx"> AccessibilityUIElement AccessibilityUIElement::uiElementAttributeValue(JSStringRef) const { return 0; }
</span><span class="lines">@@ -1696,6 +1694,8 @@
</span><span class="cx"> { "previousTextMarker", previousTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "stringForTextMarkerRange", stringForTextMarkerRangeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setSelectedChild", setSelectedChildCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "setSelectedChildAtIndex", setSelectedChildAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "removeSelectionAtIndex", removeSelectionAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { "setValue", setValueCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setSelectedVisibleTextRange", setSelectedVisibleTextRangeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "selectedChildAtIndex", selectedChildAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="lines">@@ -1705,8 +1705,6 @@
</span><span class="cx"> { "wordAtOffset", wordAtOffsetCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "lineAtOffset", lineAtOffsetCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "sentenceAtOffset", sentenceAtOffsetCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><del>- { "setSelectedChildAtIndex", setSelectedChildAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "removeSelectionAtIndex", removeSelectionAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> { "linkedElement", linkedElementCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "headerElementAtIndex", headerElementAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> - (NSUInteger)accessibilityIndexOfChild:(id)child;
</span><span class="cx"> - (NSUInteger)accessibilityArrayAttributeCount:(NSString *)attribute;
</span><span class="cx"> - (void)_accessibilitySetTestValue:(id)value forAttribute:(NSString*)attributeName;
</span><ins>+- (void)_accessibilitySetValue:(id)value forAttribute:(NSString*)attributeName;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
</span><span class="lines">@@ -1404,6 +1405,33 @@
</span><span class="cx"> END_AX_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityUIElement::setSelectedChildAtIndex(unsigned index) const
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ AccessibilityUIElement element = const_cast<AccessibilityUIElement*>(this)->getChildAtIndex(index);
+ if (!element.platformUIElement())
+ return;
+ NSArray *selectedChildren = [m_element accessibilityAttributeValue:NSAccessibilitySelectedChildrenAttribute];
+ NSArray *array = [NSArray arrayWithObject:element.platformUIElement()];
+ if (selectedChildren)
+ array = [selectedChildren arrayByAddingObjectsFromArray:array];
+ [m_element _accessibilitySetValue:array forAttribute:NSAccessibilitySelectedChildrenAttribute];
+ END_AX_OBJC_EXCEPTIONS
+}
+
+void AccessibilityUIElement::removeSelectionAtIndex(unsigned index) const
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ AccessibilityUIElement element = const_cast<AccessibilityUIElement*>(this)->getChildAtIndex(index);
+ NSArray *selectedChildren = [m_element accessibilityAttributeValue:NSAccessibilitySelectedChildrenAttribute];
+ if (!element.platformUIElement() || !selectedChildren)
+ return;
+ NSMutableArray *array = [NSMutableArray arrayWithArray:selectedChildren];
+ [array removeObject:element.platformUIElement()];
+ [m_element _accessibilitySetValue:array forAttribute:NSAccessibilitySelectedChildrenAttribute];
+ END_AX_OBJC_EXCEPTIONS
+}
+
</ins><span class="cx"> JSStringRef AccessibilityUIElement::accessibilityValue() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -78,8 +78,6 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::wordAtOffset(int) { return 0; }
</span><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::lineAtOffset(int) { return 0; }
</span><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::sentenceAtOffset(int) { return 0; }
</span><del>-void AccessibilityUIElement::setSelectedChildAtIndex(unsigned) const { }
-void AccessibilityUIElement::removeSelectionAtIndex(unsigned) const { }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (!PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
</span><span class="lines">@@ -147,6 +145,8 @@
</span><span class="cx"> bool AccessibilityUIElement::isSelectable() const { return false; }
</span><span class="cx"> bool AccessibilityUIElement::isMultiSelectable() const { return false; }
</span><span class="cx"> void AccessibilityUIElement::setSelectedChild(AccessibilityUIElement*) const { }
</span><ins>+void AccessibilityUIElement::setSelectedChildAtIndex(unsigned) const { }
+void AccessibilityUIElement::removeSelectionAtIndex(unsigned) const { }
</ins><span class="cx"> unsigned AccessibilityUIElement::selectedChildrenCount() const { return 0; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedChildAtIndex(unsigned) const { return 0; }
</span><span class="cx"> bool AccessibilityUIElement::isExpanded() const { return false; }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -737,6 +737,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityUIElement::setSelectedChildAtIndex(unsigned index) const
+{
+}
+
+void AccessibilityUIElement::removeSelectionAtIndex(unsigned index) const
+{
+}
+
</ins><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::accessibilityValue() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (189043 => 189044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-27 19:10:29 UTC (rev 189043)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-27 19:21:29 UTC (rev 189044)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> - (NSUInteger)accessibilityIndexOfChild:(id)child;
</span><span class="cx"> - (NSUInteger)accessibilityArrayAttributeCount:(NSString *)attribute;
</span><span class="cx"> - (void)_accessibilitySetTestValue:(id)value forAttribute:(NSString*)attributeName;
</span><ins>+- (void)_accessibilitySetValue:(id)value forAttribute:(NSString*)attributeName;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="lines">@@ -1442,6 +1443,33 @@
</span><span class="cx"> END_AX_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityUIElement::setSelectedChildAtIndex(unsigned index) const
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ RefPtr<AccessibilityUIElement> element = const_cast<AccessibilityUIElement*>(this)->childAtIndex(index);
+ if (!element)
+ return;
+ NSArray *selectedChildren = [m_element accessibilityAttributeValue:NSAccessibilitySelectedChildrenAttribute];
+ NSArray *array = [NSArray arrayWithObject:element->platformUIElement()];
+ if (selectedChildren)
+ array = [selectedChildren arrayByAddingObjectsFromArray:array];
+ [m_element _accessibilitySetValue:array forAttribute:NSAccessibilitySelectedChildrenAttribute];
+ END_AX_OBJC_EXCEPTIONS
+}
+
+void AccessibilityUIElement::removeSelectionAtIndex(unsigned index) const
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ RefPtr<AccessibilityUIElement> element = const_cast<AccessibilityUIElement*>(this)->childAtIndex(index);
+ NSArray *selectedChildren = [m_element accessibilityAttributeValue:NSAccessibilitySelectedChildrenAttribute];
+ if (!element || !selectedChildren)
+ return;
+ NSMutableArray *array = [NSMutableArray arrayWithArray:selectedChildren];
+ [array removeObject:element->platformUIElement()];
+ [m_element _accessibilitySetValue:array forAttribute:NSAccessibilitySelectedChildrenAttribute];
+ END_AX_OBJC_EXCEPTIONS
+}
+
</ins><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::accessibilityValue() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span></span></pre>
</div>
</div>
</body>
</html>