<!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>[189649] branches/safari-601-branch/LayoutTests</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/189649">189649</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-09-11 23:02:18 -0700 (Fri, 11 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189221">r189221</a>.
2015-09-01 Alexey Proskuryakov <ap@apple.com>
Clean up asynchronous behavior in some accessibility tests
https://bugs.webkit.org/show_bug.cgi?id=148682
Reviewed by Darin Adler.
* platform/mac/accessibility/removing-textarea-after-edit-crash-expected.txt:
* platform/mac/accessibility/removing-textarea-after-edit-crash.html:
* platform/mac/accessibility/select-element-selection-with-optgroups.html:
* platform/mac/accessibility/selected-rows-table.html:
* platform/mac/accessibility/selection-notification-focus-change.html:
* platform/mac/accessibility/selection-sync-expected.txt:
* platform/mac/accessibility/selection-sync.html:
* platform/mac/accessibility/setting-attributes-is-asynchronous.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilityremovingtextareaaftereditcrashexpectedtxt">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilityremovingtextareaaftereditcrashhtml">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilityselectelementselectionwithoptgroupshtml">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/select-element-selection-with-optgroups.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilityselectedrowstablehtml">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selected-rows-table.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilityselectionnotificationfocuschangehtml">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilityselectionsynchtml">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-sync.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacaccessibilitysettingattributesisasynchronoushtml">branches/safari-601-branch/LayoutTests/platform/mac/accessibility/setting-attributes-is-asynchronous.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-09-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189221.
+
+ 2015-09-01 Alexey Proskuryakov <ap@apple.com>
+
+ Clean up asynchronous behavior in some accessibility tests
+ https://bugs.webkit.org/show_bug.cgi?id=148682
+
+ Reviewed by Darin Adler.
+
+ * platform/mac/accessibility/removing-textarea-after-edit-crash-expected.txt:
+ * platform/mac/accessibility/removing-textarea-after-edit-crash.html:
+ * platform/mac/accessibility/select-element-selection-with-optgroups.html:
+ * platform/mac/accessibility/selected-rows-table.html:
+ * platform/mac/accessibility/selection-notification-focus-change.html:
+ * platform/mac/accessibility/selection-sync-expected.txt:
+ * platform/mac/accessibility/selection-sync.html:
+ * platform/mac/accessibility/setting-attributes-is-asynchronous.html:
+
+2015-09-11 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> Update Mavericks test results after r189611.
</span><span class="cx">
</span><span class="cx"> This change wasn't needed on trunk because the behavior changed was masked by r189221.
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilityremovingtextareaaftereditcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash-expected.txt (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash-expected.txt 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash-expected.txt 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -3,4 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilityremovingtextareaaftereditcrashhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash.html (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash.html 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/removing-textarea-after-edit-crash.html 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> document.getElementById("div").style.display = "NONE";
</span><span class="cx">
</span><span class="cx"> // we now have to wait for the value change to be propagated to trigger the crash.
</span><del>- setTimeout("window.testRunner.notifyDone();", 1);
</del><ins>+ setTimeout(finishJSTest, 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> <script>
</span><span class="cx"> var req = 0;
</span><span class="cx"> if (window.accessibilityController) {
</span><del>- window.testRunner.waitUntilDone();
</del><ins>+ window.jsTestIsAsync = true;
</ins><span class="cx"> document.getElementById("body").focus();
</span><span class="cx"> body = accessibilityController.focusedElement;
</span><span class="cx">
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> req.open("get", "../../../http/tests/xmlhttprequest/methods.cgi", true);
</span><span class="cx"> // Sending this after a timeout makes is so that the layout does not happen until the value change is sent.
</span><span class="cx"> setTimeout("req.send('')", 1);
</span><ins>+ } else
+ debug("window.accessibilityController is not present");
</ins><span class="cx">
</span><del>- }
-
</del><span class="cx"> </script>
</span><del>-
</del><ins>+<script src="../../resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilityselectelementselectionwithoptgroupshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/select-element-selection-with-optgroups.html (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/select-element-selection-with-optgroups.html 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/select-element-selection-with-optgroups.html 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx">
</span><span class="cx"> <script>
</span><span class="cx"> description("This tests that setting selection within a list box works correctly if there are optgroups");
</span><del>-window.jsTestIsAsync = true;
</del><span class="cx">
</span><span class="cx"> if (window.accessibilityController) {
</span><ins>+ window.jsTestIsAsync = true;
</ins><span class="cx"> document.getElementById("suite").focus();
</span><span class="cx"> var selectElement = accessibilityController.focusedElement;
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,8 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><del>-}
</del><ins>+} else
+ debug("window.accessibilityController is not present");
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilityselectedrowstablehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selected-rows-table.html (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selected-rows-table.html 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selected-rows-table.html 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx"> document.getElementById("notifications").innerHTML += "Notification: " + notification + "<br>";
</span><span class="cx"> if (notification == "AXSelectedRowsChanged") {
</span><span class="cx"> axTree.removeNotificationListener();
</span><del>- window.testRunner.notifyDone();
</del><ins>+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.accessibilityController) {
</span><del>- window.testRunner.waitUntilDone();
</del><ins>+ window.jsTestIsAsync = true;
</ins><span class="cx">
</span><span class="cx"> document.getElementById("grid").focus();
</span><span class="cx">
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx">
</span><span class="cx"> // Change the selected state to ensure the notification is sent.
</span><span class="cx"> document.getElementById("row0").setAttribute("aria-selected", "false");
</span><del>- }
</del><ins>+ } else
+ debug("window.accessibilityController is not present");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilityselectionnotificationfocuschangehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -72,6 +72,9 @@
</span><span class="cx"> shouldBeTrue("addedNotification");
</span><span class="cx">
</span><span class="cx"> eventSender.keyDown("\t");
</span><ins>+ } else {
+ debug("window.accessibilityController is not present");
+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilityselectionsynchtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-sync.html (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-sync.html 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/selection-sync.html 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -57,13 +57,13 @@
</span><span class="cx"> shouldBe("results[resultIndex][\"AXTextStateSync\"]", "true");
</span><span class="cx">
</span><span class="cx"> webArea.removeNotificationListener();
</span><del>- window.testRunner.notifyDone();
</del><ins>+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.accessibilityController) {
</span><del>- window.testRunner.waitUntilDone();
</del><ins>+ window.jsTestIsAsync = true;
</ins><span class="cx">
</span><span class="cx"> accessibilityController.enableEnhancedAccessibility(true);
</span><span class="cx">
</span><span class="lines">@@ -83,10 +83,10 @@
</span><span class="cx"> var extendRange = axTextbox.textMarkerRangeForMarkers(markerThree, markerFour);
</span><span class="cx"> webArea.setSelectedVisibleTextRange(moveRange);
</span><span class="cx"> webArea.setSelectedVisibleTextRange(extendRange);
</span><del>- }
</del><ins>+ } else
+ debug("window.accessibilityController is not present");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><del>-
</del><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacaccessibilitysettingattributesisasynchronoushtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/accessibility/setting-attributes-is-asynchronous.html (189648 => 189649)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/accessibility/setting-attributes-is-asynchronous.html 2015-09-12 05:28:19 UTC (rev 189648)
+++ branches/safari-601-branch/LayoutTests/platform/mac/accessibility/setting-attributes-is-asynchronous.html 2015-09-12 06:02:18 UTC (rev 189649)
</span><span class="lines">@@ -13,15 +13,14 @@
</span><span class="cx"> description("This tests makes sure that setting accessibility attributes happens asychronously, so that a caller won't hang if the result is an alert.")
</span><span class="cx">
</span><span class="cx"> if (window.testRunner && window.accessibilityController) {
</span><del>-
</del><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx"> var textfield = accessibilityController.accessibleElementById("textfield");
</span><span class="cx"> textfield.takeFocus();
</span><span class="cx"> debug("This line should be printed first");
</span><del>-}
</del><ins>+} else
+ debug((window.testRunner ? "window.testRunner" : "window.accessibilityController") + " is not present");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><del>-
</del><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>