<!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>[163899] 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/163899">163899</a></dd>
<dt>Author</dt> <dd>samuel_white@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 12:44:03 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Add text replacement activity support to NSAccessibilitySelectTextWithCriteriaParameterizedAttribute.
https://bugs.webkit.org/show_bug.cgi?id=128397
Reviewed by Chris Fleizach.
Source/WebCore:
Added text replacement support for the AXSelectTextWithCriteria parameterized attribute.
No new test. Updated platform/mac/accessibility/select-text.html to test the added functionality.
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::selectText):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilitySelectTextCriteria::AccessibilitySelectTextCriteria):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(accessibilitySelectTextCriteriaForCriteriaParameterizedAttribute):
Tools:
Updated testing methods to accept a replacement string. This enables us to test text
replacement support for the AXSelectTextWithCriteria parameterized attribute.
* DumpRenderTree/AccessibilityUIElement.cpp:
(selectTextWithCriteriaCallback):
* 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:
Updated test and expectations to handle text replacement.
* 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="#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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/LayoutTests/ChangeLog 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-11 Samuel White <samuel_white@apple.com>
+
+ AX: Add text replacement activity support to NSAccessibilitySelectTextWithCriteriaParameterizedAttribute.
+ https://bugs.webkit.org/show_bug.cgi?id=128397
+
+ Reviewed by Chris Fleizach.
+
+ Updated test and expectations to handle text replacement.
+
+ * platform/mac/accessibility/select-text-expected.txt:
+ * platform/mac/accessibility/select-text.html:
+
</ins><span class="cx"> 2014-02-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB tests on some bots are flakey (timeouts)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-The quick brown fox jumps over the lazy dog.
</del><ins>+The slow brown cat jumps over the lazy dog.
</ins><span class="cx">
</span><del>-This tests the ability to select text with respect to selection.
</del><ins>+This tests the ability to select and replace text with respect to selection.
</ins><span class="cx">
</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="lines">@@ -17,6 +17,10 @@
</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><ins>+PASS result is 'quick'
+PASS selection is 'slow'
+PASS result is 'fox'
+PASS selection is 'cat'
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span><del>-<p id="text">The quick brown fox <span id="target">jumps</span> over the lazy dog.</p>
</del><ins>+<p contenteditable="true" id="text">The quick brown fox <span id="target">jumps</span> over the lazy dog.</p>
</ins><span class="cx">
</span><span class="cx"> <p id="description"></p>
</span><span class="cx"> <div id="console"></div>
</span><span class="cx">
</span><span class="cx"> <script>
</span><del>- description("This tests the ability to select text with respect to selection.");
</del><ins>+ description("This tests the ability to select and replace text with respect to selection.");
</ins><span class="cx">
</span><span class="cx"> function selectedText() {
</span><span class="cx"> return window.getSelection().toString();
</span><span class="lines">@@ -74,6 +74,20 @@
</span><span class="cx"> shouldBe("result", "'fox'");
</span><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'fox'");
</span><ins>+
+ // Select and replace text closest to selection (single search string).
+ selectElementText(target);
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "quick", "slow");
+ shouldBe("result", "'quick'");
+ selection = selectedText();
+ shouldBe("selection", "'slow'");
+
+ // Select and replace text closest to selection (multiple search strings).
+ selectElementText(target);
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", ["dog", "fox"], "cat");
+ shouldBe("result", "'fox'");
+ selection = selectedText();
+ shouldBe("selection", "'cat'");
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-11 Samuel White <samuel_white@apple.com>
+
+ AX: Add text replacement activity support to NSAccessibilitySelectTextWithCriteriaParameterizedAttribute.
+ https://bugs.webkit.org/show_bug.cgi?id=128397
+
+ Reviewed by Chris Fleizach.
+
+ Added text replacement support for the AXSelectTextWithCriteria parameterized attribute.
+
+ No new test. Updated platform/mac/accessibility/select-text.html to test the added functionality.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::selectText):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilitySelectTextCriteria::AccessibilitySelectTextCriteria):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (accessibilitySelectTextCriteriaForCriteriaParameterizedAttribute):
+
</ins><span class="cx"> 2014-02-11 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> [Windows] Unreviewed. Speculative test fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -601,7 +601,9 @@
</span><span class="cx">
</span><span class="cx"> AccessibilitySelectTextActivity& activity = criteria->activity;
</span><span class="cx"> AccessibilitySelectTextAmbiguityResolution& ambiguityResolution = criteria->ambiguityResolution;
</span><ins>+ String& replacementString = criteria->replacementString;
</ins><span class="cx"> Vector<String>& searchStrings = criteria->searchStrings;
</span><ins>+
</ins><span class="cx"> RefPtr<Range> selectedStringRange = selectionRange();
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> closestAfterStringRange = nullptr;
</span><span class="lines">@@ -615,9 +617,15 @@
</span><span class="cx">
</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><del>- if (activity == FindAndSelectActivity) {
- frame->selection().setSelectedRange(closestStringRange.get(), DOWNSTREAM, true);
- return closestStringRange->text();
</del><ins>+ String closestString = closestStringRange->text();
+ if (frame->selection().setSelectedRange(closestStringRange.get(), DOWNSTREAM, true)) {
+ switch (activity) {
+ case FindAndReplaceActivity:
+ frame->editor().replaceSelectionWithText(replacementString, true, true);
+ FALLTHROUGH;
+ case FindAndSelectActivity:
+ 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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -387,6 +387,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum AccessibilitySelectTextActivity {
</span><ins>+ FindAndReplaceActivity,
</ins><span class="cx"> FindAndSelectActivity
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -399,11 +400,13 @@
</span><span class="cx"> struct AccessibilitySelectTextCriteria {
</span><span class="cx"> AccessibilitySelectTextActivity activity;
</span><span class="cx"> AccessibilitySelectTextAmbiguityResolution ambiguityResolution;
</span><ins>+ String replacementString;
</ins><span class="cx"> Vector<String> searchStrings;
</span><span class="cx">
</span><del>- AccessibilitySelectTextCriteria(AccessibilitySelectTextActivity activity, AccessibilitySelectTextAmbiguityResolution ambiguityResolution)
</del><ins>+ AccessibilitySelectTextCriteria(AccessibilitySelectTextActivity activity, AccessibilitySelectTextAmbiguityResolution ambiguityResolution, const String& replacementString)
</ins><span class="cx"> : activity(activity)
</span><span class="cx"> , ambiguityResolution(ambiguityResolution)
</span><ins>+ , replacementString(replacementString)
</ins><span class="cx"> { }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -376,6 +376,10 @@
</span><span class="cx"> #define NSAccessibilitySelectTextActivity @"AXSelectTextActivity"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilitySelectTextActivityFindAndReplace
+#define NSAccessibilitySelectTextActivityFindAndReplace @"AXSelectTextActivityFindAndReplace"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilitySelectTextActivityFindAndSelect
</span><span class="cx"> #define NSAccessibilitySelectTextActivityFindAndSelect @"AXSelectTextActivityFindAndSelect"
</span><span class="cx"> #endif
</span><span class="lines">@@ -396,6 +400,10 @@
</span><span class="cx"> #define NSAccessibilitySelectTextAmbiguityResolutionClosestToSelection @"AXSelectTextAmbiguityResolutionClosestToSelection"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilitySelectTextReplacementString
+#define NSAccessibilitySelectTextReplacementString @"AXSelectTextReplacementString"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilitySelectTextSearchStrings
</span><span class="cx"> #define NSAccessibilitySelectTextSearchStrings @"AXSelectTextSearchStrings"
</span><span class="cx"> #endif
</span><span class="lines">@@ -619,10 +627,16 @@
</span><span class="cx">
</span><span class="cx"> static AccessibilitySelectTextCriteria accessibilitySelectTextCriteriaForCriteriaParameterizedAttribute(const NSDictionary *parameterizedAttribute)
</span><span class="cx"> {
</span><ins>+ NSString *activityParameter = [parameterizedAttribute objectForKey:NSAccessibilitySelectTextActivity];
</ins><span class="cx"> NSString *ambiguityResolutionParameter = [parameterizedAttribute objectForKey:NSAccessibilitySelectTextAmbiguityResolution];
</span><ins>+ NSString *replacementStringParameter = [parameterizedAttribute objectForKey:NSAccessibilitySelectTextReplacementString];
</ins><span class="cx"> NSArray *searchStringsParameter = [parameterizedAttribute objectForKey:NSAccessibilitySelectTextSearchStrings];
</span><span class="cx">
</span><span class="cx"> AccessibilitySelectTextActivity activity = FindAndSelectActivity;
</span><ins>+ if ([activityParameter isKindOfClass:[NSString class]]) {
+ if ([activityParameter isEqualToString:NSAccessibilitySelectTextActivityFindAndReplace])
+ activity = FindAndReplaceActivity;
+ }
</ins><span class="cx">
</span><span class="cx"> AccessibilitySelectTextAmbiguityResolution ambiguityResolution = ClosestToSelectionAmbiguityResolution;
</span><span class="cx"> if ([ambiguityResolutionParameter isKindOfClass:[NSString class]]) {
</span><span class="lines">@@ -632,8 +646,12 @@
</span><span class="cx"> ambiguityResolution = ClosestBeforeSelectionAmbiguityResolution;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AccessibilitySelectTextCriteria criteria(activity, ambiguityResolution);
</del><ins>+ String replacementString;
+ if ([replacementStringParameter isKindOfClass:[NSString class]])
+ replacementString = replacementStringParameter;
</ins><span class="cx">
</span><ins>+ AccessibilitySelectTextCriteria criteria(activity, ambiguityResolution, replacementString);
+
</ins><span class="cx"> if ([searchStringsParameter isKindOfClass:[NSArray class]]) {
</span><span class="cx"> size_t searchStringsCount = static_cast<size_t>([searchStringsParameter count]);
</span><span class="cx"> criteria.searchStrings.reserveInitialCapacity(searchStringsCount);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/ChangeLog 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-02-11 Samuel White <samuel_white@apple.com>
+
+ AX: Add text replacement activity support to NSAccessibilitySelectTextWithCriteriaParameterizedAttribute.
+ https://bugs.webkit.org/show_bug.cgi?id=128397
+
+ Reviewed by Chris Fleizach.
+
+ Updated testing methods to accept a replacement string. This enables us to test text
+ replacement support for the AXSelectTextWithCriteria parameterized attribute.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (selectTextWithCriteriaCallback):
+ * 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-02-11 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> [ASan] Fix build failures in Tools due to missing $(inherited) values
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -252,13 +252,18 @@
</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)
</del><ins>+ if (argumentCount < 2 || argumentCount > 3)
</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="cx"> JSValueRef searchStrings = arguments[1];
</span><ins>+ JSStringRef replacementString = nullptr;
+ if (argumentCount == 3)
+ replacementString = JSValueToStringCopy(context, arguments[2], exception);
</ins><span class="cx">
</span><del>- JSRetainPtr<JSStringRef> result(Adopt, toAXElement(thisObject)->selectTextWithCriteria(context, ambiguityResolution.get(), searchStrings));
</del><ins>+ JSRetainPtr<JSStringRef> result(Adopt, toAXElement(thisObject)->selectTextWithCriteria(context, ambiguityResolution.get(), searchStrings, replacementString));
+ if (replacementString)
+ JSStringRelease(replacementString);
</ins><span class="cx"> return JSValueMakeString(context, result.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -210,7 +210,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);
</span><span class="cx"> AccessibilityUIElement uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly);
</span><del>- JSStringRef selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings);
</del><ins>+ JSStringRef selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString);
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -1209,7 +1209,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)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-02-11 20:44:03 UTC (rev 163899)
</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)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -245,7 +245,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)
</del><ins>+static NSDictionary *selectTextParameterizedAttributeForCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableDictionary *parameterizedAttribute = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="lines">@@ -277,6 +277,12 @@
</span><span class="cx"> [parameterizedAttribute setObject:searchStringsParameter forKey:@"AXSelectTextSearchStrings"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (replacementString) {
+ [parameterizedAttribute setObject:@"AXSelectTextActivityFindAndReplace" forKey:@"AXSelectTextActivity"];
+ [parameterizedAttribute setObject:[NSString stringWithJSStringRef:replacementString] forKey:@"AXSelectTextReplacementString"];
+ } else
+ [parameterizedAttribute setObject:@"AXSelectTextActivityFindAndSelect" forKey:@"AXSelectTextActivity"];
+
</ins><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1103,10 +1109,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)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings);
</del><ins>+ NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings, replacementString);
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -613,7 +613,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)
</del><ins>+JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -173,7 +173,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) { return 0; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool) { return 0; }
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef, JSValueRef) { return nullptr; }
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef, JSValueRef, 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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -206,7 +206,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);
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly);
</span><del>- JSRetainPtr<JSStringRef> selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings);
</del><ins>+ JSRetainPtr<JSStringRef> selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString);
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -158,7 +158,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);
</span><span class="cx"> [PassContext] AccessibilityUIElement uiElementForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly);
</span><del>- [PassContext] DOMString selectTextWithCriteria(DOMString ambiguityResolution, object searchStrings);
</del><ins>+ [PassContext] DOMString selectTextWithCriteria(DOMString ambiguityResolution, object searchStrings, DOMString replacementString);
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -1308,6 +1308,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
+{
+ // FIXME: implement
+ return nullptr;
+}
+
</ins><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::attributesOfColumnHeaders()
</span><span class="cx"> {
</span><span class="cx"> if (!ATK_IS_TABLE(m_element.get()))
</span><span class="lines">@@ -1794,12 +1800,6 @@
</span><span class="cx"> return stringAtOffset(m_element, ATK_TEXT_BOUNDARY_SENTENCE_START, offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings)
-{
- // FIXME: implement
- return nullptr;
-}
-
</del><span class="cx"> } // namespace WTR
</span><span class="cx">
</span><span class="cx"> #endif // HAVE(ACCESSIBILITY)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings)
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</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 (163898 => 163899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-02-11 20:39:02 UTC (rev 163898)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-02-11 20:44:03 UTC (rev 163899)
</span><span class="lines">@@ -270,7 +270,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)
</del><ins>+static NSDictionary *selectTextParameterizedAttributeForCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableDictionary *parameterizedAttribute = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="lines">@@ -302,6 +302,12 @@
</span><span class="cx"> [parameterizedAttribute setObject:searchStringsParameter forKey:@"AXSelectTextSearchStrings"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (replacementString) {
+ [parameterizedAttribute setObject:@"AXSelectTextActivityFindAndReplace" forKey:@"AXSelectTextActivity"];
+ [parameterizedAttribute setObject:[NSString stringWithJSStringRef:replacementString] forKey:@"AXSelectTextReplacementString"];
+ } else
+ [parameterizedAttribute setObject:@"AXSelectTextActivityFindAndSelect" forKey:@"AXSelectTextActivity"];
+
</ins><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1158,10 +1164,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)
</del><ins>+JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings);
</del><ins>+ NSDictionary *parameterizedAttribute = selectTextParameterizedAttributeForCriteria(context, ambiguityResolution, searchStrings, replacementString);
</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>