<!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>[178359] releases/WebKitGTK/webkit-2.6</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/178359">178359</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 04:09:53 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/177537">r177537</a> - AX: Recursive crash at WebCore::accessibleNameForNode
https://bugs.webkit.org/show_bug.cgi?id=139616
Reviewed by Mario Sanchez Prada.
Source/WebCore:
An image that uses aria-labelledby to reference its own parent can lead to a recursion crash.
There needs to be some information we can pass through these methods to ensure we don't hit this case.
Test: accessibility/accessibility-description-crash.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::alternativeText):
(WebCore::AccessibilityNodeObject::textUnderElement):
(WebCore::accessibleNameForNode):
(WebCore::AccessibilityNodeObject::accessibilityDescriptionForElements):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityTextUnderElementMode::AccessibilityTextUnderElementMode):
LayoutTests:
* accessibility/accessibility-description-crash-expected.txt: Added.
* accessibility/accessibility-description-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityNodeObjectcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityObjecth">releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (178358 => 178359)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 12:05:42 UTC (rev 178358)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 12:09:53 UTC (rev 178359)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-12-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Recursive crash at WebCore::accessibleNameForNode
+ https://bugs.webkit.org/show_bug.cgi?id=139616
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/accessibility-description-crash-expected.txt: Added.
+ * accessibility/accessibility-description-crash.html: Added.
+
</ins><span class="cx"> 2014-12-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r163928): Animated GIFs are not resumed when translated into view using -webkit-transform
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178358 => 178359)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 12:05:42 UTC (rev 178358)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 12:09:53 UTC (rev 178359)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Recursive crash at WebCore::accessibleNameForNode
+ https://bugs.webkit.org/show_bug.cgi?id=139616
+
+ Reviewed by Mario Sanchez Prada.
+
+ An image that uses aria-labelledby to reference its own parent can lead to a recursion crash.
+ There needs to be some information we can pass through these methods to ensure we don't hit this case.
+
+ Test: accessibility/accessibility-description-crash.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::alternativeText):
+ (WebCore::AccessibilityNodeObject::textUnderElement):
+ (WebCore::accessibleNameForNode):
+ (WebCore::AccessibilityNodeObject::accessibilityDescriptionForElements):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityTextUnderElementMode::AccessibilityTextUnderElementMode):
+
</ins><span class="cx"> 2014-12-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ASSERT seen closing/opening multiple inspectors
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (178358 => 178359)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-01-13 12:05:42 UTC (rev 178358)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-01-13 12:09:53 UTC (rev 178359)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-static String accessibleNameForNode(Node*);
</del><ins>+static String accessibleNameForNode(Node* node, Node* labelledbyNode = nullptr);
</ins><span class="cx">
</span><span class="cx"> AccessibilityNodeObject::AccessibilityNodeObject(Node* node)
</span><span class="cx"> : AccessibilityObject()
</span><span class="lines">@@ -1661,6 +1661,8 @@
</span><span class="cx">
</span><span class="cx"> StringBuilder builder;
</span><span class="cx"> for (AccessibilityObject* child = firstChild(); child; child = child->nextSibling()) {
</span><ins>+ if (mode.ignoredChildNode && child->node() == mode.ignoredChildNode)
+ continue;
</ins><span class="cx">
</span><span class="cx"> bool shouldDeriveNameFromAuthor = (mode.childrenInclusion == AccessibilityTextUnderElementMode::TextUnderElementModeIncludeNameFromContentsChildren && !child->accessibleNameDerivesFromContent());
</span><span class="cx"> if (shouldDeriveNameFromAuthor) {
</span><span class="lines">@@ -1837,7 +1839,7 @@
</span><span class="cx">
</span><span class="cx"> // This function implements the ARIA accessible name as described by the Mozilla
</span><span class="cx"> // ARIA Implementer's Guide.
</span><del>-static String accessibleNameForNode(Node* node)
</del><ins>+static String accessibleNameForNode(Node* node, Node* labelledbyNode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!node || !node->isElementNode())
</span><span class="lines">@@ -1867,7 +1869,7 @@
</span><span class="cx"> String text;
</span><span class="cx"> if (axObject) {
</span><span class="cx"> if (axObject->accessibleNameDerivesFromContent())
</span><del>- text = axObject->textUnderElement(AccessibilityTextUnderElementMode(AccessibilityTextUnderElementMode::TextUnderElementModeIncludeNameFromContentsChildren, true));
</del><ins>+ text = axObject->textUnderElement(AccessibilityTextUnderElementMode(AccessibilityTextUnderElementMode::TextUnderElementModeIncludeNameFromContentsChildren, true, labelledbyNode));
</ins><span class="cx"> } else
</span><span class="cx"> text = element->innerText();
</span><span class="cx">
</span><span class="lines">@@ -1886,7 +1888,7 @@
</span><span class="cx"> StringBuilder builder;
</span><span class="cx"> unsigned size = elements.size();
</span><span class="cx"> for (unsigned i = 0; i < size; ++i)
</span><del>- appendNameToStringBuilder(builder, accessibleNameForNode(elements[i]));
</del><ins>+ appendNameToStringBuilder(builder, accessibleNameForNode(elements[i], node()));
</ins><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.h (178358 => 178359)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.h 2015-01-13 12:05:42 UTC (rev 178358)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.h 2015-01-13 12:09:53 UTC (rev 178359)
</span><span class="lines">@@ -253,11 +253,13 @@
</span><span class="cx">
</span><span class="cx"> ChildrenInclusion childrenInclusion;
</span><span class="cx"> bool includeFocusableContent;
</span><ins>+ Node* ignoredChildNode;
</ins><span class="cx">
</span><del>- AccessibilityTextUnderElementMode(ChildrenInclusion c = TextUnderElementModeSkipIgnoredChildren, bool i = false)
- : childrenInclusion(c)
- , includeFocusableContent(i)
- { }
</del><ins>+ AccessibilityTextUnderElementMode(ChildrenInclusion c = TextUnderElementModeSkipIgnoredChildren, bool i = false, Node* ignored = nullptr)
+ : childrenInclusion(c)
+ , includeFocusableContent(i)
+ , ignoredChildNode(ignored)
+ { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum AccessibilityOrientation {
</span></span></pre>
</div>
</div>
</body>
</html>