<!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>[171457] branches/safari-600.1-branch</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/171457">171457</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-23 00:58:44 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171347">r171347</a>. <rdar://problem/16826229></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreaccessibilityAccessibilityObjectcpp">branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsaccessibilityparentdeleteexpectedtxt">branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsaccessibilityparentdeletehtml">branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (171456 => 171457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-23 07:54:44 UTC (rev 171456)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-23 07:58:44 UTC (rev 171457)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-23 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171347
+
+ 2014-07-21 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Clicking on links while accessibility is enabled does not render as expected
+ https://bugs.webkit.org/show_bug.cgi?id=135074
+
+ Reviewed by Chris Fleizach.
+
+ Delete a node and its parent, then call allAttributes() on the accessibility representation of
+ the deleted child and make sure there is no crash.
+
+ * accessibility/parent-delete-expected.txt: Added
+ * accessibility/parent-delete.html: Added
+
</ins><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171316.
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsaccessibilityparentdeleteexpectedtxtfromrev171347trunkLayoutTestsaccessibilityparentdeleteexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete-expected.txt (from rev 171347, trunk/LayoutTests/accessibility/parent-delete-expected.txt) (0 => 171457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete-expected.txt 2014-07-23 07:58:44 UTC (rev 171457)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+This test passes if there is no crash.
+AXRole: AXWebArea
+AXRoleDescription: HTML content
+AXChildren: <array of size 1>
+AXHelp:
+AXParent: <AXWebArea>
+AXSize: NSSize: {800, 600}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXWebArea>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXWebArea>
+AXEndTextMarker: <AXWebArea>
+AXVisited: 0
+AXLinkedUIElements: (null)
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXWebArea>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXLinkUIElements: <array of size 0>
+AXLoaded: 1
+AXLayoutCount: 2
+AXLoadingProgress: 1
+AXURL: LayoutTests/accessibility/parent-delete.html
+AXElementBusy: 0
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsaccessibilityparentdeletehtmlfromrev171347trunkLayoutTestsaccessibilityparentdeletehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete.html (from rev 171347, trunk/LayoutTests/accessibility/parent-delete.html) (0 => 171457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/accessibility/parent-delete.html 2014-07-23 07:58:44 UTC (rev 171457)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function runTest() {
+ var accessibilityElement;
+ {
+ var outer = document.getElementById("outer");
+ var inner = document.getElementById("inner");
+ var editable = document.getElementById("editable");
+ var result = document.getElementById("result");
+ editable.focus();
+ if (window.accessibilityController) {
+ var accessibilityElement = accessibilityController.focusedElement;
+ }
+ inner.removeChild(editable);
+ outer.removeChild(inner);
+ }
+ if (window.accessibilityController) {
+ result.innerText = accessibilityElement.allAttributes();
+ }
+}
+</script>
+</head>
+<body onload="runTest()">
+This test passes if there is no crash.
+<div id="outer" style="display: none;">
+ <div id="inner" style="display: none;">
+ <div id="editable" contenteditable="true" style="display: none;">
+ This is some throwaway text
+ </div>
+ </div>
+</div>
+<div id="result"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171456 => 171457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 07:54:44 UTC (rev 171456)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 07:58:44 UTC (rev 171457)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171347
+
+ 2014-07-21 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Clicking on links while accessibility is enabled sometimes crashes
+ https://bugs.webkit.org/show_bug.cgi?id=135074
+
+ Reviewed by Chris Fleizach.
+
+ When an accessibility request comes in from the system, we call updateBackingStore() on the
+ relevant AccessibilityObject, which triggers a relayout of the entire document. This relayout
+ might delete that accessibility node and its parent, which would cause the node to be deleted.
+ After the stack unwinds, we then call a member function on the node without checking for this
+ condition.
+
+ Test: accessibility/parent-delete.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::updateBackingStore): Retain the node for the duration of the
+ function.
+
+2014-07-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171345
</span><span class="cx">
</span><span class="cx"> 2014-07-22 Jeremy Jones <jeremyj@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp (171456 => 171457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-07-23 07:54:44 UTC (rev 171456)
+++ branches/safari-600.1-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-07-23 07:58:44 UTC (rev 171457)
</span><span class="lines">@@ -1429,6 +1429,8 @@
</span><span class="cx"> void AccessibilityObject::updateBackingStore()
</span><span class="cx"> {
</span><span class="cx"> // Updating the layout may delete this object.
</span><ins>+ RefPtr<AccessibilityObject> protector(this);
+
</ins><span class="cx"> if (Document* document = this->document()) {
</span><span class="cx"> if (!document->view()->isInLayout())
</span><span class="cx"> document->updateLayoutIgnorePendingStylesheets();
</span></span></pre>
</div>
</div>
</body>
</html>