<!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>[196167] 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/196167">196167</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-02-05 00:53:51 -0800 (Fri, 05 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WebKit hanging when VoiceOver attempts to focus in on page
https://bugs.webkit.org/show_bug.cgi?id=153899
<rdar://problem/24506603>
Reviewed by Chris Fleizach.
Source/WebCore:
The VisiblePosition to CharacterOffset conversion will lead to an infinite loop if the
nextVisiblePostion call is returning the original VisiblePosition. Fixed it by breaking out
of the loop early in that situation.
Test: accessibility/text-marker/character-offset-visible-position-conversion-hang.html
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::characterOffsetFromVisiblePosition):
LayoutTests:
* accessibility/text-marker/character-offset-visible-position-conversion-hang-expected.txt: Added.
* accessibility/text-marker/character-offset-visible-position-conversion-hang.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitytextmarkercharacteroffsetvisiblepositionconversionhangexpectedtxt">trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytextmarkercharacteroffsetvisiblepositionconversionhanghtml">trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196166 => 196167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-05 05:57:37 UTC (rev 196166)
+++ trunk/LayoutTests/ChangeLog 2016-02-05 08:53:51 UTC (rev 196167)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-05 Nan Wang <n_wang@apple.com>
+
+ AX: WebKit hanging when VoiceOver attempts to focus in on page
+ https://bugs.webkit.org/show_bug.cgi?id=153899
+ <rdar://problem/24506603>
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/text-marker/character-offset-visible-position-conversion-hang-expected.txt: Added.
+ * accessibility/text-marker/character-offset-visible-position-conversion-hang.html: Added.
+
</ins><span class="cx"> 2016-02-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: InspectorTimelineAgent doesn't need to recompile functions because it now uses the sampling profiler
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytextmarkercharacteroffsetvisiblepositionconversionhangexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang-expected.txt (0 => 196167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang-expected.txt 2016-02-05 08:53:51 UTC (rev 196167)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Text
+
+This tests that getting the end text marker of the page won't hang.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
+request10005.pdf
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytextmarkercharacteroffsetvisiblepositionconversionhanghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang.html (0 => 196167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang.html (rev 0)
+++ trunk/LayoutTests/accessibility/text-marker/character-offset-visible-position-conversion-hang.html 2016-02-05 08:53:51 UTC (rev 196167)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body" onload="loadFunction()">
+
+<p id="text"><b>Text</b></p>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that getting the end text marker of the page won't hang.");
+
+ if (window.accessibilityController) {
+ function loadFunction() {
+ var text = accessibilityController.accessibleElementById("text");
+ var endMarker = text.endTextMarker;
+ }
+ }
+
+</script>
+
+<div class="Apple-web-attachment-container" contenteditable="false" title="attachment.pdf" role="img">
+ <img class="Apple-web-attachment-icon" src="Attachment.tiff" style="display:none">
+ <canvas class="Apple-web-attachment-canvas" style="width: 126px; height: 79px;" width="100" height="100"></canvas>
+ <div class="Apple-web-attachment-printable-version"><div class="iconContainer">
+ <img src="Attachment.tiff" height="38.400000" width="38.400000"></div>
+ <div class="filenameContainer">request10005.pdf</div>
+ </div>
+</div>
+
+<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 (196166 => 196167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-05 05:57:37 UTC (rev 196166)
+++ trunk/Source/WebCore/ChangeLog 2016-02-05 08:53:51 UTC (rev 196167)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-05 Nan Wang <n_wang@apple.com>
+
+ AX: WebKit hanging when VoiceOver attempts to focus in on page
+ https://bugs.webkit.org/show_bug.cgi?id=153899
+ <rdar://problem/24506603>
+
+ Reviewed by Chris Fleizach.
+
+ The VisiblePosition to CharacterOffset conversion will lead to an infinite loop if the
+ nextVisiblePostion call is returning the original VisiblePosition. Fixed it by breaking out
+ of the loop early in that situation.
+
+ Test: accessibility/text-marker/character-offset-visible-position-conversion-hang.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::characterOffsetFromVisiblePosition):
+
</ins><span class="cx"> 2016-02-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: InspectorTimelineAgent doesn't need to recompile functions because it now uses the sampling profiler
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (196166 => 196167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-02-05 05:57:37 UTC (rev 196166)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-02-05 08:53:51 UTC (rev 196167)
</span><span class="lines">@@ -1753,9 +1753,15 @@
</span><span class="cx"> int characterOffset = 0;
</span><span class="cx"> Position vpDeepPos = vp.deepEquivalent();
</span><span class="cx">
</span><ins>+ VisiblePosition previousVisiblePos;
</ins><span class="cx"> while (!vpDeepPos.isNull() && !deepPos.equals(vpDeepPos)) {
</span><ins>+ previousVisiblePos = vp;
</ins><span class="cx"> vp = obj->nextVisiblePosition(vp);
</span><span class="cx"> vpDeepPos = vp.deepEquivalent();
</span><ins>+ // Sometimes nextVisiblePosition will give the same VisiblePostion,
+ // we break here to avoid infinite loop.
+ if (vpDeepPos.equals(previousVisiblePos.deepEquivalent()))
+ break;
</ins><span class="cx"> characterOffset++;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>