<!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>[204906] 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/204906">204906</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-08-24 11:12:36 -0700 (Wed, 24 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Add test for line text marker range on iOS
https://bugs.webkit.org/show_bug.cgi?id=161108
<rdar://problem/27976405>
Reviewed by Chris Fleizach.
Tools:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::lineTextMarkerRangeForTextMarker):
(AccessibilityUIElement::textMarkerRangeForElement):
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::lineTextMarkerRangeForTextMarker):
(WTR::AccessibilityUIElement::textMarkerRangeForElement):
LayoutTests:
Added a new test to test line text marker ranges on iOS.
* accessibility/ios-simulator/text-marker-range-for-line-expected.txt: Added.
* accessibility/ios-simulator/text-marker-range-for-line.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortextmarkerrangeforlineexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortextmarkerrangeforlinehtml">trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204905 => 204906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-24 17:54:13 UTC (rev 204905)
+++ trunk/LayoutTests/ChangeLog 2016-08-24 18:12:36 UTC (rev 204906)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-24 Nan Wang <n_wang@apple.com>
+
+ AX: Add test for line text marker range on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=161108
+ <rdar://problem/27976405>
+
+ Reviewed by Chris Fleizach.
+
+ Added a new test to test line text marker ranges on iOS.
+
+ * accessibility/ios-simulator/text-marker-range-for-line-expected.txt: Added.
+ * accessibility/ios-simulator/text-marker-range-for-line.html: Added.
+
</ins><span class="cx"> 2016-08-24 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Changing gamepad test to try to get more info about the failure mode on the bots.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortextmarkerrangeforlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line-expected.txt (0 => 204906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line-expected.txt 2016-08-24 18:12:36 UTC (rev 204906)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+line 1
+line 2
+This verifies that we are getting correct line text marker ranges on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+line 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortextmarkerrangeforlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line.html (0 => 204906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/text-marker-range-for-line.html 2016-08-24 18:12:36 UTC (rev 204906)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <script src="../../resources/js-test-pre.js"></script>
+ <body id="body" tabindex="0">
+ <div tabindex="0" id="text">
+ line 1
+ <br>line 2
+ </div>
+
+ <p id="description"></p>
+ <div id="console"></div>
+
+ <script>
+
+ description("This verifies that we are getting correct line text marker ranges on iOS.");
+
+ if (window.accessibilityController) {
+ accessibilityController.enableEnhancedAccessibility(true);
+ var webArea = accessibilityController.rootElement.childAtIndex(0);
+
+ document.getElementById("text").focus();
+ var text = accessibilityController.accessibleElementById("text").childAtIndex(0);
+
+ var startMarker = text.startTextMarkerForTextMarkerRange(text.textMarkerRangeForElement(text));
+ startMarker = text.nextTextMarker(startMarker);
+ var lineTextMarkerRange = text.lineTextMarkerRangeForTextMarker(startMarker);
+ debug(text.stringForTextMarkerRange(lineTextMarkerRange));
+ }
+
+ </script>
+
+ <script src="../../resources/js-test-post.js"></script>
+
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204905 => 204906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-24 17:54:13 UTC (rev 204905)
+++ trunk/Tools/ChangeLog 2016-08-24 18:12:36 UTC (rev 204906)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-24 Nan Wang <n_wang@apple.com>
+
+ AX: Add test for line text marker range on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=161108
+ <rdar://problem/27976405>
+
+ Reviewed by Chris Fleizach.
+
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::lineTextMarkerRangeForTextMarker):
+ (AccessibilityUIElement::textMarkerRangeForElement):
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::lineTextMarkerRangeForTextMarker):
+ (WTR::AccessibilityUIElement::textMarkerRangeForElement):
+
</ins><span class="cx"> 2016-08-24 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Warning fixes.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (204905 => 204906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2016-08-24 17:54:13 UTC (rev 204905)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2016-08-24 18:12:36 UTC (rev 204906)
</span><span class="lines">@@ -107,6 +107,8 @@
</span><span class="cx"> - (id)nextMarkerForMarker:(id)marker;
</span><span class="cx"> - (id)previousMarkerForMarker:(id)marker;
</span><span class="cx"> - (id)accessibilityObjectForTextMarker:(id)marker;
</span><ins>+- (id)lineStartMarkerForMarker:(id)marker;
+- (id)lineEndMarkerForMarker:(id)marker;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -434,9 +436,14 @@
</span><span class="cx">
</span><span class="cx"> // Text markers
</span><span class="cx">
</span><del>-AccessibilityTextMarkerRange AccessibilityUIElement::lineTextMarkerRangeForTextMarker(AccessibilityTextMarker*)
</del><ins>+AccessibilityTextMarkerRange AccessibilityUIElement::lineTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
</ins><span class="cx"> {
</span><del>- return nullptr;
</del><ins>+ id startTextMarker = [m_element lineStartMarkerForMarker:(id)textMarker->platformTextMarker()];
+ id endTextMarker = [m_element lineEndMarkerForMarker:(id)textMarker->platformTextMarker()];
+ NSArray *textMarkers = [NSArray arrayWithObjects:startTextMarker, endTextMarker, nil];
+
+ id textMarkerRange = [m_element textMarkerRangeForMarkers:textMarkers];
+ return AccessibilityTextMarkerRange(textMarkerRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityTextMarkerRange AccessibilityUIElement::textMarkerRangeForElement(AccessibilityUIElement* element)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (204905 => 204906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2016-08-24 17:54:13 UTC (rev 204905)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2016-08-24 18:12:36 UTC (rev 204906)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx"> - (id)nextMarkerForMarker:(id)marker;
</span><span class="cx"> - (id)previousMarkerForMarker:(id)marker;
</span><span class="cx"> - (id)accessibilityObjectForTextMarker:(id)marker;
</span><ins>+- (id)lineStartMarkerForMarker:(id)marker;
+- (id)lineEndMarkerForMarker:(id)marker;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -1000,7 +1002,12 @@
</span><span class="cx"> // Text markers
</span><span class="cx"> PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::lineTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
</span><span class="cx"> {
</span><del>- return nullptr;
</del><ins>+ id startTextMarker = [m_element lineStartMarkerForMarker:(id)textMarker->platformTextMarker()];
+ id endTextMarker = [m_element lineEndMarkerForMarker:(id)textMarker->platformTextMarker()];
+ NSArray *textMarkers = [NSArray arrayWithObjects:startTextMarker, endTextMarker, nil];
+
+ id textMarkerRange = [m_element textMarkerRangeForMarkers:textMarkers];
+ return AccessibilityTextMarkerRange::create(textMarkerRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeForElement(AccessibilityUIElement* element)
</span></span></pre>
</div>
</div>
</body>
</html>