<!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>[172270] 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/172270">172270</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 14:26:26 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171996">r171996</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>
<li><a href="#branchessafari6001branchSourceWebCoreeditingFindOptionsh">branches/safari-600.1-branch/Source/WebCore/editing/FindOptions.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreeditingTextIteratorcpp">branches/safari-600.1-branch/Source/WebCore/editing/TextIterator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacaccessibilityselecttextshouldmatchwholewordsexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacaccessibilityselecttextshouldmatchwholewordshtml">branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words.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 (172269 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 21:23:28 UTC (rev 172269)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 21:26:26 UTC (rev 172270)
</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 r171996
+
+ 2014-08-04 Chris Fleizach <cfleizach@apple.com>
+
+ AX: AXSelectTextWithCriteriaParameterizedAttribute incorrectly selects the beginning letters of a word
+ https://bugs.webkit.org/show_bug.cgi?id=135547
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/select-text-should-match-whole-words-expected.txt: Added.
+ * platform/mac/accessibility/select-text-should-match-whole-words.html: Added.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171994
</span><span class="cx">
</span><span class="cx"> 2014-08-04 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacaccessibilityselecttextshouldmatchwholewordsexpectedtxtfromrev171996trunkLayoutTestsplatformmacaccessibilityselecttextshouldmatchwholewordsexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words-expected.txt (from rev 171996, trunk/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words-expected.txt) (0 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words-expected.txt 2014-08-07 21:26:26 UTC (rev 172270)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+The man jumped high.
+
+This tests that selection matches whole words, rather than partial matches.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS result is ''
+PASS windowSelection.getRangeAt(0).startOffset is 0
+PASS windowSelection.getRangeAt(0).endOffset is 0
+PASS result is 'jumped'
+PASS windowSelection.getRangeAt(0).startOffset is 8
+PASS windowSelection.getRangeAt(0).endOffset is 14
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacaccessibilityselecttextshouldmatchwholewordshtmlfromrev171996trunkLayoutTestsplatformmacaccessibilityselecttextshouldmatchwholewordshtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words.html (from rev 171996, trunk/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words.html) (0 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/accessibility/select-text-should-match-whole-words.html 2014-08-07 21:26:26 UTC (rev 172270)
</span><span class="lines">@@ -0,0 +1,48 @@
</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 selection matches whole words, rather than partial matches.");
+
+ if (window.accessibilityController) {
+ var text = accessibilityController.accessibleElementById("text");
+ var windowSelection = window.getSelection();
+ windowSelection.removeAllRanges();
+
+ // A matching range before the selection should be selected when searching for closest match.
+ document.getElementById("text").focus();
+
+ // First find the range before the current selection.
+ var range = document.createRange();
+ range.setStart(document.getElementById("text").firstChild, 0);
+ range.setEnd(document.getElementById("text").firstChild, 0);
+ windowSelection.addRange(range);
+
+ // Try to select a partial word, it should fail.
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "jump");
+ shouldBe("result", "''");
+ shouldBe("windowSelection.getRangeAt(0).startOffset", "0");
+ shouldBe("windowSelection.getRangeAt(0).endOffset", "0");
+
+ // Select the whole word, it should succeed.
+ result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "jumped");
+ shouldBe("result", "'jumped'");
+ shouldBe("windowSelection.getRangeAt(0).startOffset", "8");
+ shouldBe("windowSelection.getRangeAt(0).endOffset", "14");
+
+ }
+</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 (172269 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 21:23:28 UTC (rev 172269)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 21:26:26 UTC (rev 172270)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171996
+
+ 2014-08-04 Chris Fleizach <cfleizach@apple.com>
+
+ AX: AXSelectTextWithCriteriaParameterizedAttribute incorrectly selects the beginning letters of a word
+ https://bugs.webkit.org/show_bug.cgi?id=135547
+
+ Reviewed by Mario Sanchez Prada.
+
+ Allow text search to specify that it wants to match end of words as well as start of words.
+ This allows select text criteria to match on whole words only.
+
+ Test: platform/mac/accessibility/select-text-should-match-whole-words.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::rangeOfStringClosestToRangeInDirection):
+ * editing/FindOptions.h:
+ * editing/TextIterator.cpp:
+ (WebCore::SearchBuffer::isWordEndMatch):
+ (WebCore::SearchBuffer::search):
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171994
</span><span class="cx">
</span><span class="cx"> 2014-08-04 Chris Fleizach <cfleizach@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 (172269 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-07 21:23:28 UTC (rev 172269)
+++ branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-07 21:26:26 UTC (rev 172270)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> bool isBackwardSearch = searchDirection == SearchDirectionPrevious;
</span><del>- FindOptions findOptions = AtWordStarts | CaseInsensitive | StartInSelection;
</del><ins>+ FindOptions findOptions = AtWordStarts | AtWordEnds | CaseInsensitive | StartInSelection;
</ins><span class="cx"> if (isBackwardSearch)
</span><span class="cx"> findOptions |= Backwards;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreeditingFindOptionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/editing/FindOptions.h (172269 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/editing/FindOptions.h 2014-08-07 21:23:28 UTC (rev 172269)
+++ branches/safari-600.1-branch/Source/WebCore/editing/FindOptions.h 2014-08-07 21:26:26 UTC (rev 172270)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx"> Backwards = 1 << 3,
</span><span class="cx"> WrapAround = 1 << 4,
</span><span class="cx"> StartInSelection = 1 << 5,
</span><del>- DoNotRevealSelection = 1 << 6
</del><ins>+ DoNotRevealSelection = 1 << 6,
+ AtWordEnds = 1 << 7
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef unsigned char FindOptions;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/editing/TextIterator.cpp (172269 => 172270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/editing/TextIterator.cpp 2014-08-07 21:23:28 UTC (rev 172269)
+++ branches/safari-600.1-branch/Source/WebCore/editing/TextIterator.cpp 2014-08-07 21:26:26 UTC (rev 172270)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> private:
</span><span class="cx"> bool isBadMatch(const UChar*, size_t length) const;
</span><span class="cx"> bool isWordStartMatch(size_t start, size_t length) const;
</span><ins>+ bool isWordEndMatch(size_t start, size_t length) const;
</ins><span class="cx">
</span><span class="cx"> const String m_target;
</span><span class="cx"> const StringView::UpconvertedCharacters m_targetCharacters;
</span><span class="lines">@@ -2117,7 +2118,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+inline bool SearchBuffer::isWordEndMatch(size_t start, size_t length) const
+{
+ ASSERT(m_options & AtWordEnds);
</ins><span class="cx">
</span><ins>+ int endWord;
+ findEndWordBoundary(StringView(m_buffer.data(), m_buffer.size()), start, &endWord);
+ return static_cast<size_t>(endWord) == (start + length);
+}
+
</ins><span class="cx"> inline bool SearchBuffer::isWordStartMatch(size_t start, size_t length) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_options & AtWordStarts);
</span><span class="lines">@@ -2225,7 +2235,9 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(matchStart + matchedLength <= size);
</span><span class="cx">
</span><span class="cx"> // If this match is "bad", move on to the next match.
</span><del>- if (isBadMatch(m_buffer.data() + matchStart, matchedLength) || ((m_options & AtWordStarts) && !isWordStartMatch(matchStart, matchedLength))) {
</del><ins>+ if (isBadMatch(m_buffer.data() + matchStart, matchedLength)
+ || ((m_options & AtWordStarts) && !isWordStartMatch(matchStart, matchedLength))
+ || ((m_options & AtWordEnds) && !isWordEndMatch(matchStart, matchedLength))) {
</ins><span class="cx"> matchStart = usearch_next(searcher, &status);
</span><span class="cx"> ASSERT(status == U_ZERO_ERROR);
</span><span class="cx"> goto nextMatch;
</span></span></pre>
</div>
</div>
</body>
</html>