Diff
Modified: trunk/LayoutTests/ChangeLog (196698 => 196699)
--- trunk/LayoutTests/ChangeLog 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/LayoutTests/ChangeLog 2016-02-17 18:16:50 UTC (rev 196699)
@@ -1,3 +1,15 @@
+2016-02-17 Nan Wang <n_w...@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.
+
2016-02-17 Ryan Haddad <ryanhad...@apple.com>
Adding an ios-specific baseline for accessibility/ios-simulator/centerpoint.html during failure investigation
Modified: trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav-expected.txt (196698 => 196699)
--- 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)
@@ -10,6 +10,8 @@
some
text
this is my first paragraph. Of text. it has some text.
+
+
this is my second paragraph. Of text. it has some text.
this is my third paragraph. Of text. it has some text.
@@ -68,10 +70,14 @@
Pre paragraph start to next paragraph end: text
Paragraph: this is my first paragraph. Of text. it has some text.
+Paragraph:
+Paragraph:
Paragraph: this is my second paragraph. Of text. it has some text.
Paragraph: this is my third paragraph. Of text. it has some text.
Paragraph: this is my third paragraph. Of text. it has some text.
Paragraph: this is my second paragraph. Of text. it has some text.
+Paragraph:
+Paragraph:
Paragraph: this is my first paragraph. Of text. it has some text.
Test going forward.
End paragraph: text
Modified: trunk/LayoutTests/accessibility/mac/text-marker-paragraph-nav.html (196698 => 196699)
--- 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)
@@ -46,7 +46,7 @@
some<br>text
</div>
-<div id="text9">this is my first paragraph. Of text. it has some text.<br>
+<div id="text9">this is my first paragraph. Of text. it has some text.<br><br><br>
this is my second paragraph. Of text. it has some text.<br>
this is my third paragraph. Of text. it has some text.<br><br>
</div>
@@ -121,7 +121,7 @@
startMarker = text.startTextMarkerForTextMarkerRange(textMarkerRange);
startMarker = text.nextTextMarker(startMarker);
var endMarker = text.endTextMarkerForTextMarkerRange(textMarkerRange);
- verifyParagraphs(text, startMarker, 3);
+ verifyParagraphs(text, startMarker, 5);
// Check the paragraph marker runs from start to end, and backwards.
// Make sure it won't hang.
@@ -160,26 +160,23 @@
}
function verifyParagraphs(obj, startMarker, paragraphCount) {
- // Move to the end of first paragraph, so the first paragraph
- // won't print twice.
- var current = obj.nextParagraphEndTextMarkerForTextMarker(startMarker);
+ var current = startMarker;
var i = 0;
while(i < paragraphCount) {
+ current = obj.nextParagraphEndTextMarkerForTextMarker(current);
var currRange = obj.paragraphTextMarkerRangeForTextMarker(current);
var currParagraph = obj.stringForTextMarkerRange(currRange);
debug("Paragraph: " + currParagraph);
- current = obj.nextParagraphEndTextMarkerForTextMarker(current);
i++;
}
// Backwards.
- current = obj.previousParagraphStartTextMarkerForTextMarker(current);
i = 0;
while(i < paragraphCount) {
+ current = obj.previousParagraphStartTextMarkerForTextMarker(current);
var currRange = obj.paragraphTextMarkerRangeForTextMarker(current);
var currParagraph = obj.stringForTextMarkerRange(currRange);
debug("Paragraph: " + currParagraph);
- current = obj.previousParagraphStartTextMarkerForTextMarker(current);
i++;
}
}
Added: trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav-expected.txt (0 => 196699)
--- 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)
@@ -0,0 +1,52 @@
+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
+
Added: trunk/LayoutTests/accessibility/mac/text-marker-sentence-nav.html (0 => 196699)
--- 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)
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src=""
+</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="" 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=""
+</body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (196698 => 196699)
--- 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)
@@ -1,3 +1,56 @@
+2016-02-17 Nan Wang <n_w...@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:
+
2016-02-17 Manuel Rego Casasnovas <r...@igalia.com>
[css-grid] GridSpan refactoring
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (196698 => 196699)
--- 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)
@@ -1609,7 +1609,7 @@
return replacedNode->parentNode();
}
-static void setRangeStartOrEndWithCharacterOffset(RefPtr<Range> range, CharacterOffset& characterOffset, bool isStart, ExceptionCode& ec)
+static void setRangeStartOrEndWithCharacterOffset(RefPtr<Range> range, const CharacterOffset& characterOffset, bool isStart, ExceptionCode& ec)
{
if (!range) {
ec = RangeError;
@@ -1738,11 +1738,11 @@
charOffset = characterOffsetForNodeAndOffset(*domNode, 0, TraverseOptionToNodeEnd);
} else
return CharacterOffset();
- if (!offset)
+ if (charOffset.offset == offset)
break;
}
if (offset > 0)
- charOffset = characterOffsetForNodeAndOffset(*charOffset.node, charOffset.offset - offset);
+ charOffset = characterOffsetForNodeAndOffset(*charOffset.node, charOffset.offset - offset, TraverseOptionIncludeStart);
return charOffset;
}
@@ -1919,33 +1919,6 @@
return characterOffsetForNodeAndOffset(*characterOffset.node, characterOffset.offset - 1, ignoreStart ? TraverseOptionDefault : TraverseOptionIncludeStart);
}
-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;
-}
-
CharacterOffset AXObjectCache::startCharacterOffsetOfWord(const CharacterOffset& characterOffset, EWordSide side)
{
if (characterOffset.isNull())
@@ -1962,7 +1935,7 @@
return characterOffset;
}
- return previousWordBoundary(c, startWordBoundary);
+ return previousBoundary(c, startWordBoundary);
}
CharacterOffset AXObjectCache::endCharacterOffsetOfWord(const CharacterOffset& characterOffset, EWordSide side)
@@ -1981,7 +1954,7 @@
return characterOffset;
}
- return nextWordBoundary(c, endWordBoundary);
+ return nextBoundary(c, endWordBoundary);
}
CharacterOffset AXObjectCache::previousWordStartCharacterOffset(const CharacterOffset& characterOffset)
@@ -2010,7 +1983,7 @@
RefPtr<Range> AXObjectCache::leftWordRange(const CharacterOffset& characterOffset)
{
- CharacterOffset start = previousWordStartCharacterOffset(characterOffset);
+ CharacterOffset start = startCharacterOffsetOfWord(characterOffset, LeftWordIfOnBoundary);
CharacterOffset end = endCharacterOffsetOfWord(start);
return rangeForUnorderedCharacterOffsets(start, end);
}
@@ -2018,7 +1991,7 @@
RefPtr<Range> AXObjectCache::rightWordRange(const CharacterOffset& characterOffset)
{
CharacterOffset start = startCharacterOffsetOfWord(characterOffset);
- CharacterOffset end = nextWordEndCharacterOffset(start);
+ CharacterOffset end = endCharacterOffsetOfWord(start);
return rangeForUnorderedCharacterOffsets(start, end);
}
@@ -2043,7 +2016,15 @@
{
return characterForCharacterOffset(characterOffset);
}
+
+static bool characterOffsetNodeIsBR(const CharacterOffset& characterOffset)
+{
+ if (characterOffset.isNull())
+ return false;
+ return characterOffset.node->hasTagName(brTag);
+}
+
static Node* parentEditingBoundary(Node* node)
{
if (!node)
@@ -2060,7 +2041,7 @@
return boundary;
}
-CharacterOffset AXObjectCache::nextWordBoundary(CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
+CharacterOffset AXObjectCache::nextBoundary(const CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
{
if (characterOffset.isNull())
return CharacterOffset();
@@ -2092,13 +2073,18 @@
if (it.atEnd() && next == string.size())
return end;
+
+ // The endSentenceBoundary function will include a line break at the end of the sentence.
+ if (searchFunction == endSentenceBoundary && string[next - 1] == '\n')
+ next--;
+
if (next > prefixLength)
return characterOffsetForNodeAndOffset(*characterOffset.node, characterOffset.offset + next - prefixLength);
return characterOffset;
}
-CharacterOffset AXObjectCache::previousWordBoundary(CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
+CharacterOffset AXObjectCache::previousBoundary(const CharacterOffset& characterOffset, BoundarySearchFunction searchFunction)
{
if (characterOffset.isNull())
return CharacterOffset();
@@ -2141,6 +2127,9 @@
}
int characterCount = characterOffset.offset - (string.size() - suffixLength - next);
+ // 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;
return characterOffsetForNodeAndOffset(*characterOffset.node, characterCount, TraverseOptionIncludeStart);
}
@@ -2198,7 +2187,7 @@
RefPtr<Range> AXObjectCache::paragraphForCharacterOffset(const CharacterOffset& characterOffset)
{
CharacterOffset start = startCharacterOffsetOfParagraph(characterOffset);
- CharacterOffset end = endCharacterOffsetOfParagraph(characterOffset);
+ CharacterOffset end = endCharacterOffsetOfParagraph(start);
return rangeForUnorderedCharacterOffsets(start, end);
}
@@ -2206,15 +2195,62 @@
CharacterOffset AXObjectCache::nextParagraphEndCharacterOffset(const CharacterOffset& characterOffset)
{
// make sure we move off of a paragraph end
- return endCharacterOffsetOfParagraph(nextCharacterOffset(characterOffset));
+ CharacterOffset next = nextCharacterOffset(characterOffset);
+
+ // We should skip the following BR node.
+ if (characterOffsetNodeIsBR(next) && !characterOffsetNodeIsBR(characterOffset))
+ next = nextCharacterOffset(next);
+
+ return endCharacterOffsetOfParagraph(next);
}
CharacterOffset AXObjectCache::previousParagraphStartCharacterOffset(const CharacterOffset& characterOffset)
{
// make sure we move off of a paragraph start
- return startCharacterOffsetOfParagraph(previousCharacterOffset(characterOffset, false));
+ CharacterOffset previous = previousCharacterOffset(characterOffset, false);
+
+ // We should skip the preceding BR node.
+ if (characterOffsetNodeIsBR(previous) && !characterOffsetNodeIsBR(characterOffset))
+ previous = previousCharacterOffset(previous, false);
+
+ return startCharacterOffsetOfParagraph(previous);
}
+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);
+}
+
const Element* AXObjectCache::rootAXEditableElement(const Node* node)
{
const Element* result = node->rootEditableElement();
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (196698 => 196699)
--- 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)
@@ -214,6 +214,11 @@
RefPtr<Range> paragraphForCharacterOffset(const CharacterOffset&);
CharacterOffset nextParagraphEndCharacterOffset(const CharacterOffset&);
CharacterOffset previousParagraphStartCharacterOffset(const CharacterOffset&);
+
+ // Sentence
+ RefPtr<Range> sentenceForCharacterOffset(const CharacterOffset&);
+ CharacterOffset nextSentenceEndCharacterOffset(const CharacterOffset&);
+ CharacterOffset previousSentenceStartCharacterOffset(const CharacterOffset&);
enum AXNotification {
AXActiveDescendantChanged,
@@ -317,12 +322,14 @@
UChar32 characterBefore(const CharacterOffset&);
CharacterOffset startOrEndCharacterOffsetForRange(RefPtr<Range>, bool);
CharacterOffset characterOffsetForNodeAndOffset(Node&, int, TraverseOption = TraverseOptionDefault);
- CharacterOffset previousWordBoundary(CharacterOffset&, BoundarySearchFunction);
- CharacterOffset nextWordBoundary(CharacterOffset&, BoundarySearchFunction);
+ CharacterOffset previousBoundary(const CharacterOffset&, BoundarySearchFunction);
+ CharacterOffset nextBoundary(const CharacterOffset&, BoundarySearchFunction);
CharacterOffset startCharacterOffsetOfWord(const CharacterOffset&, EWordSide = RightWordIfOnBoundary);
CharacterOffset endCharacterOffsetOfWord(const CharacterOffset&, EWordSide = RightWordIfOnBoundary);
CharacterOffset startCharacterOffsetOfParagraph(const CharacterOffset&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CharacterOffset endCharacterOffsetOfParagraph(const CharacterOffset&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
+ CharacterOffset startCharacterOffsetOfSentence(const CharacterOffset&);
+ CharacterOffset endCharacterOffsetOfSentence(const CharacterOffset&);
private:
AccessibilityObject* rootWebArea();
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (196698 => 196699)
--- 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)
@@ -4112,9 +4112,12 @@
}
if ([attribute isEqualToString:@"AXSentenceTextMarkerRangeForTextMarker"]) {
- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- VisiblePositionRange vpRange = m_object->sentenceForPosition(visiblePos);
- return [self textMarkerRangeFromVisiblePositions:vpRange.start endPosition:vpRange.end];
+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ RefPtr<Range> range = cache->sentenceForCharacterOffset(characterOffset);
+ return [self textMarkerRangeFromRange:range];
}
if ([attribute isEqualToString:@"AXParagraphTextMarkerRangeForTextMarker"]) {
@@ -4155,18 +4158,30 @@
}
if ([attribute isEqualToString:@"AXNextSentenceEndTextMarkerForTextMarker"]) {
- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- return [self textMarkerForVisiblePosition:m_object->nextSentenceEndPosition(visiblePos)];
+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ CharacterOffset nextEnd = cache->nextSentenceEndCharacterOffset(characterOffset);
+ return [self textMarkerForCharacterOffset:nextEnd];
}
if ([attribute isEqualToString:@"AXPreviousSentenceStartTextMarkerForTextMarker"]) {
- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- return [self textMarkerForVisiblePosition:m_object->previousSentenceStartPosition(visiblePos)];
+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ CharacterOffset previousStart = cache->previousSentenceStartCharacterOffset(characterOffset);
+ return [self textMarkerForCharacterOffset:previousStart];
}
if ([attribute isEqualToString:@"AXNextParagraphEndTextMarkerForTextMarker"]) {
- VisiblePosition visiblePos = [self visiblePositionForTextMarker:(textMarker)];
- return [self textMarkerForVisiblePosition:m_object->nextParagraphEndPosition(visiblePos)];
+ AXObjectCache* cache = m_object->axObjectCache();
+ if (!cache)
+ return nil;
+ CharacterOffset characterOffset = [self characterOffsetForTextMarker:textMarker];
+ CharacterOffset nextEnd = cache->nextParagraphEndCharacterOffset(characterOffset);
+ return [self textMarkerForCharacterOffset:nextEnd];
}
if ([attribute isEqualToString:@"AXPreviousParagraphStartTextMarkerForTextMarker"]) {
Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (196698 => 196699)
--- 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)
@@ -658,7 +658,7 @@
// ---------
-static unsigned startWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
+unsigned startWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
{
ASSERT(offset);
if (mayHaveMoreContext && !startOfLastWordBoundaryContext(text.substring(0, offset))) {
@@ -689,7 +689,7 @@
return previousBoundary(p, startWordBoundary);
}
-static unsigned endWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
+unsigned endWordBoundary(StringView text, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
{
ASSERT(offset <= text.length());
if (mayHaveMoreContext && endOfFirstWordBoundaryContext(text.substring(offset)) == text.length() - offset) {
@@ -1096,7 +1096,7 @@
// ---------
-static unsigned startSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
+unsigned startSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
{
// FIXME: The following function can return -1; we don't handle that.
return textBreakPreceding(sentenceBreakIterator(text), text.length());
@@ -1107,7 +1107,7 @@
return previousBoundary(position, startSentenceBoundary);
}
-static unsigned endSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
+unsigned endSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
{
return textBreakNext(sentenceBreakIterator(text));
}
Modified: trunk/Source/WebCore/editing/VisibleUnits.h (196698 => 196699)
--- 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)
@@ -112,6 +112,10 @@
// helper function
enum BoundarySearchContextAvailability { DontHaveMoreContext, MayHaveMoreContext };
typedef unsigned (*BoundarySearchFunction)(StringView, unsigned offset, BoundarySearchContextAvailability, bool& needMoreContext);
+unsigned startWordBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
+unsigned endWordBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
+unsigned startSentenceBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
+unsigned endSentenceBoundary(StringView, unsigned, BoundarySearchContextAvailability, bool&);
unsigned suffixLengthForRange(RefPtr<Range>, Vector<UChar, 1024>&);
unsigned prefixLengthForRange(RefPtr<Range>, Vector<UChar, 1024>&);
unsigned backwardSearchForBoundaryWithTextIterator(SimplifiedBackwardsTextIterator&, Vector<UChar, 1024>&, unsigned, BoundarySearchFunction);
Modified: trunk/Tools/ChangeLog (196698 => 196699)
--- trunk/Tools/ChangeLog 2016-02-17 18:15:57 UTC (rev 196698)
+++ trunk/Tools/ChangeLog 2016-02-17 18:16:50 UTC (rev 196699)
@@ -1,3 +1,55 @@
+2016-02-17 Nan Wang <n_w...@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):
+
2016-02-15 Brent Fulgham <bfulg...@apple.com>
[Mac] Gather some rudimentary statistics during resource load
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (196698 => 196699)
--- 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)
@@ -1037,6 +1037,33 @@
return AccessibilityTextMarker::makeJSAccessibilityTextMarker(context, toAXElement(thisObject)->nextParagraphEndTextMarkerForTextMarker(marker));
}
+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));
+}
+
static JSValueRef setSelectedVisibleTextRangeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
AccessibilityUIElement* uiElement = toAXElement(thisObject);
@@ -1662,6 +1689,21 @@
return nullptr;
}
+AccessibilityTextMarkerRange AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
#endif
// Destruction
@@ -1849,6 +1891,9 @@
{ "paragraphTextMarkerRangeForTextMarker", paragraphTextMarkerRangeForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "previousParagraphStartTextMarkerForTextMarker", previousParagraphStartTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "nextParagraphEndTextMarkerForTextMarker", nextParagraphEndTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "sentenceTextMarkerRangeForTextMarker", sentenceTextMarkerRangeForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "previousSentenceStartTextMarkerForTextMarker", previousSentenceStartTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "nextSentenceEndTextMarkerForTextMarker", nextSentenceEndTextMarkerForTextMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setSelectedChild", setSelectedChildCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setSelectedChildAtIndex", setSelectedChildAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "removeSelectionAtIndex", removeSelectionAtIndexCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (196698 => 196699)
--- 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)
@@ -267,6 +267,9 @@
AccessibilityTextMarkerRange paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
AccessibilityTextMarker previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*);
AccessibilityTextMarker nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*);
+ AccessibilityTextMarkerRange sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
+ AccessibilityTextMarker previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*);
+ AccessibilityTextMarker nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*);
AccessibilityTextMarkerRange selectedTextMarkerRange();
void resetSelectedTextMarkerRange();
bool setSelectedVisibleTextRange(AccessibilityTextMarkerRange*);
Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (196698 => 196699)
--- 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)
@@ -585,6 +585,21 @@
return nullptr;
}
+AccessibilityTextMarkerRange AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
+AccessibilityTextMarker AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*)
+{
+ return nullptr;
+}
+
#endif // SUPPORTS_AX_TEXTMARKERS && PLATFORM(IOS)
#pragma mark Unused
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (196698 => 196699)
--- 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)
@@ -1916,6 +1916,36 @@
return nullptr;
}
+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;
+}
+
#endif // SUPPORTS_AX_TEXTMARKERS && PLATFORM(MAC)
JSStringRef AccessibilityUIElement::supportedActions()
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (196698 => 196699)
--- 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)
@@ -252,6 +252,9 @@
PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*) { return nullptr; }
PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
+PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*) { return nullptr; }
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*) { return nullptr; }
#endif
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (196698 => 196699)
--- 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)
@@ -258,6 +258,9 @@
PassRefPtr<AccessibilityTextMarkerRange> paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
PassRefPtr<AccessibilityTextMarker> nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*);
PassRefPtr<AccessibilityTextMarker> previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*);
+ PassRefPtr<AccessibilityTextMarkerRange> sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*);
+ PassRefPtr<AccessibilityTextMarker> nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*);
+ PassRefPtr<AccessibilityTextMarker> previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*);
// Returns an ordered list of supported actions for an element.
JSRetainPtr<JSStringRef> supportedActions() const;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (196698 => 196699)
--- 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)
@@ -208,6 +208,9 @@
AccessibilityTextMarkerRange paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker textMarker);
AccessibilityTextMarker previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
AccessibilityTextMarker nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
+ AccessibilityTextMarkerRange sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker textMarker);
+ AccessibilityTextMarker previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
+ AccessibilityTextMarker nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker textMarker);
// Returns an ordered list of supported actions for an element.
readonly attribute DOMString supportedActions;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (196698 => 196699)
--- 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)
@@ -1131,6 +1131,21 @@
return nullptr;
}
+PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ return nullptr;
+}
+
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ return nullptr;
+}
+
+PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker* textMarker)
+{
+ return nullptr;
+}
+
JSRetainPtr<JSStringRef> AccessibilityUIElement::mathPostscriptsDescription() const
{
return 0;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (196698 => 196699)
--- 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)
@@ -1943,6 +1943,36 @@
return nullptr;
}
+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;
+}
+
static NSString *_convertMathMultiscriptPairsToString(NSArray *pairs)
{
__block NSMutableString *result = [NSMutableString string];
