<!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>[172266] branches/safari-600.1-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/172266">172266</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 14:19:54 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171994">r171994</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreaccessibilityAccessibilityObjectcpp">branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacaccessibilityfindandreplacematchcapitalizationexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacaccessibilityfindandreplacematchcapitalizationhtml">branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172265 => 172266)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 21:19:16 UTC (rev 172265)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 21:19:54 UTC (rev 172266)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171994
+
+ 2014-08-04 Chris Fleizach <cfleizach@apple.com>
+
+ AX: The Dictation command "Replace <phrase> with <phrase>" always capitalizes the replacement string
+ https://bugs.webkit.org/show_bug.cgi?id=135557
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/find-and-replace-match-capitalization-expected.txt: Added.
+ * platform/mac/accessibility/find-and-replace-match-capitalization.html: Added.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172213
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacaccessibilityfindandreplacematchcapitalizationexpectedtxtfromrev171994trunkLayoutTestsplatformmacaccessibilityfindandreplacematchcapitalizationexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization-expected.txt (from rev 171994, trunk/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization-expected.txt) (0 => 172266)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization-expected.txt 2014-08-07 21:19:54 UTC (rev 172266)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+The Test test TEST.
+
+This tests that find and replace will match the capitalization of the replaced word.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;jumped high.'
+PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;test&nbsp;high.'
+PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;test&nbsp;TEST.'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacaccessibilityfindandreplacematchcapitalizationhtmlfromrev171994trunkLayoutTestsplatformmacaccessibilityfindandreplacematchcapitalizationhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization.html (from rev 171994, trunk/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization.html) (0 => 172266)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/find-and-replace-match-capitalization.html 2014-08-07 21:19:54 UTC (rev 172266)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<title>Select Text</title>
+</head>
+<body>
+
+<p contenteditable="true" id="text">The Man jumped high.</p>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that find and replace will match the capitalization of the replaced word.");
+
+ if (window.accessibilityController) {
+ var text = accessibilityController.accessibleElementById("text");
+ document.getElementById("text").focus();
+
+ // 'Man' is capitalized, so the replaced text should end up capitalized.
+ var result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "man", "test");
+ shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;jumped high.'");
+
+ // 'jumped' is not capitalized so the text should not be capitalized.
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "jumped", "Test");
+ shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;test&nbsp;high.'");
+
+ // The replacement text was all caps, so don't change based on the existing text.
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "high", "TEST");
+ shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;test&nbsp;TEST.'");
+
+ }
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172265 => 172266)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 21:19:16 UTC (rev 172265)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 21:19:54 UTC (rev 172266)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171994
+
+ 2014-08-04 Chris Fleizach <cfleizach@apple.com>
+
+ AX: The Dictation command "Replace <phrase> with <phrase>" always capitalizes the replacement string
+ https://bugs.webkit.org/show_bug.cgi?id=135557
+
+ Reviewed by Mario Sanchez Prada.
+
+ When replacing text, we should match the capitalization of the word being replaced
+ (unless the replacement looks like an abbreviation).
+
+ Test: platform/mac/accessibility/find-and-replace-match-capitalization.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::selectText):
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172215
</span><span class="cx">
</span><span class="cx"> 2014-08-07 Pratik Solanki <psolanki@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp (172265 => 172266)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-07 21:19:16 UTC (rev 172265)
+++ branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-07 21:19:54 UTC (rev 172266)
</span><span class="lines">@@ -647,9 +647,20 @@
</span><span class="cx"> replacementString = closestString.lower();
</span><span class="cx"> replaceSelection = true;
</span><span class="cx"> break;
</span><del>- case FindAndReplaceActivity:
</del><ins>+ case FindAndReplaceActivity: {
</ins><span class="cx"> replaceSelection = true;
</span><ins>+
+ // When applying find and replace activities, we want to match the capitalization of the replaced text,
+ // (unless we're replacing with an abbreviation.)
+ String uppercaseReplacementString = replacementString.upper();
+ if (closestString.length() > 0 && replacementString.length() > 2 && replacementString != uppercaseReplacementString) {
+ if (closestString[0] == closestString.upper()[0])
+ makeCapitalized(&replacementString, 0);
+ else
+ replacementString = replacementString.lower();
+ }
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case FindAndSelectActivity:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>