<!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>[168427] 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/168427">168427</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-05-07 09:17:47 -0700 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: AXSelectTextWithCriteria should support capitalize/lowercase/uppercase
https://bugs.webkit.org/show_bug.cgi?id=132622
Reviewed by Mario Sanchez Prada.
Source/WebCore:
The select text with criteria mechanism used through accessibility needs to support
a few more parameters to be complete (including capitalize, lowercase and uppercase).
Updated: accessibility/select-text.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::selectText):
* accessibility/AccessibilityObject.h:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(accessibilitySelectTextCriteriaForCriteriaParameterizedAttribute):
* rendering/RenderText.cpp:
(WebCore::makeCapitalized):
* rendering/RenderText.h:
Tools:
* DumpRenderTree/AccessibilityUIElement.cpp:
(selectTextWithCriteriaCallback):
(isEqualCallback):
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
(AccessibilityUIElement::selectTextWithCriteria):
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::selectTextWithCriteria):
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(selectTextParameterizedAttributeForCriteria):
(AccessibilityUIElement::selectTextWithCriteria):
* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::selectTextWithCriteria):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::selectTextWithCriteria):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::selectTextWithCriteria):
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::selectTextWithCriteria):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::selectTextParameterizedAttributeForCriteria):
(WTR::AccessibilityUIElement::selectTextWithCriteria):
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>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementcpp">trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementh">trunk/Tools/DumpRenderTree/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp">trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinAccessibilityUIElementWincpp">trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/LayoutTests/ChangeLog 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-07 Chris Fleizach <cfleizach@apple.com>
+
+ AX: AXSelectTextWithCriteria should support capitalize/lowercase/uppercase
+ https://bugs.webkit.org/show_bug.cgi?id=132622
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/select-text-expected.txt:
+ * platform/mac/accessibility/select-text.html:
+
</ins><span class="cx"> 2014-05-07 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> Share mac/editing/spelling/editing-multiple-words-with-markers.html with other platforms
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-The slow brown cat jumps over the lazy dog.
</del><ins>+The slow BROWN cat jumps over the lazy dog.
</ins><span class="cx">
</span><span class="cx"> This tests the ability to select and replace text with respect to selection.
</span><span class="cx">
</span><span class="lines">@@ -21,6 +21,12 @@
</span><span class="cx"> PASS selection is 'slow'
</span><span class="cx"> PASS result is 'fox'
</span><span class="cx"> PASS selection is 'cat'
</span><ins>+PASS result is 'brown'
+PASS selection is 'Brown'
+PASS result is 'Brown'
+PASS selection is 'brown'
+PASS result is 'brown'
+PASS selection is 'BROWN'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text.html (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -88,6 +88,28 @@
</span><span class="cx"> shouldBe("result", "'fox'");
</span><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'cat'");
</span><ins>+
+ // Select brown and capitalize it.
+ selectElementText(target);
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "brown", null, "AXSelectTextActivityFindAndCapitalize");
+ shouldBe("result", "'brown'");
+ selection = selectedText();
+ shouldBe("selection", "'Brown'");
+
+ // Select Brown and lowercase it.
+ selectElementText(target);
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "Brown", null, "AXSelectTextActivityFindAndLowercase");
+ shouldBe("result", "'Brown'");
+ selection = selectedText();
+ shouldBe("selection", "'brown'");
+
+ // Select brown and uppercase it.
+ selectElementText(target);
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "brown", null, "AXSelectTextActivityFindAndUppercase");
+ shouldBe("result", "'brown'");
+ selection = selectedText();
+ shouldBe("selection", "'BROWN'");
+
</ins><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 (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Source/WebCore/ChangeLog 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-07 Chris Fleizach <cfleizach@apple.com>
+
+ AX: AXSelectTextWithCriteria should support capitalize/lowercase/uppercase
+ https://bugs.webkit.org/show_bug.cgi?id=132622
+
+ Reviewed by Mario Sanchez Prada.
+
+ The select text with criteria mechanism used through accessibility needs to support
+ a few more parameters to be complete (including capitalize, lowercase and uppercase).
+
+ Updated: accessibility/select-text.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::selectText):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (accessibilitySelectTextCriteriaForCriteriaParameterizedAttribute):
+ * rendering/RenderText.cpp:
+ (WebCore::makeCapitalized):
+ * rendering/RenderText.h:
+
</ins><span class="cx"> 2014-05-07 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> DocumentLoader::dataReceived assertion failed
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> #include "RenderListItem.h"
</span><span class="cx"> #include "RenderListMarker.h"
</span><span class="cx"> #include "RenderMenuList.h"
</span><ins>+#include "RenderText.h"
</ins><span class="cx"> #include "RenderTextControl.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -629,14 +630,33 @@
</span><span class="cx"> // Determine which candidate is closest to the selection and perform the activity.
</span><span class="cx"> if (RefPtr<Range> closestStringRange = rangeClosestToRange(selectedStringRange.get(), closestAfterStringRange, closestBeforeStringRange)) {
</span><span class="cx"> String closestString = closestStringRange->text();
</span><ins>+ bool replaceSelection = false;
</ins><span class="cx"> if (frame->selection().setSelectedRange(closestStringRange.get(), DOWNSTREAM, true)) {
</span><span class="cx"> switch (activity) {
</span><ins>+ case FindAndCapitalize: {
+ replacementString = closestString;
+ makeCapitalized(&replacementString, 0);
+ replaceSelection = true;
+ break;
+ }
+ case FindAndUppercase:
+ replacementString = closestString.upper();
+ replaceSelection = true;
+ break;
+ case FindAndLowercase:
+ replacementString = closestString.lower();
+ replaceSelection = true;
+ break;
</ins><span class="cx"> case FindAndReplaceActivity:
</span><del>- frame->editor().replaceSelectionWithText(replacementString, true, true);
- FALLTHROUGH;
</del><ins>+ replaceSelection = true;
+ break;
</ins><span class="cx"> case FindAndSelectActivity:
</span><del>- return closestString;
</del><ins>+ break;
</ins><span class="cx"> }
</span><ins>+
+ if (replaceSelection)
+ frame->editor().replaceSelectionWithText(replacementString, true, true);
+ return closestString;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -391,7 +391,10 @@
</span><span class="cx">
</span><span class="cx"> enum AccessibilitySelectTextActivity {
</span><span class="cx"> FindAndReplaceActivity,
</span><del>- FindAndSelectActivity
</del><ins>+ FindAndSelectActivity,
+ FindAndCapitalize,
+ FindAndLowercase,
+ FindAndUppercase
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum AccessibilitySelectTextAmbiguityResolution {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -404,6 +404,18 @@
</span><span class="cx"> #define NSAccessibilitySelectTextActivityFindAndSelect @"AXSelectTextActivityFindAndSelect"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef kAXSelectTextActivityFindAndCapitalize
+#define kAXSelectTextActivityFindAndCapitalize @"AXSelectTextActivityFindAndCapitalize"
+#endif
+
+#ifndef kAXSelectTextActivityFindAndLowercase
+#define kAXSelectTextActivityFindAndLowercase @"AXSelectTextActivityFindAndLowercase"
+#endif
+
+#ifndef kAXSelectTextActivityFindAndUppercase
+#define kAXSelectTextActivityFindAndUppercase @"AXSelectTextActivityFindAndUppercase"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilitySelectTextAmbiguityResolution
</span><span class="cx"> #define NSAccessibilitySelectTextAmbiguityResolution @"AXSelectTextAmbiguityResolution"
</span><span class="cx"> #endif
</span><span class="lines">@@ -662,6 +674,12 @@
</span><span class="cx"> if ([activityParameter isKindOfClass:[NSString class]]) {
</span><span class="cx"> if ([activityParameter isEqualToString:NSAccessibilitySelectTextActivityFindAndReplace])
</span><span class="cx"> activity = FindAndReplaceActivity;
</span><ins>+ else if ([activityParameter isEqualToString:kAXSelectTextActivityFindAndCapitalize])
+ activity = FindAndCapitalize;
+ else if ([activityParameter isEqualToString:kAXSelectTextActivityFindAndLowercase])
+ activity = FindAndLowercase;
+ else if ([activityParameter isEqualToString:kAXSelectTextActivityFindAndUppercase])
+ activity = FindAndUppercase;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilitySelectTextAmbiguityResolution ambiguityResolution = ClosestToSelectionAmbiguityResolution;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> return map;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void makeCapitalized(String* string, UChar previous)
</del><ins>+void makeCapitalized(String* string, UChar previous)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Need to change this to use u_strToTitle instead of u_totitle and to consider locale.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Source/WebCore/rendering/RenderText.h 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -242,7 +242,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void applyTextTransform(const RenderStyle&, String&, UChar);
</span><del>-
</del><ins>+void makeCapitalized(String*, UChar previous);
+
</ins><span class="cx"> inline RenderText* Text::renderer() const
</span><span class="cx"> {
</span><span class="cx"> return toRenderText(Node::renderer());
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/ChangeLog 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-05-07 Chris Fleizach <cfleizach@apple.com>
+
+ AX: AXSelectTextWithCriteria should support capitalize/lowercase/uppercase
+ https://bugs.webkit.org/show_bug.cgi?id=132622
+
+ Reviewed by Mario Sanchez Prada.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (selectTextWithCriteriaCallback):
+ (isEqualCallback):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ (AccessibilityUIElement::selectTextWithCriteria):
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::selectTextWithCriteria):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (selectTextParameterizedAttributeForCriteria):
+ (AccessibilityUIElement::selectTextWithCriteria):
+ * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+ (AccessibilityUIElement::selectTextWithCriteria):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::selectTextWithCriteria):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::selectTextWithCriteria):
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::selectTextWithCriteria):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::selectTextParameterizedAttributeForCriteria):
+ (WTR::AccessibilityUIElement::selectTextWithCriteria):
+
</ins><span class="cx"> 2014-05-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] TLSErrors do not cause page load to fail when not ignored
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> static JSValueRef selectTextWithCriteriaCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><del>- if (argumentCount < 2 || argumentCount > 3)
</del><ins>+ if (argumentCount < 2 || argumentCount > 4)
</ins><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx">
</span><span class="cx"> JSRetainPtr<JSStringRef> ambiguityResolution(Adopt, JSValueToStringCopy(context, arguments[0], exception));
</span><span class="lines">@@ -268,8 +268,11 @@
</span><span class="cx"> JSStringRef replacementString = nullptr;
</span><span class="cx"> if (argumentCount == 3)
</span><span class="cx"> replacementString = JSValueToStringCopy(context, arguments[2], exception);
</span><ins>+ JSStringRef activityString = nullptr;
+ if (argumentCount == 4)
+ activityString = JSValueToStringCopy(context, arguments[3], exception);
</ins><span class="cx">
</span><del>- JSRetainPtr<JSStringRef> result(Adopt, toAXElement(thisObject)->selectTextWithCriteria(context, ambiguityResolution.get(), searchStrings, replacementString));
</del><ins>+ JSRetainPtr<JSStringRef> result(Adopt, toAXElement(thisObject)->selectTextWithCriteria(context, ambiguityResolution.get(), searchStrings, replacementString, activityString));
</ins><span class="cx"> if (replacementString)
</span><span class="cx"> JSStringRelease(replacementString);
</span><span class="cx"> return JSValueMakeString(context, result.get());
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> bool attributedStringRangeIsMisspelled(unsigned location, unsigned length);
</span><span class="cx"> unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
</span><span class="cx"> AccessibilityUIElement uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
</span><del>- JSStringRef selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString);
</del><ins>+ JSStringRef selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void elementsForRange(unsigned location, unsigned length, Vector<AccessibilityUIElement>& elements);
</span><span class="cx"> JSStringRef stringForSelection();
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -1305,7 +1305,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Implement.
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSDictionary *selectTextParameterizedAttributeForCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+static NSDictionary *selectTextParameterizedAttributeForCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableDictionary *parameterizedAttribute = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="lines">@@ -285,6 +285,9 @@
</span><span class="cx"> } else
</span><span class="cx"> [parameterizedAttribute setObject:@"AXSelectTextActivityFindAndSelect" forKey:@"AXSelectTextActivity"];
</span><span class="cx">
</span><ins>+ if (activity)
+ [parameterizedAttribute setObject:[NSString stringWithJSStringRef:activity] forKey:@"AXSelectTextActivity"];
+
</ins><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1111,10 +1114,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings, replacementString);
</del><ins>+ NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings, replacementString, activity);
</ins><span class="cx"> id result = [m_element accessibilityAttributeValue:@"AXSelectTextWithCriteria" forParameter:parameterizedAttribute];
</span><span class="cx"> if ([result isKindOfClass:[NSString class]])
</span><span class="cx"> return [result createJSStringRef];
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinAccessibilityUIElementWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> bool AccessibilityUIElement::attributedStringRangeIsMisspelled(unsigned, unsigned) { return false; }
</span><span class="cx"> unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool, bool) { return 0; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool, bool) { return 0; }
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef, JSValueRef, JSStringRef) { return nullptr; }
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef, JSValueRef, JSStringRef, JSStringRef) { return nullptr; }
</ins><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::cellForColumnAndRow(unsigned, unsigned) { return 0; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::horizontalScrollbar() const { return 0; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::verticalScrollbar() const { return 0; }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> bool attributedStringRangeIsMisspelled(unsigned location, unsigned length);
</span><span class="cx"> unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
</span><del>- JSRetainPtr<JSStringRef> selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString);
</del><ins>+ JSRetainPtr<JSStringRef> selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity);
</ins><span class="cx">
</span><span class="cx"> // Text-specific
</span><span class="cx"> JSRetainPtr<JSStringRef> characterAtOffset(int offset);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> boolean attributedStringRangeIsMisspelled(unsigned long location, unsigned long length);
</span><span class="cx"> [PassContext] unsigned int uiElementCountForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
</span><span class="cx"> [PassContext] AccessibilityUIElement uiElementForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
</span><del>- [PassContext] DOMString selectTextWithCriteria(DOMString ambiguityResolution, object searchStrings, DOMString replacementString);
</del><ins>+ [PassContext] DOMString selectTextWithCriteria(DOMString ambiguityResolution, object searchStrings, DOMString replacementString, DOMString activity);
</ins><span class="cx"> void setSelectedTextRange(unsigned long location, unsigned long length);
</span><span class="cx">
</span><span class="cx"> // Scroll area attributes.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -1460,7 +1460,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (168426 => 168427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-05-07 14:54:56 UTC (rev 168426)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-05-07 16:17:47 UTC (rev 168427)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSDictionary *selectTextParameterizedAttributeForCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+static NSDictionary *selectTextParameterizedAttributeForCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableDictionary *parameterizedAttribute = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="lines">@@ -311,6 +311,9 @@
</span><span class="cx"> } else
</span><span class="cx"> [parameterizedAttribute setObject:@"AXSelectTextActivityFindAndSelect" forKey:@"AXSelectTextActivity"];
</span><span class="cx">
</span><ins>+ if (activity)
+ [parameterizedAttribute setObject:[NSString stringWithJSStringRef:activity] forKey:@"AXSelectTextActivity"];
+
</ins><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1167,10 +1170,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings, replacementString);
</del><ins>+ NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings, replacementString, activity);
</ins><span class="cx"> id result = [m_element accessibilityAttributeValue:@"AXSelectTextWithCriteria" forParameter:parameterizedAttribute];
</span><span class="cx"> if ([result isKindOfClass:[NSString class]])
</span><span class="cx"> return [result createJSStringRef];
</span></span></pre>
</div>
</div>
</body>
</html>