<!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>[178829] branches/safari-600.1.4.15-branch</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/178829">178829</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 10:20:32 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176318">r176318</a>. rdar://problem/19339000</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#branchessafari6001415branchToolsChangeLog">branches/safari-600.1.4.15-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchToolsDumpRenderTreeAccessibilityUIElementcpp">branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.cpp</a></li>
<li><a href="#branchessafari6001415branchToolsDumpRenderTreeAccessibilityUIElementh">branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.h</a></li>
<li><a href="#branchessafari6001415branchToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#branchessafari6001415branchToolsDumpRenderTreemacAccessibilityUIElementMacmm">branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176318.
+
+ 2014-11-19 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Screen braille input doesn't work on forms.
+ https://bugs.webkit.org/show_bug.cgi?id=138804
+
+ Reviewed by Mario Sanchez Prada.
+
+ Allow iOS to set values of text fields through the API.
+
+ Test: platform/ios-sim/accessibility/set-value.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _accessibilitySetValue:]):
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r176285.
</span><span class="cx">
</span><span class="cx"> 2014-11-18 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -1625,6 +1625,13 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_accessibilitySetValue:(NSString *)string
+{
+ if (![self _prepareAccessibilityCall])
+ return;
+ m_object->setValue(string);
+}
+
</ins><span class="cx"> - (NSString *)stringForTextMarkers:(NSArray *)markers
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span></span></pre></div>
<a id="branchessafari6001415branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Tools/ChangeLog (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Tools/ChangeLog 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Tools/ChangeLog 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r176318.
+
+ 2014-11-19 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Screen braille input doesn't work on forms.
+ https://bugs.webkit.org/show_bug.cgi?id=138804
+
+ Reviewed by Mario Sanchez Prada.
+
+ Add a method to setValue through the AX API in DRT.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (setValueCallback):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::setValue):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::setValue):
+
</ins><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r174376.
</span></span></pre></div>
<a id="branchessafari6001415branchToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.cpp (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -436,6 +436,19 @@
</span><span class="cx"> return JSValueMakeBoolean(context, toAXElement(thisObject)->isEqual(toAXElement(otherElement)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef setValueCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ JSRetainPtr<JSStringRef> valueText = 0;
+ if (argumentCount == 1) {
+ if (JSValueIsString(context, arguments[0]))
+ valueText.adopt(JSValueToStringCopy(context, arguments[0], exception));
+ }
+
+ toAXElement(thisObject)->setValue(valueText.get());
+
+ return JSValueMakeUndefined(context);
+}
+
</ins><span class="cx"> static JSValueRef setSelectedChildCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> JSObjectRef element = 0;
</span><span class="lines">@@ -1335,6 +1348,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> JSStringRef AccessibilityUIElement::pathDescription() const { return 0; }
</span><ins>+void AccessibilityUIElement::setValue(JSStringRef);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="lines">@@ -1626,6 +1640,7 @@
</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>+ { "setValue", setValueCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { "selectedChildAtIndex", selectedChildAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "scrollToMakeVisible", scrollToMakeVisibleCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span></span></pre></div>
<a id="branchessafari6001415branchToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.h (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.h 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/AccessibilityUIElement.h 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> JSStringRef language();
</span><span class="cx"> JSStringRef stringValue();
</span><span class="cx"> JSStringRef accessibilityValue() const;
</span><ins>+ void setValue(JSStringRef);
</ins><span class="cx"> JSStringRef helpText() const;
</span><span class="cx"> JSStringRef orientation() const;
</span><span class="cx"> double x();
</span></span></pre></div>
<a id="branchessafari6001415branchToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> - (void)accessibilitySetPostedNotificationCallback:(AXPostedNotificationCallback)function withContext:(void*)context;
</span><span class="cx"> - (CGFloat)_accessibilityMinValue;
</span><span class="cx"> - (CGFloat)_accessibilityMaxValue;
</span><ins>+- (void)_accessibilitySetValue:(NSString *)value;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -526,6 +527,11 @@
</span><span class="cx"> return [m_element _accessibilityMaxValue];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityUIElement::setValue(JSStringRef valueText)
+{
+ [m_element _accessibilitySetValue:[NSString stringWithJSStringRef:valueText]];
+}
+
</ins><span class="cx"> JSStringRef AccessibilityUIElement::valueDescription()
</span><span class="cx"> {
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span></span></pre></div>
<a id="branchessafari6001415branchToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (178828 => 178829)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-01-21 18:06:43 UTC (rev 178828)
+++ branches/safari-600.1.4.15-branch/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-01-21 18:20:32 UTC (rev 178829)
</span><span class="lines">@@ -1343,6 +1343,13 @@
</span><span class="cx"> END_AX_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityUIElement::setValue(JSStringRef valueText)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ [m_element accessibilitySetValue:[NSString stringWithJSStringRef:valueText] forAttribute:NSAccessibilityValueAttribute];
+ END_AX_OBJC_EXCEPTIONS
+}
+
</ins><span class="cx"> void AccessibilityUIElement::increment()
</span><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span></span></pre>
</div>
</div>
</body>
</html>