<!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>[194054] 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/194054">194054</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 13:12:22 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: iOS: Text field variations do not have the correct traits
https://bugs.webkit.org/show_bug.cgi?id=152237
Reviewed by Mario Sanchez Prada.
Source/WebCore:
Make search fields and text areas use the appropriate iOS traits to
distinguish them.
Test: accessibility/ios-simulator/textentry-traits.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
(-[WebAccessibilityObjectWrapper _accessibilityTextEntryTraits]):
(-[WebAccessibilityObjectWrapper accessibilityTraits]):
Tools:
Add iOS calls for determing if an object is a search field or a text area.
* DumpRenderTree/AccessibilityUIElement.cpp:
(getIsSearchFieldCallback):
(getIsTextAreaCallback):
(stringForSelectionCallback):
(AccessibilityUIElement::getJSClass):
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::identifier):
(AccessibilityUIElement::isTextArea):
(AccessibilityUIElement::isSearchField):
(AccessibilityUIElement::traits):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::scrollPageRight):
(WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
(WTR::AccessibilityUIElement::fieldsetAncestorElement):
(WTR::AccessibilityUIElement::isSearchField):
(WTR::AccessibilityUIElement::isTextArea):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::fieldsetAncestorElement):
(WTR::AccessibilityUIElement::isTextArea):
(WTR::AccessibilityUIElement::isSearchField):
(WTR::AccessibilityUIElement::rowCount):
LayoutTests:
* accessibility/ios-simulator/textentry-traits-expected.txt: Added.
* accessibility/ios-simulator/textentry-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="#trunkLayoutTestsaccessibilityiossimulatortextentrytraitsexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/textentry-traits-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortextentrytraitshtml">trunk/LayoutTests/accessibility/ios-simulator/textentry-traits.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/LayoutTests/ChangeLog 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-14 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: Text field variations do not have the correct traits
+ https://bugs.webkit.org/show_bug.cgi?id=152237
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/ios-simulator/textentry-traits-expected.txt: Added.
+ * accessibility/ios-simulator/textentry-traits.html: Added.
+
</ins><span class="cx"> 2015-12-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking fast/viewport/ios/width-is-device-width-overflowing* tests as failing on iOS simulator
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortextentrytraitsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/textentry-traits-expected.txt (0 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/textentry-traits-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/textentry-traits-expected.txt 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This tests that input type: time is accessible on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS accessibilityController.accessibleElementById('text1').isSearchField || accessibilityController.accessibleElementById('text1').isTextArea is false
+PASS accessibilityController.accessibleElementById('text2').isSearchField is true
+PASS accessibilityController.accessibleElementById('text3').isTextArea is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortextentrytraitshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/textentry-traits.html (0 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/textentry-traits.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/textentry-traits.html 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -0,0 +1,37 @@
</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">
+
+<input type="text" id="text1">
+<input type="search" id="text2">
+<textarea id="text3"></textarea>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that input type: time is accessible on iOS.");
+
+ if (window.accessibilityController) {
+
+ // Regular text input should not be a search field or text area.
+ shouldBeFalse("accessibilityController.accessibleElementById('text1').isSearchField || accessibilityController.accessibleElementById('text1').isTextArea");
+
+ shouldBeTrue("accessibilityController.accessibleElementById('text2').isSearchField");
+ shouldBeTrue("accessibilityController.accessibleElementById('text3').isTextArea");
+ }
+
+ 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 (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Source/WebCore/ChangeLog 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-14 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: Text field variations do not have the correct traits
+ https://bugs.webkit.org/show_bug.cgi?id=152237
+
+ Reviewed by Mario Sanchez Prada.
+
+ Make search fields and text areas use the appropriate iOS traits to
+ distinguish them.
+
+ Test: accessibility/ios-simulator/textentry-traits.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
+ (-[WebAccessibilityObjectWrapper _accessibilityTextEntryTraits]):
+ (-[WebAccessibilityObjectWrapper accessibilityTraits]):
+
</ins><span class="cx"> 2015-12-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some Mavericks guards in ServicesOverlayController
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -272,6 +272,8 @@
</span><span class="cx"> - (uint64_t)_axNotEnabledTrait { return (1 << 20); }
</span><span class="cx"> - (uint64_t)_axRadioButtonTrait { return (1 << 21); }
</span><span class="cx"> - (uint64_t)_axContainedByFieldsetTrait { return (1 << 22); }
</span><ins>+- (uint64_t)_axSearchFieldTrait { return (1 << 23); }
+- (uint64_t)_axTextAreaTrait { return (1 << 24); }
</ins><span class="cx">
</span><span class="cx"> - (BOOL)accessibilityCanFuzzyHitTest
</span><span class="cx"> {
</span><span class="lines">@@ -558,6 +560,20 @@
</span><span class="cx"> return traits;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (uint64_t)_accessibilityTextEntryTraits
+{
+ uint64_t traits = [self _axTextEntryTrait];
+ if (m_object->isFocused())
+ traits |= ([self _axHasTextCursorTrait] | [self _axTextOperationsAvailableTrait]);
+ if (m_object->isPasswordField())
+ traits |= [self _axSecureTextFieldTrait];
+ if (m_object->roleValue() == SearchFieldRole)
+ traits |= [self _axSearchFieldTrait];
+ if (m_object->roleValue() == TextAreaRole)
+ traits |= [self _axTextAreaTrait];
+ return traits;
+}
+
</ins><span class="cx"> - (uint64_t)accessibilityTraits
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span><span class="lines">@@ -572,16 +588,10 @@
</span><span class="cx"> if (m_object->isVisited())
</span><span class="cx"> traits |= [self _axVisitedTrait];
</span><span class="cx"> break;
</span><del>- // TextFieldRole is intended to fall through to TextAreaRole, in order to pick up the text entry and text cursor traits.
</del><span class="cx"> case TextFieldRole:
</span><del>- if (m_object->isPasswordField())
- traits |= [self _axSecureTextFieldTrait];
- FALLTHROUGH;
</del><span class="cx"> case SearchFieldRole:
</span><span class="cx"> case TextAreaRole:
</span><del>- traits |= [self _axTextEntryTrait];
- if (m_object->isFocused())
- traits |= ([self _axHasTextCursorTrait] | [self _axTextOperationsAvailableTrait]);
</del><ins>+ traits |= [self _accessibilityTextEntryTraits];
</ins><span class="cx"> break;
</span><span class="cx"> case ImageRole:
</span><span class="cx"> traits |= [self _axImageTrait];
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/ChangeLog 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-12-14 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: Text field variations do not have the correct traits
+ https://bugs.webkit.org/show_bug.cgi?id=152237
+
+ Reviewed by Mario Sanchez Prada.
+
+ Add iOS calls for determing if an object is a search field or a text area.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (getIsSearchFieldCallback):
+ (getIsTextAreaCallback):
+ (stringForSelectionCallback):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::identifier):
+ (AccessibilityUIElement::isTextArea):
+ (AccessibilityUIElement::isSearchField):
+ (AccessibilityUIElement::traits):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::scrollPageRight):
+ (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
+ (WTR::AccessibilityUIElement::fieldsetAncestorElement):
+ (WTR::AccessibilityUIElement::isSearchField):
+ (WTR::AccessibilityUIElement::isTextArea):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::fieldsetAncestorElement):
+ (WTR::AccessibilityUIElement::isTextArea):
+ (WTR::AccessibilityUIElement::isSearchField):
+ (WTR::AccessibilityUIElement::rowCount):
+
</ins><span class="cx"> 2015-12-14 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [JHBuild] package libtool-bin is now required on Debian systems.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -1349,6 +1349,16 @@
</span><span class="cx">
</span><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx">
</span><ins>+static JSValueRef getIsSearchFieldCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ return JSValueMakeBoolean(context, toAXElement(thisObject)->isSearchField());
+}
+
+static JSValueRef getIsTextAreaCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ return JSValueMakeBoolean(context, toAXElement(thisObject)->isTextArea());
+}
+
</ins><span class="cx"> static JSValueRef stringForSelectionCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> JSRetainPtr<JSStringRef> labelString(Adopt, toAXElement(thisObject)->stringForSelection());
</span><span class="lines">@@ -1640,6 +1650,8 @@
</span><span class="cx"> { "elementTextLength", getElementTextLengthCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "stringForSelection", stringForSelectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "hasContainedByFieldsetTrait", hasContainedByFieldsetTraitCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "isSearchField", getIsSearchFieldCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "isTextArea", getIsTextAreaCallback, 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></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -289,6 +289,10 @@
</span><span class="cx"> AccessibilityUIElement headerElementAtIndex(unsigned);
</span><span class="cx"> // This will simulate the accessibilityDidBecomeFocused API in UIKit.
</span><span class="cx"> void assistiveTechnologySimulatedFocus();
</span><ins>+
+ bool isTextArea() const;
+ bool isSearchField() const;
+
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -83,6 +83,8 @@
</span><span class="cx"> - (void)_accessibilitySetValue:(NSString *)value;
</span><span class="cx"> - (void)_accessibilityActivate;
</span><span class="cx"> - (UIAccessibilityTraits)_axSelectedTrait;
</span><ins>+- (UIAccessibilityTraits)_axTextAreaTrait;
+- (UIAccessibilityTraits)_axSearchFieldTrait;
</ins><span class="cx"> - (NSString *)accessibilityARIACurrentStatus;
</span><span class="cx"> - (NSUInteger)accessibilityRowCount;
</span><span class="cx"> - (NSUInteger)accessibilityColumnCount;
</span><span class="lines">@@ -119,6 +121,16 @@
</span><span class="cx"> return concatenateAttributeAndValue(@"AXIdentifier", [m_element accessibilityIdentifier]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityUIElement::isTextArea() const
+{
+ return ([m_element accessibilityTraits] & [m_element _axTextAreaTrait]) == [m_element _axTextAreaTrait];
+}
+
+bool AccessibilityUIElement::isSearchField() const
+{
+ return ([m_element accessibilityTraits] & [m_element _axSearchFieldTrait]) == [m_element _axSearchFieldTrait];
+}
+
</ins><span class="cx"> JSStringRef AccessibilityUIElement::traits()
</span><span class="cx"> {
</span><span class="cx"> return concatenateAttributeAndValue(@"AXTraits", [NSString stringWithFormat:@"%qu", [m_element accessibilityTraits]]);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -72,6 +72,9 @@
</span><span class="cx"> bool AccessibilityUIElement::scrollPageRight() { return false; }
</span><span class="cx"> bool AccessibilityUIElement::hasContainedByFieldsetTrait() { return false; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::fieldsetAncestorElement() { return nullptr; }
</span><ins>+bool AccessibilityUIElement::isSearchField() const { return false; }
+bool AccessibilityUIElement::isTextArea() const { return false; }
+
</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 (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -276,6 +276,8 @@
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> linkedElement();
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> headerElementAtIndex(unsigned index);
</span><span class="cx"> void assistiveTechnologySimulatedFocus();
</span><ins>+ bool isSearchField() const;
+ bool isTextArea() const;
</ins><span class="cx">
</span><span class="cx"> bool scrollPageUp();
</span><span class="cx"> bool scrollPageDown();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -222,6 +222,8 @@
</span><span class="cx"> AccessibilityUIElement headerElementAtIndex(unsigned long index);
</span><span class="cx"> // This will simulate the accessibilityDidBecomeFocused API in UIKit.
</span><span class="cx"> void assistiveTechnologySimulatedFocus();
</span><ins>+ readonly attribute boolean isSearchField;
+ readonly attribute boolean isTextArea;
</ins><span class="cx">
</span><span class="cx"> // Fieldset
</span><span class="cx"> readonly attribute boolean hasContainedByFieldsetTrait;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (194053 => 194054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-12-14 21:03:29 UTC (rev 194053)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-12-14 21:12:22 UTC (rev 194054)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> - (void)_accessibilitySetValue:(NSString *)value;
</span><span class="cx"> - (void)_accessibilityActivate;
</span><span class="cx"> - (UIAccessibilityTraits)_axSelectedTrait;
</span><ins>+- (UIAccessibilityTraits)_axTextAreaTrait;
+- (UIAccessibilityTraits)_axSearchFieldTrait;
</ins><span class="cx"> - (NSString *)accessibilityARIACurrentStatus;
</span><span class="cx"> - (NSUInteger)accessibilityRowCount;
</span><span class="cx"> - (NSUInteger)accessibilityColumnCount;
</span><span class="lines">@@ -689,6 +691,16 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityUIElement::isTextArea() const
+{
+ return ([m_element accessibilityTraits] & [m_element _axTextAreaTrait]) == [m_element _axTextAreaTrait];
+}
+
+bool AccessibilityUIElement::isSearchField() const
+{
+ return ([m_element accessibilityTraits] & [m_element _axSearchFieldTrait]) == [m_element _axSearchFieldTrait];
+}
+
</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>