<!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>[205845] 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/205845">205845</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 17:58:22 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Crash at WebCore::Range::compareBoundaryPoints(WebCore::Range::CompareHow, WebCore::Range const&, int&) const + 23
https://bugs.webkit.org/show_bug.cgi?id=161878
Reviewed by Chris Fleizach.
Source/WebCore:
In function characterOffsetsInOrder(const CharacterOffset&, const CharacterOffset&), we are creating two
ranges based on the nodes that are associated to the passed in CharacterOffsets. When the first node is a doctype
node, the first range will be a nullptr, and dereferencing it leads to a crash. Fixed this by adding a
NULL check.
Test: accessibility/mac/doctype-node-in-text-marker-crash.html
* accessibility/AXObjectCache.cpp:
(WebCore::characterOffsetsInOrder):
(WebCore::resetNodeAndOffsetForReplacedNode):
LayoutTests:
* accessibility/mac/doctype-node-in-text-marker-crash-expected.txt: Added.
* accessibility/mac/doctype-node-in-text-marker-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="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacdoctypenodeintextmarkercrashexpectedtxt">trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacdoctypenodeintextmarkercrashhtml">trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205844 => 205845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-13 00:29:21 UTC (rev 205844)
+++ trunk/LayoutTests/ChangeLog 2016-09-13 00:58:22 UTC (rev 205845)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-12 Nan Wang <n_wang@apple.com>
+
+ AX: Crash at WebCore::Range::compareBoundaryPoints(WebCore::Range::CompareHow, WebCore::Range const&, int&) const + 23
+ https://bugs.webkit.org/show_bug.cgi?id=161878
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/doctype-node-in-text-marker-crash-expected.txt: Added.
+ * accessibility/mac/doctype-node-in-text-marker-crash.html: Added.
+
</ins><span class="cx"> 2016-09-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLButtonElement.prototype.click should be HTMLElement.prototype.click
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacdoctypenodeintextmarkercrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash-expected.txt (0 => 205845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash-expected.txt 2016-09-13 00:58:22 UTC (rev 205845)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+text
+This tests that creating a text marker range with a text marker that associated to a doctype node won't lead to crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacdoctypenodeintextmarkercrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash.html (0 => 205845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/doctype-node-in-text-marker-crash.html 2016-09-13 00:58:22 UTC (rev 205845)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="container" role="group" contenteditablt="true">text<iframe id="frame" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" height="100%" width="100%" style="padding: 0px; margin: 0px; border: 0px; height: 100%; width: 100%;"></iframe></div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that creating a text marker range with a text marker that associated to a doctype node won't lead to crash.");
+
+ function selectElementContents(el) {
+ var range = document.createRange();
+ range.selectNodeContents(el);
+ var sel = window.getSelection();
+ sel.removeAllRanges();
+ sel.addRange(range);
+ }
+
+ if (window.accessibilityController) {
+
+ accessibilityController.enableEnhancedAccessibility(true);
+ var webArea = accessibilityController.rootElement.childAtIndex(0);
+ webArea.setBoolAttributeValue("AXCaretBrowsingEnabled", true);
+
+ // Make sure the iframe has a doctype node
+ var iframe = document.getElementById("frame");
+ var idocument = iframe.contentDocument;
+ idocument.open();
+ idocument.write("<!DOCTYPE html>");
+ idocument.write("<html>");
+ idocument.write("<head></head>");
+ idocument.write("<body></body>");
+ idocument.write("</html>");
+ idocument.close();
+
+ // Select all the contents in the container, and get the selection range.
+ var container = accessibilityController.accessibleElementById("container");
+ var containerElement = document.getElementById("container");
+ selectElementContents(containerElement);
+ var selectionRange = container.selectedTextMarkerRange();
+
+ var startMarker = container.startTextMarkerForTextMarkerRange(selectionRange);
+ var endMarker = container.endTextMarkerForTextMarkerRange(selectionRange);
+
+ // endMarker is now associated with a doctype node, make sure it won't lead to a crash.
+ var markerRange = container.textMarkerRangeForMarkers(endMarker, startMarker);
+ }
+
+</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 (205844 => 205845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-13 00:29:21 UTC (rev 205844)
+++ trunk/Source/WebCore/ChangeLog 2016-09-13 00:58:22 UTC (rev 205845)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-12 Nan Wang <n_wang@apple.com>
+
+ AX: Crash at WebCore::Range::compareBoundaryPoints(WebCore::Range::CompareHow, WebCore::Range const&, int&) const + 23
+ https://bugs.webkit.org/show_bug.cgi?id=161878
+
+ Reviewed by Chris Fleizach.
+
+ In function characterOffsetsInOrder(const CharacterOffset&, const CharacterOffset&), we are creating two
+ ranges based on the nodes that are associated to the passed in CharacterOffsets. When the first node is a doctype
+ node, the first range will be a nullptr, and dereferencing it leads to a crash. Fixed this by adding a
+ NULL check.
+
+ Test: accessibility/mac/doctype-node-in-text-marker-crash.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::characterOffsetsInOrder):
+ (WebCore::resetNodeAndOffsetForReplacedNode):
+
</ins><span class="cx"> 2016-09-12 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Move the pixel data of ImageFrame to a separate class named ImageBackingStore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (205844 => 205845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-09-13 00:29:21 UTC (rev 205844)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-09-13 00:58:22 UTC (rev 205845)
</span><span class="lines">@@ -1681,7 +1681,7 @@
</span><span class="cx"> RefPtr<Range> range1 = AXObjectCache::rangeForNodeContents(node1);
</span><span class="cx"> RefPtr<Range> range2 = AXObjectCache::rangeForNodeContents(node2);
</span><span class="cx">
</span><del>- return !range2 || range1->compareBoundaryPoints(Range::START_TO_START, *range2, IGNORE_EXCEPTION) <= 0;
</del><ins>+ return !range2 || (range1 && range1->compareBoundaryPoints(Range::START_TO_START, *range2, IGNORE_EXCEPTION) <= 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Node* resetNodeAndOffsetForReplacedNode(Node* replacedNode, int& offset, int characterCount)
</span></span></pre>
</div>
</div>
</body>
</html>