<!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>[189614] tags/Safari-601.1.56.2</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/189614">189614</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-11 00:15:33 -0700 (Fri, 11 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/189483">r189483</a>. rdar://problem/22657165</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6011562LayoutTestsChangeLog">tags/Safari-601.1.56.2/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari6011562LayoutTestsplatformmacTestExpectations">tags/Safari-601.1.56.2/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#tagsSafari6011562SourceWebCoreChangeLog">tags/Safari-601.1.56.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari6011562SourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">tags/Safari-601.1.56.2/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari6011562LayoutTestsaccessibilitymacfocusmovescursorexpectedtxt">tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor-expected.txt</a></li>
<li><a href="#tagsSafari6011562LayoutTestsaccessibilitymacfocusmovescursorhtml">tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6011562LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.56.2/LayoutTests/ChangeLog (189613 => 189614)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.56.2/LayoutTests/ChangeLog 2015-09-11 07:12:16 UTC (rev 189613)
+++ tags/Safari-601.1.56.2/LayoutTests/ChangeLog 2015-09-11 07:15:33 UTC (rev 189614)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189483.
+
+ 2015-09-07 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Mavericks: Text cursor does not move along with VoiceOver cursor for text fields
+ https://bugs.webkit.org/show_bug.cgi?id=148891
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/mac/focus-moves-cursor-expected.txt: Added.
+ * accessibility/mac/focus-moves-cursor.html: Added.
+
</ins><span class="cx"> 2015-08-26 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188988.
</span></span></pre></div>
<a id="tagsSafari6011562LayoutTestsaccessibilitymacfocusmovescursorexpectedtxtfromrev189483trunkLayoutTestsaccessibilitymacfocusmovescursorexpectedtxt"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor-expected.txt (from rev 189483, trunk/LayoutTests/accessibility/mac/focus-moves-cursor-expected.txt) (0 => 189614)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor-expected.txt (rev 0)
+++ tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor-expected.txt 2015-09-11 07:15:33 UTC (rev 189614)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+
+This tests that when setting focus, the cursor moves.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS textfield.stringValue is 'AXValue: '
+PASS textfield.stringValue is 'AXValue: '
+PASS textfield.isFocused is true
+PASS document.activeElement is document.getElementById('textfield')
+PASS textfield.stringValue is 'AXValue: a'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="tagsSafari6011562LayoutTestsaccessibilitymacfocusmovescursorhtmlfromrev189483trunkLayoutTestsaccessibilitymacfocusmovescursorhtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor.html (from rev 189483, trunk/LayoutTests/accessibility/mac/focus-moves-cursor.html) (0 => 189614)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor.html (rev 0)
+++ tags/Safari-601.1.56.2/LayoutTests/accessibility/mac/focus-moves-cursor.html 2015-09-11 07:15:33 UTC (rev 189614)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<input id="textfield" onfocus="setTimeout('sendTestEvents()', 0);">
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that when setting focus, the cursor moves.");
+
+ var windowEventSender = window.eventSender;
+ if (window.accessibilityController && window.eventSender) {
+ window.jsTestIsAsync = true;
+ var textfield = accessibilityController.accessibleElementById("textfield");
+ shouldBe("textfield.stringValue", "'AXValue: '");
+ eventSender.keyDown("a");
+ shouldBe("textfield.stringValue", "'AXValue: '");
+
+ textfield.takeFocus();
+ }
+
+ function sendTestEvents() {
+ var textfield = accessibilityController.accessibleElementById("textfield");
+ shouldBeTrue("textfield.isFocused");
+ shouldBe("document.activeElement", "document.getElementById('textfield')");
+
+ eventSender.keyDown("a");
+ shouldBe("textfield.stringValue", "'AXValue: a'");
+ finishJSTest();
+ }
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="tagsSafari6011562LayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.56.2/LayoutTests/platform/mac/TestExpectations (189613 => 189614)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.56.2/LayoutTests/platform/mac/TestExpectations 2015-09-11 07:12:16 UTC (rev 189613)
+++ tags/Safari-601.1.56.2/LayoutTests/platform/mac/TestExpectations 2015-09-11 07:15:33 UTC (rev 189614)
</span><span class="lines">@@ -1259,6 +1259,10 @@
</span><span class="cx"> # Mavericks and prior do not support APNG.
</span><span class="cx"> webkit.org/b/17022 [ MountainLion Mavericks ] fast/images/animated-png.html [ Skip ]
</span><span class="cx">
</span><ins>+# Pre-Capitan does not support asynchronous attribute setting.
+[ Mavericks Yosemite ] accessibility/mac/setting-attributes-is-asynchronous.html [ Skip ]
+[ Mavericks Yosemite ] accessibility/mac/focus-setting-selection-syncronizing-not-clearing.html [ Skip ]
+
</ins><span class="cx"> # OS X 10.10.3+ has the necessary glyphs.
</span><span class="cx"> webkit.org/b/142548 [ Yosemite+ ] editing/selection/extend-by-character-007.html [ Pass ]
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011562SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.56.2/Source/WebCore/ChangeLog (189613 => 189614)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.56.2/Source/WebCore/ChangeLog 2015-09-11 07:12:16 UTC (rev 189613)
+++ tags/Safari-601.1.56.2/Source/WebCore/ChangeLog 2015-09-11 07:15:33 UTC (rev 189614)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-09-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189483.
+
+ 2015-09-07 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Mavericks: Text cursor does not move along with VoiceOver cursor for text fields
+ https://bugs.webkit.org/show_bug.cgi?id=148891
+
+ Reviewed by Mario Sanchez Prada.
+
+ Undo the asynchronous dispatch of accessibility setting values on pre El Capitan machines
+ because it causes focus to not sync correctly.
+
+ Test: accessibility/mac/focus-moves-cursor.html
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilitySetValue:forAttribute:]):
+ (-[WebAccessibilityObjectWrapper _accessibilitySetValue:forAttribute:]):
+
</ins><span class="cx"> 2015-09-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r189101.
</span></span></pre></div>
<a id="tagsSafari6011562SourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.56.2/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (189613 => 189614)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.56.2/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-09-11 07:12:16 UTC (rev 189613)
+++ tags/Safari-601.1.56.2/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-09-11 07:15:33 UTC (rev 189614)
</span><span class="lines">@@ -3343,11 +3343,16 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attributeName
</span><span class="cx"> {
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</ins><span class="cx"> // In case anything we do by changing values causes an alert or other modal
</span><span class="cx"> // behaviors, we need to return now, so that VoiceOver doesn't hang indefinitely.
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [self _accessibilitySetValue:value forAttribute:attributeName];
</span><span class="cx"> });
</span><ins>+#else
+ // dispatch_async on earlier versions can cause focus not to track.
+ [self _accessibilitySetValue:value forAttribute:attributeName];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_accessibilitySetValue:(id)value forAttribute:(NSString*)attributeName
</span></span></pre>
</div>
</div>
</body>
</html>