<!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>[159932] 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/159932">159932</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2013-12-02 06:19:10 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Crash at WebCore::commonTreeScope
https://bugs.webkit.org/show_bug.cgi?id=125042
Reviewed by Mario Sanchez Prada.
Source/WebCore:
When an AX text marker that references a node in a detached document is used to create a text marker range, a crash occurs
because the method to determine commonTreeScopes does not account for when there are no common tree scopes.
Test: platform/mac/accessibility/ordered-textmarker-crash.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::visiblePositionRangeForUnorderedPositions):
* dom/TreeScope.cpp:
(WebCore::commonTreeScope):
LayoutTests:
* platform/mac/accessibility/ordered-textmarker-crash-expected.txt: Added.
* platform/mac/accessibility/ordered-textmarker-crash.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="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTreeScopecpp">trunk/Source/WebCore/dom/TreeScope.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityorderedtextmarkercrashexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityorderedtextmarkercrashhtml">trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159931 => 159932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-02 13:58:39 UTC (rev 159931)
+++ trunk/LayoutTests/ChangeLog 2013-12-02 14:19:10 UTC (rev 159932)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-02 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Crash at WebCore::commonTreeScope
+ https://bugs.webkit.org/show_bug.cgi?id=125042
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/ordered-textmarker-crash-expected.txt: Added.
+ * platform/mac/accessibility/ordered-textmarker-crash.html: Added.
+
</ins><span class="cx"> 2013-12-02 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityorderedtextmarkercrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash-expected.txt (0 => 159932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash-expected.txt 2013-12-02 14:19:10 UTC (rev 159932)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+This tests that comparing text markers that have no common tree scope won't crash
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityorderedtextmarkercrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash.html (0 => 159932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/ordered-textmarker-crash.html 2013-12-02 14:19:10 UTC (rev 159932)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body id="body" onload="setTimeout('runTest();', 1)">
+
+<div id="content1">
+<iframe src="data:text/html,<body><div>hello</div>"></iframe>
+</div>
+
+<div role="group" id="console"></div>
+
+<script>
+
+ description("This tests that comparing text markers that have no common tree scope won't crash");
+
+ if (window.accessibilityController && window.testRunner) {
+ window.testRunner.waitUntilDone();
+ window.jsTestIsAsync = true;
+ }
+
+ function runTest() {
+
+ // Get a text marker inside the frame we will remove.
+ var text1 = accessibilityController.accessibleElementById("content1").childAtIndex(0).childAtIndex(0).childAtIndex(0).childAtIndex(0);
+ var range1 = text1.textMarkerRangeForElement(text1);
+ marker1 = text1.startTextMarkerForTextMarkerRange(range1);
+
+ // Get a marker for the main frame.
+ var text2 = accessibilityController.rootElement.childAtIndex(0).childAtIndex(0);
+ var range2 = text2.textMarkerRangeForElement(text2);
+ marker2 = text2.startTextMarkerForTextMarkerRange(range2);
+
+ // Remove the child frame that we have a reference to the text marker from.
+ var content1 = document.getElementById("content1").childNodes[0];
+ content1.parentNode.removeChild(content1);
+
+ // Ask for the text marker range with the markers in a different tree.
+ // This should NOT crash!
+ var range = accessibilityController.rootElement.childAtIndex(0).textMarkerRangeForMarkers(marker1, marker2);
+ window.testRunner.notifyDone();
+ finishJSTest();
+ }
+
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159931 => 159932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-02 13:58:39 UTC (rev 159931)
+++ trunk/Source/WebCore/ChangeLog 2013-12-02 14:19:10 UTC (rev 159932)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-02 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Crash at WebCore::commonTreeScope
+ https://bugs.webkit.org/show_bug.cgi?id=125042
+
+ Reviewed by Mario Sanchez Prada.
+
+ When an AX text marker that references a node in a detached document is used to create a text marker range, a crash occurs
+ because the method to determine commonTreeScopes does not account for when there are no common tree scopes.
+
+ Test: platform/mac/accessibility/ordered-textmarker-crash.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::visiblePositionRangeForUnorderedPositions):
+ * dom/TreeScope.cpp:
+ (WebCore::commonTreeScope):
+
</ins><span class="cx"> 2013-12-02 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Fix a crash in the webaudio source provider when the audio track is going away.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (159931 => 159932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-12-02 13:58:39 UTC (rev 159931)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-12-02 14:19:10 UTC (rev 159932)
</span><span class="lines">@@ -649,6 +649,10 @@
</span><span class="cx"> if (visiblePos1.isNull() || visiblePos2.isNull())
</span><span class="cx"> return VisiblePositionRange();
</span><span class="cx">
</span><ins>+ // If there's no common tree scope between positions, return early.
+ if (!commonTreeScope(visiblePos1.deepEquivalent().deprecatedNode(), visiblePos2.deepEquivalent().deprecatedNode()))
+ return VisiblePositionRange();
+
</ins><span class="cx"> VisiblePosition startPos;
</span><span class="cx"> VisiblePosition endPos;
</span><span class="cx"> bool alreadyInOrder;
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeScope.cpp (159931 => 159932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeScope.cpp 2013-12-02 13:58:39 UTC (rev 159931)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2013-12-02 14:19:10 UTC (rev 159932)
</span><span class="lines">@@ -425,6 +425,10 @@
</span><span class="cx">
</span><span class="cx"> for (; indexA > 0 && indexB > 0 && treeScopesA[indexA - 1] == treeScopesB[indexB - 1]; --indexA, --indexB) { }
</span><span class="cx">
</span><ins>+ // If the nodes had no common tree scope, return immediately.
+ if (indexA == treeScopesA.size())
+ return nullptr;
+
</ins><span class="cx"> return treeScopesA[indexA] == treeScopesB[indexB] ? treeScopesA[indexA] : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>