<!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>[172028] 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/172028">172028</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-08-05 08:15:58 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Select text activity should return replaced text instead of previously selected text
https://bugs.webkit.org/show_bug.cgi?id=135595
Reviewed by Mario Sanchez Prada.
Source/WebCore:
When the select activity API is used to replace text, the replacement string should be returned instead of the old selected text.
Updated existing test: platform/mac/accessibility/select-text.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::selectText):
LayoutTests:
* platform/mac/accessibility/select-text-expected.txt:
* platform/mac/accessibility/select-text.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselecttextexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselecttexthtml">trunk/LayoutTests/platform/mac/accessibility/select-text.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172027 => 172028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-05 05:09:05 UTC (rev 172027)
+++ trunk/LayoutTests/ChangeLog 2014-08-05 15:15:58 UTC (rev 172028)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-05 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Select text activity should return replaced text instead of previously selected text
+ https://bugs.webkit.org/show_bug.cgi?id=135595
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/select-text-expected.txt:
+ * platform/mac/accessibility/select-text.html:
+
</ins><span class="cx"> 2014-08-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Select activity behavior does not work when an existing range is already selected
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt (172027 => 172028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-08-05 05:09:05 UTC (rev 172027)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-08-05 15:15:58 UTC (rev 172028)
</span><span class="lines">@@ -19,15 +19,15 @@
</span><span class="cx"> PASS selection is 'dog'
</span><span class="cx"> PASS result is 'fox'
</span><span class="cx"> PASS selection is 'fox'
</span><del>-PASS result is 'quick'
</del><ins>+PASS result is 'slow'
</ins><span class="cx"> PASS selection is 'slow'
</span><del>-PASS result is 'fox'
</del><ins>+PASS result is 'cat'
</ins><span class="cx"> PASS selection is 'cat'
</span><ins>+PASS result is 'Brown'
+PASS selection is 'Brown'
</ins><span class="cx"> PASS result is 'brown'
</span><del>-PASS selection is 'Brown'
-PASS result is 'Brown'
</del><span class="cx"> PASS selection is 'brown'
</span><del>-PASS result is 'brown'
</del><ins>+PASS result is 'BROWN'
</ins><span class="cx"> PASS selection is 'BROWN'
</span><span class="cx"> PASS result is 'quick'
</span><span class="cx"> PASS windowSelection.getRangeAt(0).startOffset is 11
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> PASS windowSelection.getRangeAt(0).startOffset is 56
</span><span class="cx"> PASS windowSelection.getRangeAt(0).endOffset is 61
</span><span class="cx"> PASS windowSelection.getRangeAt(0).toString() is 'The'
</span><del>-PASS result is 'The'
</del><ins>+PASS result is 'THE'
</ins><span class="cx"> PASS windowSelection.getRangeAt(0).toString() is 'THE'
</span><span class="cx"> PASS windowSelection.getRangeAt(0).startOffset is 7
</span><span class="cx"> PASS windowSelection.getRangeAt(0).endOffset is 10
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text.html (172027 => 172028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-08-05 05:09:05 UTC (rev 172027)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-08-05 15:15:58 UTC (rev 172028)
</span><span class="lines">@@ -80,35 +80,35 @@
</span><span class="cx"> // Select and replace text closest to selection (single search string).
</span><span class="cx"> selectElementText(target);
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "quick", "slow");
</span><del>- shouldBe("result", "'quick'");
</del><ins>+ shouldBe("result", "'slow'");
</ins><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'slow'");
</span><span class="cx">
</span><span class="cx"> // Select and replace text closest to selection (multiple search strings).
</span><span class="cx"> selectElementText(target);
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", ["dog", "fox"], "cat");
</span><del>- shouldBe("result", "'fox'");
</del><ins>+ shouldBe("result", "'cat'");
</ins><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'cat'");
</span><span class="cx">
</span><span class="cx"> // Select brown and capitalize it.
</span><span class="cx"> selectElementText(target);
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "brown", null, "AXSelectTextActivityFindAndCapitalize");
</span><del>- shouldBe("result", "'brown'");
</del><ins>+ shouldBe("result", "'Brown'");
</ins><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'Brown'");
</span><span class="cx">
</span><span class="cx"> // Select Brown and lowercase it.
</span><span class="cx"> selectElementText(target);
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "Brown", null, "AXSelectTextActivityFindAndLowercase");
</span><del>- shouldBe("result", "'Brown'");
</del><ins>+ shouldBe("result", "'brown'");
</ins><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'brown'");
</span><span class="cx">
</span><span class="cx"> // Select brown and uppercase it.
</span><span class="cx"> selectElementText(target);
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "brown", null, "AXSelectTextActivityFindAndUppercase");
</span><del>- shouldBe("result", "'brown'");
</del><ins>+ shouldBe("result", "'BROWN'");
</ins><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'BROWN'");
</span><span class="cx">
</span><span class="lines">@@ -155,11 +155,10 @@
</span><span class="cx">
</span><span class="cx"> var text2 = accessibilityController.accessibleElementById("text2");
</span><span class="cx"> result = text2.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "the", null, "AXSelectTextActivityFindAndUppercase");
</span><del>- shouldBe("result", "'The'");
</del><ins>+ shouldBe("result", "'THE'");
</ins><span class="cx"> shouldBe("windowSelection.getRangeAt(0).toString()", "'THE'");
</span><span class="cx"> shouldBe("windowSelection.getRangeAt(0).startOffset", "7");
</span><span class="cx"> shouldBe("windowSelection.getRangeAt(0).endOffset", "10");
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172027 => 172028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-05 05:09:05 UTC (rev 172027)
+++ trunk/Source/WebCore/ChangeLog 2014-08-05 15:15:58 UTC (rev 172028)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-05 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Select text activity should return replaced text instead of previously selected text
+ https://bugs.webkit.org/show_bug.cgi?id=135595
+
+ Reviewed by Mario Sanchez Prada.
+
+ When the select activity API is used to replace text, the replacement string should be returned instead of the old selected text.
+
+ Updated existing test: platform/mac/accessibility/select-text.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::selectText):
+
</ins><span class="cx"> 2014-08-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Select activity behavior does not work when an existing range is already selected
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (172027 => 172028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-05 05:09:05 UTC (rev 172027)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-05 15:15:58 UTC (rev 172028)
</span><span class="lines">@@ -676,8 +676,13 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (replaceSelection)
</del><ins>+ // A bit obvious, but worth noting the API contract for this method is that we should
+ // return the replacement string when replacing, but the selected string if not.
+ if (replaceSelection) {
</ins><span class="cx"> frame->editor().replaceSelectionWithText(replacementString, true, true);
</span><ins>+ return replacementString;
+ }
+
</ins><span class="cx"> return closestString;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>