<!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>[209930] branches/safari-602-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/209930">209930</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 12:01:01 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/209926">r209926</a>. rdar://problem/29706846</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreaccessibilityAXObjectCachecpp">branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreaccessibilityAXObjectCacheh">branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageFrameViewcpp">branches/safari-602-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderBlockcpp">branches/safari-602-branch/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderBlockLineLayoutcpp">branches/safari-602-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsaccessibilityaccessibilitycrashwithdynamicinlinecontentexpectedtxt">branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsaccessibilityaccessibilitycrashwithdynamicinlinecontenthtml">branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-16 Jason Marcell <jmarcell@apple.com>
+
+ Merge r209926. rdar://problem/29706846
+
+ 2016-12-16 Zalan Bujtas <zalan@apple.com>
+
+ Defer certain accessibility callbacks until after layout is finished.
+ https://bugs.webkit.org/show_bug.cgi?id=165861
+ rdar://problem/29646301
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/accessibility-crash-with-dynamic-inline-content-expected.txt: Added.
+ * accessibility/accessibility-crash-with-dynamic-inline-content.html: Added.
+
</ins><span class="cx"> 2016-12-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204664.
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsaccessibilityaccessibilitycrashwithdynamicinlinecontentexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content-expected.txt (0 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content-expected.txt 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if no crash or assert. foo
+foobar
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsaccessibilityaccessibilitycrashwithdynamicinlinecontenthtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content.html (0 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/accessibility/accessibility-crash-with-dynamic-inline-content.html 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<title>This tests accessibility with dynamic inline content.</title>
+</head>
+<body>
+PASS if no crash or assert.
+<span id="ariafoo">foo</span><div aria-labeledby = "ariafoo">foobar<details id="details" open="true">
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+setTimeout(function() {
+ details.open = false;
+ testRunner.notifyDone();
+}, 0);
+</script>
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-12-16 Jason Marcell <jmarcell@apple.com>
+
+ Merge r209926. rdar://problem/29706846
+
+ 2016-12-16 Zalan Bujtas <zalan@apple.com>
+
+ Defer certain accessibility callbacks until after layout is finished.
+ https://bugs.webkit.org/show_bug.cgi?id=165861
+ rdar://problem/29646301
+
+ Reviewed by Chris Fleizach.
+
+ Currently with certain AXObjectCache callbacks, we can end up in a layout while the render tree is being mutated.
+ This patch ensures that such callbacks are deferred until after tree mutation/layout is finished.
+
+ Test: accessibility/accessibility-crash-with-dynamic-inline-content.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::remove):
+ (WebCore::AXObjectCache::performDeferredIsIgnoredChange):
+ (WebCore::AXObjectCache::insertDeferredIsIgnoredChange):
+ * accessibility/AXObjectCache.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::performPostLayoutTasks):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::deleteLines):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::createAndAppendRootInlineBox):
+
</ins><span class="cx"> 2016-12-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204664.
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.cpp (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.cpp 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.cpp 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -703,6 +703,8 @@
</span><span class="cx"> AXID axID = m_renderObjectMapping.get(renderer);
</span><span class="cx"> remove(axID);
</span><span class="cx"> m_renderObjectMapping.remove(renderer);
</span><ins>+ if (is<RenderBlock>(*renderer))
+ m_deferredIsIgnoredChangeList.remove(downcast<RenderBlock>(renderer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AXObjectCache::remove(Node* node)
</span><span class="lines">@@ -2609,6 +2611,18 @@
</span><span class="cx"> return axObject && axObject->isTextControl();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AXObjectCache::performDeferredIsIgnoredChange()
+{
+ for (auto* renderer : m_deferredIsIgnoredChangeList)
+ recomputeIsIgnored(renderer);
+ m_deferredIsIgnoredChangeList.clear();
+}
+
+void AXObjectCache::recomputeDeferredIsIgnored(RenderBlock& renderer)
+{
+ m_deferredIsIgnoredChangeList.add(&renderer);
+}
+
</ins><span class="cx"> bool isNodeAriaVisible(Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (!node)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.h (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.h 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/Source/WebCore/accessibility/AXObjectCache.h 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> class HTMLAreaElement;
</span><span class="cx"> class Node;
</span><span class="cx"> class Page;
</span><ins>+class RenderBlock;
</ins><span class="cx"> class RenderObject;
</span><span class="cx"> class ScrollView;
</span><span class="cx"> class VisiblePosition;
</span><span class="lines">@@ -324,6 +325,8 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> static void setShouldRepostNotificationsForTests(bool value);
</span><span class="cx"> #endif
</span><ins>+ void recomputeDeferredIsIgnored(RenderBlock& renderer);
+ void performDeferredIsIgnoredChange();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void postPlatformNotification(AccessibilityObject*, AXNotification);
</span><span class="lines">@@ -422,6 +425,7 @@
</span><span class="cx">
</span><span class="cx"> AXTextStateChangeIntent m_textSelectionIntent;
</span><span class="cx"> bool m_isSynchronizingSelection { false };
</span><ins>+ ListHashSet<RenderBlock*> m_deferredIsIgnoredChangeList;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class AXAttributeCacheEnabler
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/FrameView.cpp (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/FrameView.cpp 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/Source/WebCore/page/FrameView.cpp 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -3249,6 +3249,9 @@
</span><span class="cx"> viewportContentsChanged();
</span><span class="cx">
</span><span class="cx"> updateScrollSnapState();
</span><ins>+
+ if (AXObjectCache* cache = frame().document()->existingAXObjectCache())
+ cache->performDeferredIsIgnoredChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize FrameView::sizeForResizeEvent() const
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderBlock.cpp (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderBlock.cpp 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderBlock.cpp 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> void RenderBlock::deleteLines()
</span><span class="cx"> {
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><del>- cache->recomputeIsIgnored(this);
</del><ins>+ cache->recomputeDeferredIsIgnored(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::makeChildrenNonInline(RenderObject* insertionPoint)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp (209929 => 209930)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-12-16 19:28:58 UTC (rev 209929)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-12-16 20:01:01 UTC (rev 209930)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> if (UNLIKELY(AXObjectCache::accessibilityEnabled()) && firstRootBox() == rootBox) {
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><del>- cache->recomputeIsIgnored(this);
</del><ins>+ cache->recomputeDeferredIsIgnored(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return rootBox;
</span></span></pre>
</div>
</div>
</body>
</html>