<!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>[196699] 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/196699">196699</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-02-17 10:16:50 -0800 (Wed, 17 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Implement sentence related text marker functions using TextIterator
https://bugs.webkit.org/show_bug.cgi?id=154312
Reviewed by Chris Fleizach.
Source/WebCore:
Using CharacterOffset to implement sentence related text marker calls. Reused
logic from VisibleUnits class. Also fixed an issue where paragraph navigation
should skip preceding and following BR nodes.
Test: accessibility/mac/text-marker-sentence-nav.html
* accessibility/AXObjectCache.cpp:
(WebCore::resetNodeAndOffsetForReplacedNode):
(WebCore::setRangeStartOrEndWithCharacterOffset):
(WebCore::AXObjectCache::characterOffsetForNodeAndOffset):
(WebCore::AXObjectCache::previousCharacterOffset):
(WebCore::AXObjectCache::startCharacterOffsetOfWord):
(WebCore::AXObjectCache::endCharacterOffsetOfWord):
(WebCore::AXObjectCache::previousWordStartCharacterOffset):
(WebCore::AXObjectCache::leftWordRange):
(WebCore::AXObjectCache::rightWordRange):
(WebCore::AXObjectCache::characterBefore):
(WebCore::characterOffsetNodeIsBR):
(WebCore::parentEditingBoundary):
(WebCore::AXObjectCache::nextBoundary):
(WebCore::AXObjectCache::previousBoundary):
(WebCore::AXObjectCache::paragraphForCharacterOffset):
(WebCore::AXObjectCache::nextParagraphEndCharacterOffset):
(WebCore::AXObjectCache::previousParagraphStartCharacterOffset):
(WebCore::AXObjectCache::startCharacterOffsetOfSentence):
(WebCore::AXObjectCache::endCharacterOffsetOfSentence):
(WebCore::AXObjectCache::sentenceForCharacterOffset):
(WebCore::AXObjectCache::nextSentenceEndCharacterOffset):
(WebCore::AXObjectCache::previousSentenceStartCharacterOffset):
(WebCore::AXObjectCache::rootAXEditableElement):
(WebCore::startWordBoundary): Deleted.
(WebCore::endWordBoundary): Deleted.
(WebCore::AXObjectCache::nextWordBoundary): Deleted.
(WebCore::AXObjectCache::previousWordBoundary): Deleted.
* accessibility/AXObjectCache.h:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
* editing/VisibleUnits.cpp:
(WebCore::startWordBoundary):
(WebCore::startOfWord):
(WebCore::endWordBoundary):
(WebCore::startSentenceBoundary):
(WebCore::startOfSentence):
(WebCore::endSentenceBoundary):
* editing/VisibleUnits.h:
Tools:
* DumpRenderTree/AccessibilityUIElement.cpp:
(nextParagraphEndTextMarkerForTextMarkerCallback):
(sentenceTextMarkerRangeForTextMarkerCallback):
(previousSentenceStartTextMarkerForTextMarkerCallback):
(nextSentenceEndTextMarkerForTextMarkerCallback):
(setSelectedVisibleTextRangeCallback):
(AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
(AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
(AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
(AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
(AccessibilityUIElement::getJSClass):
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
(AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
(AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
(AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
(AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
(AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
(AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
(AccessibilityUIElement::supportedActions):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::paragraphTextMarkerRangeForTextMarker):
(WTR::AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::previousParagraphStartTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
(WTR::AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::previousParagraphStartTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
(WTR::AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::mathPostscriptsDescription):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
(WTR::AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
(WTR::AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
(WTR::_convertMathMultiscriptPairsToString):
LayoutTests:
* accessibility/mac/text-marker-paragraph-nav-expected.txt:
* accessibility/mac/text-marker-paragraph-nav.html:
* accessibility/mac/text-marker-sentence-nav-expected.txt: Added.
* accessibility/mac/text-marker-sentence-nav.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymactextmarkerparagraphnavexpectedtxt">trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymactextmarkerparagraphnavhtml">trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCacheh">trunk/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitsh">trunk/Source/WebCore/editing/VisibleUnits.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="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</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="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymactextmarkersentencenavexpectedtxt">trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymactextmarkersentencenavhtml">trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/LayoutTests/ChangeLog 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-02-17 Nan Wang <n_wang@apple.com>
+
+ AX: Implement sentence related text marker functions using TextIterator
+ https://bugs.webkit.org/show_bug.cgi?id=154312
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/text-marker-paragraph-nav-expected.txt:
+ * accessibility/mac/text-marker-paragraph-nav.html:
+ * accessibility/mac/text-marker-sentence-nav-expected.txt: Added.
+ * accessibility/mac/text-marker-sentence-nav.html: Added.
+
</ins><span class="cx"> 2016-02-17 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Adding an ios-specific baseline for accessibility/ios-simulator/centerpoint.html during failure investigation
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymactextmarkerparagraphnavexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav-expected.txt (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav-expected.txt 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav-expected.txt 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -10,6 +10,8 @@
</span><span class="cx"> some
</span><span class="cx"> text
</span><span class="cx"> this is my first paragraph. Of text. it has some text.
</span><ins>+
+
</ins><span class="cx"> this is my second paragraph. Of text. it has some text.
</span><span class="cx"> this is my third paragraph. Of text. it has some text.
</span><span class="cx">
</span><span class="lines">@@ -68,10 +70,14 @@
</span><span class="cx"> Pre paragraph start to next paragraph end: text
</span><span class="cx">
</span><span class="cx"> Paragraph: this is my first paragraph. Of text. it has some text.
</span><ins>+Paragraph:
+Paragraph:
</ins><span class="cx"> Paragraph: this is my second paragraph. Of text. it has some text.
</span><span class="cx"> Paragraph: this is my third paragraph. Of text. it has some text.
</span><span class="cx"> Paragraph: this is my third paragraph. Of text. it has some text.
</span><span class="cx"> Paragraph: this is my second paragraph. Of text. it has some text.
</span><ins>+Paragraph:
+Paragraph:
</ins><span class="cx"> Paragraph: this is my first paragraph. Of text. it has some text.
</span><span class="cx"> Test going forward.
</span><span class="cx"> End paragraph: text
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymactextmarkerparagraphnavhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav.html (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav.html 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav.html 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> some<br>text
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div id="text9">this is my first paragraph. Of text. it has some text.<br>
</del><ins>+<div id="text9">this is my first paragraph. Of text. it has some text.<br><br><br>
</ins><span class="cx"> this is my second paragraph. Of text. it has some text.<br>
</span><span class="cx"> this is my third paragraph. Of text. it has some text.<br><br>
</span><span class="cx"> </div>
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
</span><span class="cx"> startMarker = text.nextTextMarker(startMarker);
</span><span class="cx"> var endMarker = text.endTextMarkerForTextMarkerRange(textMarkerRange);
</span><del>- verifyParagraphs(text, startMarker, 3);
</del><ins>+ verifyParagraphs(text, startMarker, 5);
</ins><span class="cx">
</span><span class="cx"> // Check the paragraph marker runs from start to end, and backwards.
</span><span class="cx"> // Make sure it won't hang.
</span><span class="lines">@@ -160,26 +160,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function verifyParagraphs(obj, startMarker, paragraphCount) {
</span><del>- // Move to the end of first paragraph, so the first paragraph
- // won't print twice.
- var current = obj.nextParagraphEndTextMarkerForTextMarker(startMarker);
</del><ins>+ var current = startMarker;
</ins><span class="cx"> var i = 0;
</span><span class="cx"> while(i < paragraphCount) {
</span><ins>+ current = obj.nextParagraphEndTextMarkerForTextMarker(current);
</ins><span class="cx"> var currRange = obj.paragraphTextMarkerRangeForTextMarker(current);
</span><span class="cx"> var currParagraph = obj.stringForTextMarkerRange(currRange);
</span><span class="cx"> debug("Paragraph: " + currParagraph);
</span><del>- current = obj.nextParagraphEndTextMarkerForTextMarker(current);
</del><span class="cx"> i++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Backwards.
</span><del>- current = obj.previousParagraphStartTextMarkerForTextMarker(current);
</del><span class="cx"> i = 0;
</span><span class="cx"> while(i < paragraphCount) {
</span><ins>+ current = obj.previousParagraphStartTextMarkerForTextMarker(current);
</ins><span class="cx"> var currRange = obj.paragraphTextMarkerRangeForTextMarker(current);
</span><span class="cx"> var currParagraph = obj.stringForTextMarkerRange(currRange);
</span><span class="cx"> debug("Paragraph: " + currParagraph);
</span><del>- current = obj.previousParagraphStartTextMarkerForTextMarker(current);
</del><span class="cx"> i++;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymactextmarkersentencenavexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav-expected.txt (0 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav-expected.txt 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+This is a sentence, right? Yes!
+test audio file.
+巧克力 是食物吗? 是的。
+كيف حالك؟
+both spaces
+line breaks. Right?
+This is my first sentence.
+
+This is my second sentence. This is my third sentence. This is my fourth sentence.
+This tests that sentence navigation is working correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Current character is: T
+Current sentence is: This is a sentence, right?
+Pre sentence start to next sentence end: This is a sentence, right?
+
+Current character is: t
+Current sentence is: test audio [ATTACHMENT]file.
+Pre sentence start to next sentence end: test audio [ATTACHMENT]file.
+
+Current character is: 巧
+Current sentence is: 巧克力 是食物吗?
+Pre sentence start to next sentence end: 巧克力 是食物吗?
+
+Current character is: ك
+Current sentence is: كيف حالك؟
+Pre sentence start to next sentence end: كيف حالك؟
+
+Current character is: b
+Current sentence is: both spaces
+Pre sentence start to next sentence end: both spaces
+
+Current character is: i
+Current sentence is: line breaks.
+Pre sentence start to next sentence end: line breaks.
+
+Sentence: This is my first sentence.
+Sentence:
+Sentence: This is my second sentence.
+Sentence: This is my third sentence.
+Sentence: This is my fourth sentence.
+Sentence: This is my fourth sentence.
+Sentence: This is my third sentence.
+Sentence: This is my second sentence.
+Sentence:
+Sentence: This is my first sentence.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymactextmarkersentencenavhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav.html (0 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav.html 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -0,0 +1,141 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="text1" tabindex="0">
+This i<span>s a sen</span>tence,
+right? Yes!
+</div>
+
+<div id="text2">
+test audio <audio controls><source src="test.mp3" type="audio/mpeg"></audio>file.
+</div>
+
+<div id="text3">
+巧克力
+是食物吗? 是的。
+</div>
+
+<div id="text3a">
+كيف حالك؟
+</div>
+
+<pre id="text4">
+both spaces
+line breaks. Right?
+</pre>
+
+<div id="text5">
+This is my first sentence. <br><br>
+This is my second sentence. This is my third sentence.
+This is my fourth sentence.
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that sentence navigation is working correctly.");
+
+ if (window.accessibilityController) {
+
+ // Check that we can get the paragraph range with span tag.
+ var text = accessibilityController.accessibleElementById("text1");
+ var textMarkerRange = text.textMarkerRangeForElement(text);
+ var startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
+ var currentMarker = advanceAndVerify(startMarker, 1, text);
+
+ // Audio tag.
+ text = accessibilityController.accessibleElementById("text2");
+ textMarkerRange = text.textMarkerRangeForElement(text);
+ startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
+ currentMarker = advanceAndVerify(startMarker, 1, text);
+
+ // Multi-languages.
+ text = accessibilityController.accessibleElementById("text3");
+ textMarkerRange = text.textMarkerRangeForElement(text);
+ startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
+ currentMarker = advanceAndVerify(startMarker, 1, text);
+
+ text = accessibilityController.accessibleElementById("text3a");
+ textMarkerRange = text.textMarkerRangeForElement(text);
+ startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
+ currentMarker = advanceAndVerify(startMarker, 1, text);
+
+ // Check the case with pre tag.
+ text = accessibilityController.accessibleElementById("text4");
+ textMarkerRange = text.textMarkerRangeForElement(text);
+ startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
+ currentMarker = advanceAndVerify(startMarker, 1, text);
+ currentMarker = advanceAndVerify(currentMarker, 15, text);
+
+ // Check getting the correct sentences.
+ text = accessibilityController.accessibleElementById("text5");
+ textMarkerRange = text.textMarkerRangeForElement(text);
+ startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
+ verifySentences(text, startMarker, 5);
+
+ function advanceAndVerify(currentMarker, offset, obj) {
+ var previousMarker = currentMarker;
+ for (var i = 0; i < offset; i++) {
+ previousMarker = currentMarker;
+ currentMarker = obj.nextTextMarker(previousMarker);
+ }
+ verifySentenceRangeForTextMarker(previousMarker, currentMarker, obj);
+ return currentMarker;
+ }
+
+ function replaceAttachmentInString(str) {
+ str = str.replace(String.fromCharCode(65532), "[ATTACHMENT]");
+ return str;
+ }
+
+ function verifySentenceRangeForTextMarker(preMarker, textMarker, obj) {
+ var markerRange = obj.textMarkerRangeForMarkers(preMarker, textMarker);
+ var currentCharacter = replaceAttachmentInString(obj.stringForTextMarkerRange(markerRange));
+ debug("Current character is: " + currentCharacter);
+
+ var range = obj.sentenceTextMarkerRangeForTextMarker(textMarker);
+ var sentence = replaceAttachmentInString(obj.stringForTextMarkerRange(range));
+ debug("Current sentence is: " + sentence);
+
+ var preStart = obj.previousSentenceStartTextMarkerForTextMarker(textMarker);
+ var nextEnd = obj.nextSentenceEndTextMarkerForTextMarker(textMarker);
+ var preAndNextSentenceRange = obj.textMarkerRangeForMarkers(preStart, nextEnd);
+ var preAndNextSentence = replaceAttachmentInString(obj.stringForTextMarkerRange(preAndNextSentenceRange));
+ debug("Pre sentence start to next sentence end: " + preAndNextSentence + "\n");
+ }
+
+ function verifySentences(obj, startMarker, sentenceCount) {
+ var current = startMarker;
+ var i = 0;
+ while(i < sentenceCount) {
+ current = obj.nextSentenceEndTextMarkerForTextMarker(current);
+ var currRange = obj.sentenceTextMarkerRangeForTextMarker(current);
+ var currSentence = obj.stringForTextMarkerRange(currRange);
+ debug("Sentence: " + currSentence);
+ i++;
+ }
+
+ // Backwards.
+ i = 0;
+ while(i < sentenceCount) {
+ current = obj.previousSentenceStartTextMarkerForTextMarker(current);
+ var next = obj.nextTextMarker(current);
+ var currRange = obj.sentenceTextMarkerRangeForTextMarker(next);
+ var currSentence = obj.stringForTextMarkerRange(currRange);
+ debug("Sentence: " + currSentence);
+ i++;
+ }
+ }
+ }
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Source/WebCore/ChangeLog 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2016-02-17 Nan Wang <n_wang@apple.com>
+
+ AX: Implement sentence related text marker functions using TextIterator
+ https://bugs.webkit.org/show_bug.cgi?id=154312
+
+ Reviewed by Chris Fleizach.
+
+ Using CharacterOffset to implement sentence related text marker calls. Reused
+ logic from VisibleUnits class. Also fixed an issue where paragraph navigation
+ should skip preceding and following BR nodes.
+
+ Test: accessibility/mac/text-marker-sentence-nav.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::resetNodeAndOffsetForReplacedNode):
+ (WebCore::setRangeStartOrEndWithCharacterOffset):
+ (WebCore::AXObjectCache::characterOffsetForNodeAndOffset):
+ (WebCore::AXObjectCache::previousCharacterOffset):
+ (WebCore::AXObjectCache::startCharacterOffsetOfWord):
+ (WebCore::AXObjectCache::endCharacterOffsetOfWord):
+ (WebCore::AXObjectCache::previousWordStartCharacterOffset):
+ (WebCore::AXObjectCache::leftWordRange):
+ (WebCore::AXObjectCache::rightWordRange):
+ (WebCore::AXObjectCache::characterBefore):
+ (WebCore::characterOffsetNodeIsBR):
+ (WebCore::parentEditingBoundary):
+ (WebCore::AXObjectCache::nextBoundary):
+ (WebCore::AXObjectCache::previousBoundary):
+ (WebCore::AXObjectCache::paragraphForCharacterOffset):
+ (WebCore::AXObjectCache::nextParagraphEndCharacterOffset):
+ (WebCore::AXObjectCache::previousParagraphStartCharacterOffset):
+ (WebCore::AXObjectCache::startCharacterOffsetOfSentence):
+ (WebCore::AXObjectCache::endCharacterOffsetOfSentence):
+ (WebCore::AXObjectCache::sentenceForCharacterOffset):
+ (WebCore::AXObjectCache::nextSentenceEndCharacterOffset):
+ (WebCore::AXObjectCache::previousSentenceStartCharacterOffset):
+ (WebCore::AXObjectCache::rootAXEditableElement):
+ (WebCore::startWordBoundary): Deleted.
+ (WebCore::endWordBoundary): Deleted.
+ (WebCore::AXObjectCache::nextWordBoundary): Deleted.
+ (WebCore::AXObjectCache::previousWordBoundary): Deleted.
+ * accessibility/AXObjectCache.h:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+ * editing/VisibleUnits.cpp:
+ (WebCore::startWordBoundary):
+ (WebCore::startOfWord):
+ (WebCore::endWordBoundary):
+ (WebCore::startSentenceBoundary):
+ (WebCore::startOfSentence):
+ (WebCore::endSentenceBoundary):
+ * editing/VisibleUnits.h:
+
</ins><span class="cx"> 2016-02-17 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] GridSpan refactoring
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1609,7 +1609,7 @@
</span><span class="cx"> return replacedNode->parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setRangeStartOrEndWithCharacterOffset(RefPtr<Range> range, CharacterOffset& characterOffset, bool isStart, ExceptionCode& ec)
</del><ins>+static void setRangeStartOrEndWithCharacterOffset(RefPtr<Range> range, const CharacterOffset& characterOffset, bool isStart, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!range) {
</span><span class="cx"> ec = RangeError;
</span><span class="lines">@@ -1738,11 +1738,11 @@
</span><span class="cx"> charOffset = characterOffsetForNodeAndOffset(*domNode, 0, TraverseOptionToNodeEnd);
</span><span class="cx"> } else
</span><span class="cx"> return CharacterOffset();
</span><del>- if (!offset)
</del><ins>+ if (charOffset.offset == offset)
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (offset > 0)
</span><del>- charOffset = characterOffsetForNodeAndOffset(*charOffset.node, charOffset.offset - offset);
</del><ins>+ charOffset = characterOffsetForNodeAndOffset(*charOffset.node, charOffset.offset - offset, TraverseOptionIncludeStart);
</ins><span class="cx"> return charOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1919,33 +1919,6 @@
</span><span class="cx"> return characterOffsetForNodeAndOffset(*characterOffset.node, characterOffset.offset - 1, ignoreStart ? TraverseOptionDefault : TraverseOptionIncludeStart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned startWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
-{
- ASSERT(offset);
- if (mayHaveMoreContext && !startOfLastWordBoundaryContext(text.substring(0, offset))) {
- needMoreContext = true;
- return 0;
- }
- needMoreContext = false;
- int start, end;
- U16_BACK_1(text, 0, offset);
- findWordBoundary(text, offset, &start, &end);
- return start;
-}
-
-static unsigned endWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
-{
- ASSERT(offset <= text.length());
- if (mayHaveMoreContext && endOfFirstWordBoundaryContext(text.substring(offset)) == text.length() - offset) {
- needMoreContext = true;
- return text.length();
- }
- needMoreContext = false;
- int end;
- findEndWordBoundary(text, offset, &end);
- return end;
-}
-
</del><span class="cx"> CharacterOffset AXObjectCache::startCharacterOffsetOfWord(const CharacterOffset& characterOffset, EWordSide side)
</span><span class="cx"> {
</span><span class="cx"> if (characterOffset.isNull())
</span><span class="lines">@@ -1962,7 +1935,7 @@
</span><span class="cx"> return characterOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return previousWordBoundary(c, startWordBoundary);
</del><ins>+ return previousBoundary(c, startWordBoundary);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CharacterOffset AXObjectCache::endCharacterOffsetOfWord(const CharacterOffset& characterOffset, EWordSide side)
</span><span class="lines">@@ -1981,7 +1954,7 @@
</span><span class="cx"> return characterOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return nextWordBoundary(c, endWordBoundary);
</del><ins>+ return nextBoundary(c, endWordBoundary);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CharacterOffset AXObjectCache::previousWordStartCharacterOffset(const CharacterOffset& characterOffset)
</span><span class="lines">@@ -2010,7 +1983,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> AXObjectCache::leftWordRange(const CharacterOffset& characterOffset)
</span><span class="cx"> {
</span><del>- CharacterOffset start = previousWordStartCharacterOffset(characterOffset);
</del><ins>+ CharacterOffset start = startCharacterOffsetOfWord(characterOffset, LeftWordIfOnBoundary);
</ins><span class="cx"> CharacterOffset end = endCharacterOffsetOfWord(start);
</span><span class="cx"> return rangeForUnorderedCharacterOffsets(start, end);
</span><span class="cx"> }
</span><span class="lines">@@ -2018,7 +1991,7 @@
</span><span class="cx"> RefPtr<Range> AXObjectCache::rightWordRange(const CharacterOffset& characterOffset)
</span><span class="cx"> {
</span><span class="cx"> CharacterOffset start = startCharacterOffsetOfWord(characterOffset);
</span><del>- CharacterOffset end = nextWordEndCharacterOffset(start);
</del><ins>+ CharacterOffset end = endCharacterOffsetOfWord(start);
</ins><span class="cx"> return rangeForUnorderedCharacterOffsets(start, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2043,7 +2016,15 @@
</span><span class="cx"> {
</span><span class="cx"> return characterForCharacterOffset(characterOffset);
</span><span class="cx"> }
</span><ins>+
+static bool characterOffsetNodeIsBR(const CharacterOffset& characterOffset)
+{
+ if (characterOffset.isNull())
+ return false;
</ins><span class="cx">
</span><ins>+ return characterOffset.node->hasTagName(brTag);
+}
+
</ins><span class="cx"> static Node* parentEditingBoundary(Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -2060,7 +2041,7 @@
</span><span class="cx"> return boundary;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CharacterOffset AXObjectCache::nextWordBoundary(CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
</del><ins>+CharacterOffset AXObjectCache::nextBoundary(const CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (characterOffset.isNull())
</span><span class="cx"> return CharacterOffset();
</span><span class="lines">@@ -2092,13 +2073,18 @@
</span><span class="cx">
</span><span class="cx"> if (it.atEnd() && next == string.size())
</span><span class="cx"> return end;
</span><ins>+
+ // The endSentenceBoundary function will include a line break at the end of the sentence.
+ if (searchFunction == endSentenceBoundary && string[next - 1] == '\n')
+ next--;
+
</ins><span class="cx"> if (next > prefixLength)
</span><span class="cx"> return characterOffsetForNodeAndOffset(*characterOffset.node, characterOffset.offset + next - prefixLength);
</span><span class="cx">
</span><span class="cx"> return characterOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CharacterOffset AXObjectCache::previousWordBoundary(CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
</del><ins>+CharacterOffset AXObjectCache::previousBoundary(const CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (characterOffset.isNull())
</span><span class="cx"> return CharacterOffset();
</span><span class="lines">@@ -2141,6 +2127,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int characterCount = characterOffset.offset - (string.size() - suffixLength - next);
</span><ins>+ // We don't want to go to the previous node if the node is at the start of a new line.
+ if (characterCount < 0 && (characterOffsetNodeIsBR(characterOffset) || string[string.size() - 1] == '\n'))
+ characterCount = 0;
</ins><span class="cx"> return characterOffsetForNodeAndOffset(*characterOffset.node, characterCount, TraverseOptionIncludeStart);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2198,7 +2187,7 @@
</span><span class="cx"> RefPtr<Range> AXObjectCache::paragraphForCharacterOffset(const CharacterOffset& characterOffset)
</span><span class="cx"> {
</span><span class="cx"> CharacterOffset start = startCharacterOffsetOfParagraph(characterOffset);
</span><del>- CharacterOffset end = endCharacterOffsetOfParagraph(characterOffset);
</del><ins>+ CharacterOffset end = endCharacterOffsetOfParagraph(start);
</ins><span class="cx">
</span><span class="cx"> return rangeForUnorderedCharacterOffsets(start, end);
</span><span class="cx"> }
</span><span class="lines">@@ -2206,15 +2195,62 @@
</span><span class="cx"> CharacterOffset AXObjectCache::nextParagraphEndCharacterOffset(const CharacterOffset& characterOffset)
</span><span class="cx"> {
</span><span class="cx"> // make sure we move off of a paragraph end
</span><del>- return endCharacterOffsetOfParagraph(nextCharacterOffset(characterOffset));
</del><ins>+ CharacterOffset next = nextCharacterOffset(characterOffset);
+
+ // We should skip the following BR node.
+ if (characterOffsetNodeIsBR(next) && !characterOffsetNodeIsBR(characterOffset))
+ next = nextCharacterOffset(next);
+
+ return endCharacterOffsetOfParagraph(next);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CharacterOffset AXObjectCache::previousParagraphStartCharacterOffset(const CharacterOffset& characterOffset)
</span><span class="cx"> {
</span><span class="cx"> // make sure we move off of a paragraph start
</span><del>- return startCharacterOffsetOfParagraph(previousCharacterOffset(characterOffset, false));
</del><ins>+ CharacterOffset previous = previousCharacterOffset(characterOffset, false);
+
+ // We should skip the preceding BR node.
+ if (characterOffsetNodeIsBR(previous) && !characterOffsetNodeIsBR(characterOffset))
+ previous = previousCharacterOffset(previous, false);
+
+ return startCharacterOffsetOfParagraph(previous);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+CharacterOffset AXObjectCache::startCharacterOffsetOfSentence(const CharacterOffset& characterOffset)
+{
+ return previousBoundary(characterOffset, startSentenceBoundary);
+}
+
+CharacterOffset AXObjectCache::endCharacterOffsetOfSentence(const CharacterOffset& characterOffset)
+{
+ return nextBoundary(characterOffset, endSentenceBoundary);
+}
+
+RefPtr<Range> AXObjectCache::sentenceForCharacterOffset(const CharacterOffset& characterOffset)
+{
+ CharacterOffset start = startCharacterOffsetOfSentence(characterOffset);
+ CharacterOffset end = endCharacterOffsetOfSentence(start);
+ return rangeForUnorderedCharacterOffsets(start, end);
+}
+
+CharacterOffset AXObjectCache::nextSentenceEndCharacterOffset(const CharacterOffset& characterOffset)
+{
+ // Make sure we move off of a sentence end.
+ return endCharacterOffsetOfSentence(nextCharacterOffset(characterOffset));
+}
+
+CharacterOffset AXObjectCache::previousSentenceStartCharacterOffset(const CharacterOffset& characterOffset)
+{
+ // Make sure we move off of a sentence start.
+ CharacterOffset previous = previousCharacterOffset(characterOffset, false);
+
+ // We should skip the preceding BR node.
+ if (!previous.isNull() && previous.node->hasTagName(brTag) && !characterOffset.node->hasTagName(brTag))
+ previous = previousCharacterOffset(previous, false);
+
+ return startCharacterOffsetOfSentence(previous);
+}
+
</ins><span class="cx"> const Element* AXObjectCache::rootAXEditableElement(const Node* node)
</span><span class="cx"> {
</span><span class="cx"> const Element* result = node->rootEditableElement();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.h 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -214,6 +214,11 @@
</span><span class="cx"> RefPtr<Range> paragraphForCharacterOffset(const CharacterOffset&);
</span><span class="cx"> CharacterOffset nextParagraphEndCharacterOffset(const CharacterOffset&);
</span><span class="cx"> CharacterOffset previousParagraphStartCharacterOffset(const CharacterOffset&);
</span><ins>+
+ // Sentence
+ RefPtr<Range> sentenceForCharacterOffset(const CharacterOffset&);
+ CharacterOffset nextSentenceEndCharacterOffset(const CharacterOffset&);
+ CharacterOffset previousSentenceStartCharacterOffset(const CharacterOffset&);
</ins><span class="cx">
</span><span class="cx"> enum AXNotification {
</span><span class="cx"> AXActiveDescendantChanged,
</span><span class="lines">@@ -317,12 +322,14 @@
</span><span class="cx"> UChar32 characterBefore(const CharacterOffset&);
</span><span class="cx"> CharacterOffset startOrEndCharacterOffsetForRange(RefPtr<Range>, bool);
</span><span class="cx"> CharacterOffset characterOffsetForNodeAndOffset(Node&, int, TraverseOption = TraverseOptionDefault);
</span><del>- CharacterOffset previousWordBoundary(CharacterOffset&, BoundarySearchFunction);
- CharacterOffset nextWordBoundary(CharacterOffset&, BoundarySearchFunction);
</del><ins>+ CharacterOffset previousBoundary(const CharacterOffset&, BoundarySearchFunction);
+ CharacterOffset nextBoundary(const CharacterOffset&, BoundarySearchFunction);
</ins><span class="cx"> CharacterOffset startCharacterOffsetOfWord(const CharacterOffset&, EWordSide = RightWordIfOnBoundary);
</span><span class="cx"> CharacterOffset endCharacterOffsetOfWord(const CharacterOffset&, EWordSide = RightWordIfOnBoundary);
</span><span class="cx"> CharacterOffset startCharacterOffsetOfParagraph(const CharacterOffset&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
</span><span class="cx"> CharacterOffset endCharacterOffsetOfParagraph(const CharacterOffset&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
</span><ins>+ CharacterOffset startCharacterOffsetOfSentence(const CharacterOffset&);
+ CharacterOffset endCharacterOffsetOfSentence(const CharacterOffset&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> AccessibilityObject* rootWebArea();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -4112,9 +4112,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:@"AXSentenceTextMarkerRangeForTextMarker"]) {
</span><del>- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- VisiblePositionRange vpRange = m_object->sentenceForPosition(visiblePos);
- return [self textMarkerRangeFromVisiblePositions:vpRange.start endPosition:vpRange.end];
</del><ins>+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ RefPtr<Range> range = cache->sentenceForCharacterOffset(characterOffset);
+ return [self textMarkerRangeFromRange:range];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:@"AXParagraphTextMarkerRangeForTextMarker"]) {
</span><span class="lines">@@ -4155,18 +4158,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:@"AXNextSentenceEndTextMarkerForTextMarker"]) {
</span><del>- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- return [self textMarkerForVisiblePosition:m_object->nextSentenceEndPosition(visiblePos)];
</del><ins>+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ CharacterOffset nextEnd = cache->nextSentenceEndCharacterOffset(characterOffset);
+ return [self textMarkerForCharacterOffset:nextEnd];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:@"AXPreviousSentenceStartTextMarkerForTextMarker"]) {
</span><del>- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- return [self textMarkerForVisiblePosition:m_object->previousSentenceStartPosition(visiblePos)];
</del><ins>+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ CharacterOffset previousStart = cache->previousSentenceStartCharacterOffset(characterOffset);
+ return [self textMarkerForCharacterOffset:previousStart];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:@"AXNextParagraphEndTextMarkerForTextMarker"]) {
</span><del>- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- return [self textMarkerForVisiblePosition:m_object->nextParagraphEndPosition(visiblePos)];
</del><ins>+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ CharacterOffset nextEnd = cache->nextParagraphEndCharacterOffset(characterOffset);
+ return [self textMarkerForCharacterOffset:nextEnd];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:@"AXPreviousParagraphStartTextMarkerForTextMarker"]) {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx">
</span><span class="cx"> // ---------
</span><span class="cx">
</span><del>-static unsigned startWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
</del><ins>+unsigned startWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(offset);
</span><span class="cx"> if (mayHaveMoreContext && !startOfLastWordBoundaryContext(text.substring(0, offset))) {
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> return previousBoundary(p, startWordBoundary);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned endWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
</del><ins>+unsigned endWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(offset <= text.length());
</span><span class="cx"> if (mayHaveMoreContext && endOfFirstWordBoundaryContext(text.substring(offset)) == text.length() - offset) {
</span><span class="lines">@@ -1096,7 +1096,7 @@
</span><span class="cx">
</span><span class="cx"> // ---------
</span><span class="cx">
</span><del>-static unsigned startSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
</del><ins>+unsigned startSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: The following function can return -1; we don't handle that.
</span><span class="cx"> return textBreakPreceding(sentenceBreakIterator(text), text.length());
</span><span class="lines">@@ -1107,7 +1107,7 @@
</span><span class="cx"> return previousBoundary(position, startSentenceBoundary);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned endSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
</del><ins>+unsigned endSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
</ins><span class="cx"> {
</span><span class="cx"> return textBreakNext(sentenceBreakIterator(text));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.h (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.h 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Source/WebCore/editing/VisibleUnits.h 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -112,6 +112,10 @@
</span><span class="cx"> // helper function
</span><span class="cx"> enum BoundarySearchContextAvailability { DontHaveMoreContext, MayHaveMoreContext };
</span><span class="cx"> typedef unsigned (*BoundarySearchFunction)(StringView, unsigned offset, BoundarySearchContextAvailability, bool& needMoreContext);
</span><ins>+unsigned startWordBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
+unsigned endWordBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
+unsigned startSentenceBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
+unsigned endSentenceBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
</ins><span class="cx"> unsigned suffixLengthForRange(RefPtr<Range>, Vector<UChar, 1024>&);
</span><span class="cx"> unsigned prefixLengthForRange(RefPtr<Range>, Vector<UChar, 1024>&);
</span><span class="cx"> unsigned backwardSearchForBoundaryWithTextIterator(SimplifiedBackwardsTextIterator&, Vector<UChar, 1024>&, unsigned, BoundarySearchFunction);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/ChangeLog 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-02-17 Nan Wang <n_wang@apple.com>
+
+ AX: Implement sentence related text marker functions using TextIterator
+ https://bugs.webkit.org/show_bug.cgi?id=154312
+
+ Reviewed by Chris Fleizach.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (nextParagraphEndTextMarkerForTextMarkerCallback):
+ (sentenceTextMarkerRangeForTextMarkerCallback):
+ (previousSentenceStartTextMarkerForTextMarkerCallback):
+ (nextSentenceEndTextMarkerForTextMarkerCallback):
+ (setSelectedVisibleTextRangeCallback):
+ (AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
+ (AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
+ (AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
+ (AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
+ (AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
+ (AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
+ (AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
+ (AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
+ (AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
+ (AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
+ (AccessibilityUIElement::supportedActions):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::paragraphTextMarkerRangeForTextMarker):
+ (WTR::AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::previousParagraphStartTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
+ (WTR::AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::previousParagraphStartTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
+ (WTR::AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::mathPostscriptsDescription):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker):
+ (WTR::AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker):
+ (WTR::AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker):
+ (WTR::_convertMathMultiscriptPairsToString):
+
</ins><span class="cx"> 2016-02-15 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Gather some rudimentary statistics during resource load
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1037,6 +1037,33 @@
</span><span class="cx"> return AccessibilityTextMarker::makeJSAccessibilityTextMarker(context, toAXElement(thisObject)->nextParagraphEndTextMarkerForTextMarker(marker));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef sentenceTextMarkerRangeForTextMarkerCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ AccessibilityTextMarker* marker = nullptr;
+ if (argumentCount == 1)
+ marker = toTextMarker(JSValueToObject(context, arguments[0], exception));
+
+ return AccessibilityTextMarkerRange::makeJSAccessibilityTextMarkerRange(context, toAXElement(thisObject)->sentenceTextMarkerRangeForTextMarker(marker));
+}
+
+static JSValueRef previousSentenceStartTextMarkerForTextMarkerCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ AccessibilityTextMarker* marker = nullptr;
+ if (argumentCount == 1)
+ marker = toTextMarker(JSValueToObject(context, arguments[0], exception));
+
+ return AccessibilityTextMarker::makeJSAccessibilityTextMarker(context, toAXElement(thisObject)->previousSentenceStartTextMarkerForTextMarker(marker));
+}
+
+static JSValueRef nextSentenceEndTextMarkerForTextMarkerCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ AccessibilityTextMarker* marker = nullptr;
+ if (argumentCount == 1)
+ marker = toTextMarker(JSValueToObject(context, arguments[0], exception));
+
+ return AccessibilityTextMarker::makeJSAccessibilityTextMarker(context, toAXElement(thisObject)->nextSentenceEndTextMarkerForTextMarker(marker));
+}
+
</ins><span class="cx"> static JSValueRef setSelectedVisibleTextRangeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> AccessibilityUIElement* uiElement = toAXElement(thisObject);
</span><span class="lines">@@ -1662,6 +1689,21 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+AccessibilityTextMarkerRange AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Destruction
</span><span class="lines">@@ -1849,6 +1891,9 @@
</span><span class="cx"> { "paragraphTextMarkerRangeForTextMarker", paragraphTextMarkerRangeForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "previousParagraphStartTextMarkerForTextMarker", previousParagraphStartTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "nextParagraphEndTextMarkerForTextMarker", nextParagraphEndTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "sentenceTextMarkerRangeForTextMarker", sentenceTextMarkerRangeForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "previousSentenceStartTextMarkerForTextMarker", previousSentenceStartTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "nextSentenceEndTextMarkerForTextMarker", nextSentenceEndTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { "setSelectedChild", setSelectedChildCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setSelectedChildAtIndex", setSelectedChildAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "removeSelectionAtIndex", removeSelectionAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -267,6 +267,9 @@
</span><span class="cx"> AccessibilityTextMarkerRange paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
</span><span class="cx"> AccessibilityTextMarker previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*);
</span><span class="cx"> AccessibilityTextMarker nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*);
</span><ins>+ AccessibilityTextMarkerRange sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
+ AccessibilityTextMarker previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*);
+ AccessibilityTextMarker nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*);
</ins><span class="cx"> AccessibilityTextMarkerRange selectedTextMarkerRange();
</span><span class="cx"> void resetSelectedTextMarkerRange();
</span><span class="cx"> bool setSelectedVisibleTextRange(AccessibilityTextMarkerRange*);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -585,6 +585,21 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+AccessibilityTextMarkerRange AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
</ins><span class="cx"> #endif // SUPPORTS_AX_TEXTMARKERS && PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #pragma mark Unused
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1916,6 +1916,36 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+AccessibilityTextMarkerRange AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id textMarkerRange = [m_element accessibilityAttributeValue:@"AXSentenceTextMarkerRangeForTextMarker" forParameter:(id)textMarker->platformTextMarker()];
+ return AccessibilityTextMarkerRange(textMarkerRange);
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id previousTextMarker = [m_element accessibilityAttributeValue:@"AXPreviousSentenceStartTextMarkerForTextMarker" forParameter:(id)textMarker->platformTextMarker()];
+ return AccessibilityTextMarker(previousTextMarker);
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id nextTextMarker = [m_element accessibilityAttributeValue:@"AXNextSentenceEndTextMarkerForTextMarker" forParameter:(id)textMarker->platformTextMarker()];
+ return AccessibilityTextMarker(nextTextMarker);
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
+}
+
</ins><span class="cx"> #endif // SUPPORTS_AX_TEXTMARKERS && PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> JSStringRef AccessibilityUIElement::supportedActions()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -252,6 +252,9 @@
</span><span class="cx"> PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*) { return nullptr; }
</span><span class="cx"> PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
</span><span class="cx"> PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
</span><ins>+PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*) { return nullptr; }
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -258,6 +258,9 @@
</span><span class="cx"> PassRefPtr<AccessibilityTextMarkerRange> paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
</span><span class="cx"> PassRefPtr<AccessibilityTextMarker> nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*);
</span><span class="cx"> PassRefPtr<AccessibilityTextMarker> previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*);
</span><ins>+ PassRefPtr<AccessibilityTextMarkerRange> sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
+ PassRefPtr<AccessibilityTextMarker> nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*);
+ PassRefPtr<AccessibilityTextMarker> previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*);
</ins><span class="cx">
</span><span class="cx"> // Returns an ordered list of supported actions for an element.
</span><span class="cx"> JSRetainPtr<JSStringRef> supportedActions() const;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -208,6 +208,9 @@
</span><span class="cx"> AccessibilityTextMarkerRange paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker textMarker);
</span><span class="cx"> AccessibilityTextMarker previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
</span><span class="cx"> AccessibilityTextMarker nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
</span><ins>+ AccessibilityTextMarkerRange sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker textMarker);
+ AccessibilityTextMarker previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
+ AccessibilityTextMarker nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
</ins><span class="cx">
</span><span class="cx"> // Returns an ordered list of supported actions for an element.
</span><span class="cx"> readonly attribute DOMString supportedActions;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1131,6 +1131,21 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ return nullptr;
+}
+
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ return nullptr;
+}
+
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ return nullptr;
+}
+
</ins><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::mathPostscriptsDescription() const
</span><span class="cx"> {
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (196698 => 196699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2016-02-17 18:16:50 UTC (rev 196699)
</span><span class="lines">@@ -1943,6 +1943,36 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id textMarkerRange = [m_element accessibilityAttributeValue:@"AXSentenceTextMarkerRangeForTextMarker" forParameter:(id)textMarker->platformTextMarker()];
+ return AccessibilityTextMarkerRange::create(textMarkerRange);
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
+}
+
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id previousParagraphStartMarker = [m_element accessibilityAttributeValue:@"AXPreviousSentenceStartTextMarkerForTextMarker" forParameter:(id)textMarker->platformTextMarker()];
+ return AccessibilityTextMarker::create(previousParagraphStartMarker);
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
+}
+
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id nextParagraphEndMarker = [m_element accessibilityAttributeValue:@"AXNextSentenceEndTextMarkerForTextMarker" forParameter:(id)textMarker->platformTextMarker()];
+ return AccessibilityTextMarker::create(nextParagraphEndMarker);
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
+}
+
</ins><span class="cx"> static NSString *_convertMathMultiscriptPairsToString(NSArray *pairs)
</span><span class="cx"> {
</span><span class="cx"> __block NSMutableString *result = [NSMutableString string];
</span></span></pre>
</div>
</div>
</body>
</html>