<!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>[192456] 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/192456">192456</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2015-11-14 01:39:28 -0800 (Sat, 14 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: add a new trait for elements in fieldset on iOS
https://bugs.webkit.org/show_bug.cgi?id=151281
Reviewed by Chris Fleizach.
Source/WebCore:
Added a new trait for elements in the fieldset, so VoiceOver can speak the legend
information for those elements.
Test: accessibility/ios-simulator/fieldset-traits.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
(-[WebAccessibilityObjectWrapper _accessibilityTableAncestor]):
(-[WebAccessibilityObjectWrapper _accessibilityFieldsetAncestor]):
(-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
Tools:
* DumpRenderTree/AccessibilityUIElement.cpp:
(assistiveTechnologySimulatedFocusCallback):
(fieldsetAncestorElementCallback):
(childAtIndexCallback):
(getElementTextLengthCallback):
(hasContainedByFieldsetTraitCallback):
(AccessibilityUIElement::getJSClass):
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::elementTextLength):
(AccessibilityUIElement::hasContainedByFieldsetTrait):
(AccessibilityUIElement::fieldsetAncestorElement):
(AccessibilityUIElement::url):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::scrollPageDown):
(WTR::AccessibilityUIElement::scrollPageLeft):
(WTR::AccessibilityUIElement::scrollPageRight):
(WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
(WTR::AccessibilityUIElement::fieldsetAncestorElement):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::identifier):
(WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
(WTR::AccessibilityUIElement::fieldsetAncestorElement):
(WTR::AccessibilityUIElement::rowCount):
LayoutTests:
* accessibility/ios-simulator/fieldset-traits-expected.txt: Added.
* accessibility/ios-simulator/fieldset-traits.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="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</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="#trunkToolsDumpRenderTreeAccessibilityUIElementh">trunk/Tools/DumpRenderTree/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorfieldsettraitsexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorfieldsettraitshtml">trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/LayoutTests/ChangeLog 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-14 Nan Wang <n_wang@apple.com>
+
+ AX: add a new trait for elements in fieldset on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=151281
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/ios-simulator/fieldset-traits-expected.txt: Added.
+ * accessibility/ios-simulator/fieldset-traits.html: Added.
+
</ins><span class="cx"> 2015-11-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Always render at least a device pixel line when border/outline width > 0.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorfieldsettraitsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits-expected.txt (0 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits-expected.txt 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Personalia:
+Name:
+Email:
+This tests that elements in a fieldset are having the correct traits.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS inputname.hasContainedByFieldsetTrait is true
+PASS fieldset.isEqual(inputname.fieldsetAncestorElement()) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorfieldsettraitshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits.html (0 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/fieldset-traits.html 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<form>
+<fieldset id="fieldset">
+<legend>Personalia:</legend>
+Name: <input type="text" id="inputname"><br>
+Email: <input type="text"><br>
+</fieldset>
+</form>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that elements in a fieldset are having the correct traits.");
+
+ if (window.accessibilityController) {
+
+ var inputname = accessibilityController.accessibleElementById("inputname");
+ var fieldset = accessibilityController.accessibleElementById("fieldset");
+ shouldBeTrue("inputname.hasContainedByFieldsetTrait");
+ shouldBeTrue("fieldset.isEqual(inputname.fieldsetAncestorElement())");
+ }
+
+ successfullyParsed = true;
+</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 (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Source/WebCore/ChangeLog 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-14 Nan Wang <n_wang@apple.com>
+
+ AX: add a new trait for elements in fieldset on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=151281
+
+ Reviewed by Chris Fleizach.
+
+ Added a new trait for elements in the fieldset, so VoiceOver can speak the legend
+ information for those elements.
+
+ Test: accessibility/ios-simulator/fieldset-traits.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+ (-[WebAccessibilityObjectWrapper _accessibilityTableAncestor]):
+ (-[WebAccessibilityObjectWrapper _accessibilityFieldsetAncestor]):
+ (-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
+
</ins><span class="cx"> 2015-11-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r192445, r192451, and r192452.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> - (uint64_t)_axSelectedTrait { return (1 << 19); }
</span><span class="cx"> - (uint64_t)_axNotEnabledTrait { return (1 << 20); }
</span><span class="cx"> - (uint64_t)_axRadioButtonTrait { return (1 << 21); }
</span><ins>+- (uint64_t)_axContainedByFieldsetTrait { return (1 << 22); }
</ins><span class="cx">
</span><span class="cx"> - (BOOL)accessibilityCanFuzzyHitTest
</span><span class="cx"> {
</span><span class="lines">@@ -494,6 +495,16 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (AccessibilityObjectWrapper*)_accessibilityFieldsetAncestor
+{
+ for (AccessibilityObject* parent = m_object->parentObject(); parent != nil; parent = parent->parentObject()) {
+ if (parent->isFieldset())
+ return parent->wrapper();
+ }
+
+ return nil;
+}
+
</ins><span class="cx"> - (uint64_t)_accessibilityTraitsFromAncestors
</span><span class="cx"> {
</span><span class="cx"> uint64_t traits = 0;
</span><span class="lines">@@ -538,6 +549,10 @@
</span><span class="cx"> traits |= [self _axContainedByLandmarkTrait];
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ // If this object has fieldset parent, we should add containedByFieldsetTrait to it.
+ if (parent->isFieldset())
+ traits |= [self _axContainedByFieldsetTrait];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return traits;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/ChangeLog 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-11-14 Nan Wang <n_wang@apple.com>
+
+ AX: add a new trait for elements in fieldset on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=151281
+
+ Reviewed by Chris Fleizach.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (assistiveTechnologySimulatedFocusCallback):
+ (fieldsetAncestorElementCallback):
+ (childAtIndexCallback):
+ (getElementTextLengthCallback):
+ (hasContainedByFieldsetTraitCallback):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::elementTextLength):
+ (AccessibilityUIElement::hasContainedByFieldsetTrait):
+ (AccessibilityUIElement::fieldsetAncestorElement):
+ (AccessibilityUIElement::url):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::scrollPageDown):
+ (WTR::AccessibilityUIElement::scrollPageLeft):
+ (WTR::AccessibilityUIElement::scrollPageRight):
+ (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
+ (WTR::AccessibilityUIElement::fieldsetAncestorElement):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::identifier):
+ (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
+ (WTR::AccessibilityUIElement::fieldsetAncestorElement):
+ (WTR::AccessibilityUIElement::rowCount):
+
</ins><span class="cx"> 2015-11-13 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, change JavaScriptCore watchlist to exclude inspector things.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -364,6 +364,11 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef fieldsetAncestorElementCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ return AccessibilityUIElement::makeJSAccessibilityUIElement(context, toAXElement(thisObject)->fieldsetAncestorElement());
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static JSValueRef childAtIndexCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="lines">@@ -1373,8 +1378,11 @@
</span><span class="cx"> return JSValueMakeNumber(context, toAXElement(thisObject)->elementTextLength());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef hasContainedByFieldsetTraitCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ return JSValueMakeBoolean(context, toAXElement(thisObject)->hasContainedByFieldsetTrait());
+}
</ins><span class="cx">
</span><del>-
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="lines">@@ -1631,6 +1639,7 @@
</span><span class="cx"> { "elementTextPosition", getElementTextPositionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "elementTextLength", getElementTextLengthCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "stringForSelection", stringForSelectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "hasContainedByFieldsetTrait", hasContainedByFieldsetTraitCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> { "supportedActions", supportedActionsCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="lines">@@ -1748,6 +1757,7 @@
</span><span class="cx"> { "scrollPageLeft", scrollPageLeftCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "scrollPageRight", scrollPageRightCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "assistiveTechnologySimulatedFocus", assistiveTechnologySimulatedFocusCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "fieldsetAncestorElement", fieldsetAncestorElementCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> #endif
</span><span class="cx"> { 0, 0, 0 }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -226,6 +226,9 @@
</span><span class="cx"> bool scrollPageDown();
</span><span class="cx"> bool scrollPageLeft();
</span><span class="cx"> bool scrollPageRight();
</span><ins>+
+ bool hasContainedByFieldsetTrait();
+ AccessibilityUIElement fieldsetAncestorElement();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -90,6 +90,8 @@
</span><span class="cx"> - (NSUInteger)accessibilityARIAColumnCount;
</span><span class="cx"> - (NSUInteger)accessibilityARIARowIndex;
</span><span class="cx"> - (NSUInteger)accessibilityARIAColumnIndex;
</span><ins>+- (UIAccessibilityTraits)_axContainedByFieldsetTrait;
+- (id)_accessibilityFieldsetAncestor;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -134,6 +136,22 @@
</span><span class="cx"> return range.length;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityUIElement::hasContainedByFieldsetTrait()
+{
+ UIAccessibilityTraits traits = [m_element accessibilityTraits];
+ return (traits & [m_element _axContainedByFieldsetTrait]) == [m_element _axContainedByFieldsetTrait];
+}
+
+AccessibilityUIElement AccessibilityUIElement::fieldsetAncestorElement()
+{
+ id ancestorElement = [m_element _accessibilityFieldsetAncestor];
+ if (ancestorElement)
+ return AccessibilityUIElement(ancestorElement);
+
+ return nullptr;
+}
+
+
</ins><span class="cx"> JSStringRef AccessibilityUIElement::url()
</span><span class="cx"> {
</span><span class="cx"> NSURL *url = [m_element accessibilityURL];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -70,6 +70,8 @@
</span><span class="cx"> bool AccessibilityUIElement::scrollPageDown() { return false; }
</span><span class="cx"> bool AccessibilityUIElement::scrollPageLeft() { return false; }
</span><span class="cx"> bool AccessibilityUIElement::scrollPageRight() { return false; }
</span><ins>+bool AccessibilityUIElement::hasContainedByFieldsetTrait() { return false; }
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::fieldsetAncestorElement() { return nullptr; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -282,6 +282,10 @@
</span><span class="cx"> bool scrollPageLeft();
</span><span class="cx"> bool scrollPageRight();
</span><span class="cx">
</span><ins>+ // Fieldset
+ bool hasContainedByFieldsetTrait();
+ PassRefPtr<AccessibilityUIElement> fieldsetAncestorElement();
+
</ins><span class="cx"> private:
</span><span class="cx"> AccessibilityUIElement(PlatformUIElement);
</span><span class="cx"> AccessibilityUIElement(const AccessibilityUIElement&);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -223,6 +223,10 @@
</span><span class="cx"> // This will simulate the accessibilityDidBecomeFocused API in UIKit.
</span><span class="cx"> void assistiveTechnologySimulatedFocus();
</span><span class="cx">
</span><ins>+ // Fieldset
+ readonly attribute boolean hasContainedByFieldsetTrait;
+ AccessibilityUIElement fieldsetAncestorElement();
+
</ins><span class="cx"> // Notification support.
</span><span class="cx"> boolean addNotificationListener(object callbackFunction);
</span><span class="cx"> boolean removeNotificationListener();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (192455 => 192456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-11-14 05:51:27 UTC (rev 192455)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-11-14 09:39:28 UTC (rev 192456)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> - (NSUInteger)accessibilityARIAColumnCount;
</span><span class="cx"> - (NSUInteger)accessibilityARIARowIndex;
</span><span class="cx"> - (NSUInteger)accessibilityARIAColumnIndex;
</span><ins>+- (UIAccessibilityTraits)_axContainedByFieldsetTrait;
+- (id)_accessibilityFieldsetAncestor;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -672,6 +674,21 @@
</span><span class="cx"> return concatenateAttributeAndValue(@"AXIdentifier", [m_element accessibilityIdentifier]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityUIElement::hasContainedByFieldsetTrait()
+{
+ UIAccessibilityTraits traits = [m_element accessibilityTraits];
+ return (traits & [m_element _axContainedByFieldsetTrait]) == [m_element _axContainedByFieldsetTrait];
+}
+
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::fieldsetAncestorElement()
+{
+ id ancestorElement = [m_element _accessibilityFieldsetAncestor];
+ if (ancestorElement)
+ return AccessibilityUIElement::create(ancestorElement);
+
+ return nullptr;
+}
+
</ins><span class="cx"> int AccessibilityUIElement::rowCount()
</span><span class="cx"> {
</span><span class="cx"> return [m_element accessibilityRowCount];
</span></span></pre>
</div>
</div>
</body>
</html>