<!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>[185974] 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/185974">185974</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-25 18:00:21 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bug 146300 AX: AccessibilityObject focus events that don't cause a selection
change can leave m_isSynchronizingSelection set to true
https://bugs.webkit.org/show_bug.cgi?id=146300
Patch by Doug Russell <d_russell@apple.com> on 2015-06-25
Reviewed by Chris Fleizach.
Added a clearTextSelectionIntent() convenience function to be used after any
event that can, but isn't guaranteed to result in a selection change. Matches
calls to setTextSelectionIntent() convenience function.
Added support for tests listening for focus change notifications.
Source/WebCore:
Test: platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::clearTextSelectionIntent):
(WebCore::AccessibilityRenderObject::setSelectedTextRange):
(WebCore::AccessibilityRenderObject::setFocused):
(WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):
* accessibility/mac/AXObjectCacheMac.mm:
(WebCore::AXObjectCache::platformHandleFocusedUIElementChanged):
LayoutTests:
* platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt: Added.
* platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.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="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacAXObjectCacheMacmm">trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityfocussettingselectionsyncronizingnotclearingexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityfocussettingselectionsyncronizingnotclearinghtml">trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185973 => 185974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-26 00:57:25 UTC (rev 185973)
+++ trunk/LayoutTests/ChangeLog 2015-06-26 01:00:21 UTC (rev 185974)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-25 Doug Russell <d_russell@apple.com>
+
+ Bug 146300 AX: AccessibilityObject focus events that don't cause a selection
+ change can leave m_isSynchronizingSelection set to true
+ https://bugs.webkit.org/show_bug.cgi?id=146300
+
+ Reviewed by Chris Fleizach.
+
+ Added a clearTextSelectionIntent() convenience function to be used after any
+ event that can, but isn't guaranteed to result in a selection change. Matches
+ calls to setTextSelectionIntent() convenience function.
+ Added support for tests listening for focus change notifications.
+
+ * platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt: Added.
+ * platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html: Added.
+
</ins><span class="cx"> 2015-06-25 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Viewport units are wrong when scaled in 2-up mode, cause content to hop around on apple.com/music
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityfocussettingselectionsyncronizingnotclearingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt (0 => 185974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt 2015-06-26 01:00:21 UTC (rev 185974)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+
+ 1
+ 2
+This tests that calling focus on a render object when it doesn't result in a selection change won't leave isSynchronizingSelection set to true.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS addedNotification is true
+PASS axTextStateSyncOne is undefined
+PASS accessibilityController.accessibleElementById("1").isFocusable is true
+PASS accessibilityController.focusedElement.isEqual(accessibilityController.accessibleElementById("1")) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS axTextStateSyncTwo is undefined
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityfocussettingselectionsyncronizingnotclearinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html (0 => 185974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html 2015-06-26 01:00:21 UTC (rev 185974)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<fieldset>
+ <div>
+ <input id="1">
+ <label for="1">1</label>
+ </div>
+ <div>
+ <input id="2">
+ <label for="2">2</label>
+ </div>
+</fieldset>
+
+<p id="description"></p>
+<div id="console"></div>
+<div id="notifications"></div>
+
+<script>
+
+ description("This tests that calling focus on a render object when it doesn't result in a selection change won't leave isSynchronizingSelection set to true.");
+
+ var webArea = 0;
+ var axTextStateSyncOne = 0;
+ var axTextStateSyncTwo = 0;
+ var selectCount = 0;
+ var focusCount = 0;
+
+ // Notification ordering:
+ // The first tab will result in a selection and focus notification pair selectCount=1, focusCount=1
+ // takeFocus() will result in a focus notification selectCount=1, focusCount=2
+ // The second tab will result in another selection and focus notification pair selectCount=2, focusCount=3
+ function notificationCallback(notification, userInfo) {
+ if (notification == "AXSelectedTextChanged") {
+ selectCount++;
+ if (selectCount == 1) {
+ axTextStateSyncOne = userInfo["AXTextStateSync"];
+ shouldBe("axTextStateSyncOne", "undefined");
+
+ shouldBe("accessibilityController.accessibleElementById(\"1\").isFocusable", "true");
+ accessibilityController.accessibleElementById("1").takeFocus();
+ } else if (selectCount == 2) {
+ axTextStateSyncTwo = userInfo["AXTextStateSync"];
+ shouldBe("axTextStateSyncTwo", "undefined");
+ }
+ } else if (notification == "AXFocusChanged") {
+ focusCount++;
+ if (focusCount == 2) {
+ eventSender.scheduleAsynchronousKeyDown("\t");
+ }
+ }
+ if (selectCount == 2 && focusCount == 3) {
+ webArea.removeNotificationListener();
+ testRunner.notifyDone();
+ }
+ }
+
+ if (window.accessibilityController) {
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
+
+ accessibilityController.enableEnhancedAccessibility(true);
+ webArea = accessibilityController.rootElement.childAtIndex(0);
+
+ var addedNotification = webArea.addNotificationListener(notificationCallback);
+ shouldBe("addedNotification", "true");
+
+ eventSender.keyDown("\t");
+ shouldBe("accessibilityController.focusedElement.isEqual(accessibilityController.accessibleElementById(\"1\"))", "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 (185973 => 185974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-26 00:57:25 UTC (rev 185973)
+++ trunk/Source/WebCore/ChangeLog 2015-06-26 01:00:21 UTC (rev 185974)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-06-25 Doug Russell <d_russell@apple.com>
+
+ Bug 146300 AX: AccessibilityObject focus events that don't cause a selection
+ change can leave m_isSynchronizingSelection set to true
+ https://bugs.webkit.org/show_bug.cgi?id=146300
+
+ Reviewed by Chris Fleizach.
+
+ Added a clearTextSelectionIntent() convenience function to be used after any
+ event that can, but isn't guaranteed to result in a selection change. Matches
+ calls to setTextSelectionIntent() convenience function.
+ Added support for tests listening for focus change notifications.
+
+ Test: platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::clearTextSelectionIntent):
+ (WebCore::AccessibilityRenderObject::setSelectedTextRange):
+ (WebCore::AccessibilityRenderObject::setFocused):
+ (WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):
+ * accessibility/mac/AXObjectCacheMac.mm:
+ (WebCore::AXObjectCache::platformHandleFocusedUIElementChanged):
+
</ins><span class="cx"> 2015-06-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Add a way to match a domain but not subdomains
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (185973 => 185974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-06-26 00:57:25 UTC (rev 185973)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-06-26 01:00:21 UTC (rev 185974)
</span><span class="lines">@@ -1498,9 +1498,8 @@
</span><span class="cx"> return documentBasedSelectedTextRange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setTextSelectionIntent(const AccessibilityRenderObject& renderObject, AXTextStateChangeType type)
</del><ins>+static void setTextSelectionIntent(AXObjectCache* cache, AXTextStateChangeType type)
</ins><span class="cx"> {
</span><del>- AXObjectCache* cache = renderObject.axObjectCache();
</del><span class="cx"> if (!cache)
</span><span class="cx"> return;
</span><span class="cx"> AXTextStateChangeIntent intent(type, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown });
</span><span class="lines">@@ -1508,19 +1507,29 @@
</span><span class="cx"> cache->setIsSynchronizingSelection(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void clearTextSelectionIntent(AXObjectCache* cache)
+{
+ if (!cache)
+ return;
+ cache->setTextSelectionIntent(AXTextStateChangeIntent());
+ cache->setIsSynchronizingSelection(false);
+}
+
</ins><span class="cx"> void AccessibilityRenderObject::setSelectedTextRange(const PlainTextRange& range)
</span><span class="cx"> {
</span><span class="cx"> if (isNativeTextControl()) {
</span><del>- setTextSelectionIntent(*this, range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
</del><ins>+ setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
</ins><span class="cx"> HTMLTextFormControlElement& textControl = downcast<RenderTextControl>(*m_renderer).textFormControlElement();
</span><span class="cx"> textControl.setSelectionRange(range.start, range.start + range.length);
</span><ins>+ clearTextSelectionIntent(axObjectCache());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* node = m_renderer->node();
</span><span class="cx"> VisibleSelection newSelection(Position(node, range.start, Position::PositionIsOffsetInAnchor), Position(node, range.start + range.length, Position::PositionIsOffsetInAnchor), DOWNSTREAM);
</span><del>- setTextSelectionIntent(*this, range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
</del><ins>+ setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
</ins><span class="cx"> m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><ins>+ clearTextSelectionIntent(axObjectCache());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL AccessibilityRenderObject::url() const
</span><span class="lines">@@ -1674,8 +1683,9 @@
</span><span class="cx"> if (document->focusedElement() == node)
</span><span class="cx"> document->setFocusedElement(nullptr);
</span><span class="cx">
</span><del>- setTextSelectionIntent(*this, AXTextStateChangeTypeSelectionMove);
</del><ins>+ setTextSelectionIntent(axObjectCache(), AXTextStateChangeTypeSelectionMove);
</ins><span class="cx"> downcast<Element>(*node).focus();
</span><ins>+ clearTextSelectionIntent(axObjectCache());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::setSelectedRows(AccessibilityChildrenVector& selectedRows)
</span><span class="lines">@@ -1989,13 +1999,15 @@
</span><span class="cx">
</span><span class="cx"> // make selection and tell the document to use it. if it's zero length, then move to that position
</span><span class="cx"> if (range.start == range.end) {
</span><del>- setTextSelectionIntent(*this, AXTextStateChangeTypeSelectionMove);
</del><ins>+ setTextSelectionIntent(axObjectCache(), AXTextStateChangeTypeSelectionMove);
</ins><span class="cx"> m_renderer->frame().selection().moveTo(range.start, UserTriggered);
</span><ins>+ clearTextSelectionIntent(axObjectCache());
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><del>- setTextSelectionIntent(*this, AXTextStateChangeTypeSelectionExtend);
</del><ins>+ setTextSelectionIntent(axObjectCache(), AXTextStateChangeTypeSelectionExtend);
</ins><span class="cx"> VisibleSelection newSelection = VisibleSelection(range.start, range.end);
</span><span class="cx"> m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><ins>+ clearTextSelectionIntent(axObjectCache());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacAXObjectCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (185973 => 185974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2015-06-26 00:57:25 UTC (rev 185973)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2015-06-26 01:00:21 UTC (rev 185974)
</span><span class="lines">@@ -333,6 +333,9 @@
</span><span class="cx"> void AXObjectCache::platformHandleFocusedUIElementChanged(Node*, Node*)
</span><span class="cx"> {
</span><span class="cx"> wkAccessibilityHandleFocusChanged();
</span><ins>+ // AXFocusChanged is a test specific notification name and not something a real AT will be listening for
+ if (UNLIKELY(axShouldRepostNotificationsForTests))
+ [rootWebArea()->wrapper() accessibilityPostedNotification:@"AXFocusChanged" userInfo:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AXObjectCache::handleScrolledToAnchor(const Node*)
</span></span></pre>
</div>
</div>
</body>
</html>