<!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>[162816] trunk/Source</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/162816">162816</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-01-26 15:40:41 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Disable accessibility after every test run
https://bugs.webkit.org/show_bug.cgi?id=127439
Reviewed by Alexey Proskuryakov.
../WebCore:
If accessibility is disabled, we may still need to return the existing
AXObjectCache, so that objects can be cleaned up appropriately.
A such we have to be prepared to handle a nullptr return value in more cases.
* accessibility/AXObjectCache.h:
(WebCore::AXObjectCache::disableAccessibility):
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::childrenChanged):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::remoteSVGRootElement):
* dom/Document.cpp:
(WebCore::Document::existingAXObjectCache):
../WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCacheh">trunk/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebCore/ChangeLog 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-26 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Disable accessibility after every test run
+ https://bugs.webkit.org/show_bug.cgi?id=127439
+
+ Reviewed by Alexey Proskuryakov.
+
+ If accessibility is disabled, we may still need to return the existing
+ AXObjectCache, so that objects can be cleaned up appropriately.
+
+ A such we have to be prepared to handle a nullptr return value in more cases.
+
+ * accessibility/AXObjectCache.h:
+ (WebCore::AXObjectCache::disableAccessibility):
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::childrenChanged):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::remoteSVGRootElement):
+ * dom/Document.cpp:
+ (WebCore::Document::existingAXObjectCache):
+
</ins><span class="cx"> 2014-01-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move history item visit count handling to WebKit
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.h 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -128,6 +128,8 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><span class="cx"> static void enableAccessibility() { gAccessibilityEnabled = true; }
</span><ins>+ static void disableAccessibility() { gAccessibilityEnabled = false; }
+
</ins><span class="cx"> // Enhanced user interface accessibility can be toggled by the assistive technology.
</span><span class="cx"> static void setEnhancedUserInterfaceAccessibility(bool flag) { gAccessibilityEnhancedUserInterfaceEnabled = flag; }
</span><span class="cx">
</span><span class="lines">@@ -135,6 +137,7 @@
</span><span class="cx"> static bool accessibilityEnhancedUserInterfaceEnabled() { return gAccessibilityEnhancedUserInterfaceEnabled; }
</span><span class="cx"> #else
</span><span class="cx"> static void enableAccessibility() { }
</span><ins>+ static void disableAccessibility() { }
</ins><span class="cx"> static void setEnhancedUserInterfaceAccessibility(bool) { }
</span><span class="cx"> static bool accessibilityEnabled() { return false; }
</span><span class="cx"> static bool accessibilityEnhancedUserInterfaceEnabled() { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -133,7 +133,10 @@
</span><span class="cx"> if (!node() && !renderer())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- axObjectCache()->postNotification(this, document(), AXObjectCache::AXChildrenChanged);
</del><ins>+ AXObjectCache* cache = axObjectCache();
+ if (!cache)
+ return;
+ cache->postNotification(this, document(), AXObjectCache::AXChildrenChanged);
</ins><span class="cx">
</span><span class="cx"> // Go up the accessibility parent chain, but only if the element already exists. This method is
</span><span class="cx"> // called during render layouts, minimal work should be done.
</span><span class="lines">@@ -147,11 +150,11 @@
</span><span class="cx">
</span><span class="cx"> // If this element supports ARIA live regions, then notify the AT of changes.
</span><span class="cx"> if (parent->supportsARIALiveRegion())
</span><del>- axObjectCache()->postNotification(parent, parent->document(), AXObjectCache::AXLiveRegionChanged);
</del><ins>+ cache->postNotification(parent, parent->document(), AXObjectCache::AXLiveRegionChanged);
</ins><span class="cx">
</span><span class="cx"> // If this element is an ARIA text control, notify the AT of changes.
</span><span class="cx"> if (parent->isARIATextControl() && !parent->isNativeTextControl() && !parent->node()->hasEditableStyle())
</span><del>- axObjectCache()->postNotification(parent, parent->document(), AXObjectCache::AXValueChanged);
</del><ins>+ cache->postNotification(parent, parent->document(), AXObjectCache::AXValueChanged);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -2796,44 +2796,47 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> if (!m_renderer || !m_renderer->isRenderImage())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> CachedImage* cachedImage = toRenderImage(m_renderer)->cachedImage();
</span><span class="cx"> if (!cachedImage)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Image* image = cachedImage->image();
</span><span class="cx"> if (!image || !image->isSVGImage())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> SVGImage* svgImage = static_cast<SVGImage*>(image);
</span><span class="cx"> FrameView* frameView = svgImage->frameView();
</span><span class="cx"> if (!frameView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> Frame& frame = frameView->frame();
</span><span class="cx">
</span><span class="cx"> Document* doc = frame.document();
</span><span class="cx"> if (!doc || !doc->isSVGDocument())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> SVGSVGElement* rootElement = toSVGDocument(doc)->rootElement();
</span><span class="cx"> if (!rootElement)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> RenderObject* rendererRoot = rootElement->renderer();
</span><span class="cx"> if (!rendererRoot)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- AccessibilityObject* rootSVGObject = frame.document()->axObjectCache()->getOrCreate(rendererRoot);
</del><ins>+ AXObjectCache* cache = frame.document()->axObjectCache();
+ if (!cache)
+ return nullptr;
+ AccessibilityObject* rootSVGObject = cache->getOrCreate(rendererRoot);
</ins><span class="cx">
</span><span class="cx"> // In order to connect the AX hierarchy from the SVG root element from the loaded resource
</span><span class="cx"> // the parent must be set, because there's no other way to get back to who created the image.
</span><span class="cx"> ASSERT(rootSVGObject && rootSVGObject->isAccessibilitySVGRoot());
</span><span class="cx"> if (!rootSVGObject->isAccessibilitySVGRoot())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return toAccessibilitySVGRoot(rootSVGObject);
</span><span class="cx"> #else
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -2175,9 +2175,6 @@
</span><span class="cx">
</span><span class="cx"> AXObjectCache* Document::existingAXObjectCache() const
</span><span class="cx"> {
</span><del>- if (!AXObjectCache::accessibilityEnabled())
- return nullptr;
-
</del><span class="cx"> if (!topDocument()->hasLivingRenderTree())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Internals.h"
</span><span class="cx">
</span><ins>+#include "AXObjectCache.h"
</ins><span class="cx"> #include "AnimationController.h"
</span><span class="cx"> #include "ApplicationCacheStorage.h"
</span><span class="cx"> #include "BackForwardController.h"
</span><span class="lines">@@ -291,6 +292,9 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> MediaSessionManager::sharedManager().resetRestrictions();
</span><span class="cx"> #endif
</span><ins>+#if HAVE(ACCESSIBILITY)
+ AXObjectCache::disableAccessibility();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Internals::Internals(Document* document)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebKit/ChangeLog 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-26 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Disable accessibility after every test run
+ https://bugs.webkit.org/show_bug.cgi?id=127439
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
</ins><span class="cx"> 2014-01-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (162815 => 162816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-01-26 22:55:41 UTC (rev 162815)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-01-26 23:40:41 UTC (rev 162816)
</span><span class="lines">@@ -469,3 +469,5 @@
</span><span class="cx"> symbolWithPointer(?completeURL@Document@WebCore@@UBE?AVURL@2@ABVString@WTF@@@Z, ?completeURL@Document@WebCore@@UEBA?AVURL@2@AEBVString@WTF@@@Z)
</span><span class="cx"> symbolWithPointer(??1DOMWindow@WebCore@@UAE@XZ, ??1DOMWindow@WebCore@@UEAA@XZ)
</span><span class="cx"> symbolWithPointer(?visibleContentRect@ScrollableArea@WebCore@@QBE?AVIntRect@2@W4VisibleContentRectBehavior@12@@Z, ?visibleContentRect@ScrollableArea@WebCore@@QEBA?AVIntRect@2@W4VisibleContentRectBehavior@12@@Z)
</span><ins>+ symbolWithPointer(?gAccessibilityEnabled@AXObjectCache@WebCore@@0_NA, ?gAccessibilityEnabled@AXObjectCache@WebCore@@0_NA)
+
</ins></span></pre>
</div>
</div>
</body>
</html>