<!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>[178775] branches/safari-600.1.4.15-branch/Source/WebCore</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/178775">178775</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 16:51:57 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174345">r174345</a>. rdar://problem/19450106</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreaccessibilityAccessibilityObjectcpp">branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreaccessibilityAccessibilityTableCellcpp">branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityTableCell.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178774 => 178775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 00:50:56 UTC (rev 178774)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 00:51:57 UTC (rev 178775)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174345.
+
+ 2014-10-06 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Performance: Certain Web site causes Safari to hang completely while entering form data
+ https://bugs.webkit.org/show_bug.cgi?id=137420
+
+ Reviewed by Mario Sanchez Prada.
+
+ If a website has multiple nested tables that are not "accessibility" tables, the performance of accessibility slows to a crawl because:
+ 1) We are re-computing accessibilityIsIgnored many times.
+ As a solution, we can enable the isIgnoredCache when updating children.
+ 2) When asking if an object isTableCell, we'd go up the parent chain, asking each of those parents the same question, which exploded into calling this many times.
+ As a solution, I've changed our determination of isTableCell to instead check if the parent is an accessibiltyTable which should be much faster.
+
+ No new functionality. Existing tests cover changes.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::updateChildrenIfNecessary):
+ (WebCore::AccessibilityObject::accessibilityIsIgnored):
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::parentTable):
+ (WebCore::AccessibilityTableCell::isTableCell):
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r174330.
</span><span class="cx">
</span><span class="cx"> 2014-10-05 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityObject.cpp (178774 => 178775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-01-21 00:50:56 UTC (rev 178774)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-01-21 00:51:57 UTC (rev 178775)
</span><span class="lines">@@ -1491,8 +1491,11 @@
</span><span class="cx">
</span><span class="cx"> void AccessibilityObject::updateChildrenIfNecessary()
</span><span class="cx"> {
</span><del>- if (!hasChildren())
- addChildren();
</del><ins>+ if (!hasChildren()) {
+ // Enable the cache in case we end up adding a lot of children, we don't want to recompute axIsIgnored each time.
+ AXAttributeCacheEnabler enableCache(axObjectCache());
+ addChildren();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityObject::clearChildren()
</span><span class="lines">@@ -2407,7 +2410,8 @@
</span><span class="cx"> bool AccessibilityObject::accessibilityIsIgnored() const
</span><span class="cx"> {
</span><span class="cx"> AXComputedObjectAttributeCache* attributeCache = nullptr;
</span><del>- if (AXObjectCache* cache = axObjectCache())
</del><ins>+ AXObjectCache* cache = axObjectCache();
+ if (cache)
</ins><span class="cx"> attributeCache = cache->computedObjectAttributeCache();
</span><span class="cx">
</span><span class="cx"> if (attributeCache) {
</span><span class="lines">@@ -2424,7 +2428,8 @@
</span><span class="cx">
</span><span class="cx"> bool result = computeAccessibilityIsIgnored();
</span><span class="cx">
</span><del>- if (attributeCache)
</del><ins>+ // In case computing axIsIgnored disables attribute caching, we should refetch the object to see if it exists.
+ if (cache && (attributeCache = cache->computedObjectAttributeCache()))
</ins><span class="cx"> attributeCache->setIgnored(axObjectID(), result ? IgnoreObject : IncludeObject);
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityTableCell.cpp (178774 => 178775)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2015-01-21 00:50:56 UTC (rev 178774)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2015-01-21 00:51:57 UTC (rev 178775)
</span><span class="lines">@@ -86,17 +86,20 @@
</span><span class="cx"> // by javascript, and creating a table element may try to access the render tree while in a bad state.
</span><span class="cx"> // By using only get() implies that the AXTable must be created before AXTableCells. This should
</span><span class="cx"> // always be the case when AT clients access a table.
</span><del>- // https://bugs.webkit.org/show_bug.cgi?id=42652
- return toAccessibilityTable(axObjectCache()->get(toRenderTableCell(m_renderer)->table()));
</del><ins>+ // https://bugs.webkit.org/show_bug.cgi?id=42652
+ AccessibilityObject* parentTable = axObjectCache()->get(toRenderTableCell(m_renderer)->table());
+ if (!parentTable || !parentTable->isTable())
+ return nullptr;
+ return toAccessibilityTable(parentTable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityTableCell::isTableCell() const
</span><span class="cx"> {
</span><del>- AccessibilityObject* parent = parentObjectUnignored();
- if (!parent || !parent->isTableRow())
- return false;
-
- return true;
</del><ins>+ // If the parent table is an accessibility table, then we are a table cell.
+ // This used to check if the unignoredParent was a row, but that exploded performance if
+ // this was in nested tables. This check should be just as good.
+ AccessibilityObject* parentTable = this->parentTable();
+ return parentTable && parentTable->isAccessibilityTable();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityRole AccessibilityTableCell::determineAccessibilityRole()
</span></span></pre>
</div>
</div>
</body>
</html>