<!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>[192244] releases/WebKitGTK/webkit-2.10</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/192244">192244</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 06:38:08 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192103">r192103</a> - Layout Test accessibility/win/linked-elements.html is crashing on win debug
https://bugs.webkit.org/show_bug.cgi?id=150944
Reviewed by Chris Fleizach.
Source/WebCore:
Be more precise ASSERTing on textUnderElement, only checking that the render
tree is stable before using TextIteraror when in 'IncludeAllChildren' mode.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::textUnderElement):
LayoutTests:
Removed accessibility/win/linked-elements.html crashing expectation.
* platform/win/TestExpectations: Removed crashing expectation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreaccessibilityAccessibilityRenderObjectcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (192243 => 192244)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 14:36:00 UTC (rev 192243)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 14:38:08 UTC (rev 192244)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-06 Mario Sanchez Prada <mario@endlessm.com>
+
+ Layout Test accessibility/win/linked-elements.html is crashing on win debug
+ https://bugs.webkit.org/show_bug.cgi?id=150944
+
+ Reviewed by Chris Fleizach.
+
+ Removed accessibility/win/linked-elements.html crashing expectation.
+
+ * platform/win/TestExpectations: Removed crashing expectation.
+
</ins><span class="cx"> 2015-11-04 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference loading Blink layout test editing/execCommand/delete-hidden-crash.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192243 => 192244)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 14:36:00 UTC (rev 192243)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 14:38:08 UTC (rev 192244)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-06 Mario Sanchez Prada <mario@endlessm.com>
+
+ Layout Test accessibility/win/linked-elements.html is crashing on win debug
+ https://bugs.webkit.org/show_bug.cgi?id=150944
+
+ Reviewed by Chris Fleizach.
+
+ Be more precise ASSERTing on textUnderElement, only checking that the render
+ tree is stable before using TextIteraror when in 'IncludeAllChildren' mode.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::textUnderElement):
+
</ins><span class="cx"> 2015-11-04 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference loading Blink layout test editing/execCommand/delete-hidden-crash.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (192243 => 192244)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-11-10 14:36:00 UTC (rev 192243)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-11-10 14:38:08 UTC (rev 192244)
</span><span class="lines">@@ -632,10 +632,12 @@
</span><span class="cx"> if (m_renderer->isBR())
</span><span class="cx"> return ASCIILiteral("\n");
</span><span class="cx">
</span><ins>+ bool isRenderText = is<RenderText>(*m_renderer);
+
</ins><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> // Math operators create RenderText nodes on the fly that are not tied into the DOM in a reasonable way,
</span><span class="cx"> // so rangeOfContents does not work for them (nor does regular text selection).
</span><del>- if (is<RenderText>(*m_renderer) && m_renderer->isAnonymous() && ancestorsOfType<RenderMathMLOperator>(*m_renderer).first())
</del><ins>+ if (isRenderText && m_renderer->isAnonymous() && ancestorsOfType<RenderMathMLOperator>(*m_renderer).first())
</ins><span class="cx"> return downcast<RenderText>(*m_renderer).text();
</span><span class="cx"> if (is<RenderMathMLOperator>(*m_renderer) && !m_renderer->isAnonymous())
</span><span class="cx"> return downcast<RenderMathMLOperator>(*m_renderer).element().textContent();
</span><span class="lines">@@ -647,7 +649,8 @@
</span><span class="cx">
</span><span class="cx"> // We use a text iterator for text objects AND for those cases where we are
</span><span class="cx"> // explicitly asking for the full text under a given element.
</span><del>- if (is<RenderText>(*m_renderer) || mode.childrenInclusion == AccessibilityTextUnderElementMode::TextUnderElementModeIncludeAllChildren) {
</del><ins>+ bool shouldIncludeAllChildren = mode.childrenInclusion == AccessibilityTextUnderElementMode::TextUnderElementModeIncludeAllChildren;
+ if (isRenderText || shouldIncludeAllChildren) {
</ins><span class="cx"> // If possible, use a text iterator to get the text, so that whitespace
</span><span class="cx"> // is handled consistently.
</span><span class="cx"> Document* nodeDocument = nullptr;
</span><span class="lines">@@ -687,11 +690,10 @@
</span><span class="cx"> if (frame->document() != nodeDocument)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- // The render tree should be stable before going ahead. Otherwise, further uses of the
- // TextIterator will force a layout update, potentially altering the accessibility tree
- // and leading to crashes in the loop that computes the result text from the children.
- ASSERT(!nodeDocument->renderView()->layoutState());
- ASSERT(!nodeDocument->childNeedsStyleRecalc());
</del><ins>+ // The tree should be stable before looking through the children of a non-Render Text object.
+ // Otherwise, further uses of TextIterator will force a layout update, potentially altering
+ // the accessibility tree and causing crashes in the loop that computes the result text.
+ ASSERT((isRenderText || !shouldIncludeAllChildren) || (!nodeDocument->renderView()->layoutState() && !nodeDocument->childNeedsStyleRecalc()));
</ins><span class="cx">
</span><span class="cx"> return plainText(textRange.get(), textIteratorBehaviorForTextRange());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>