<!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>[160968] trunk/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/160968">160968</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-12-21 12:25:58 -0800 (Sat, 21 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/160916">r160916</a>.
http://trac.webkit.org/changeset/160916
https://bugs.webkit.org/show_bug.cgi?id=126073
Roll out a temporary fix. The underlying issue was fixed.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::AccessibilityRenderObject):
(WebCore::AccessibilityRenderObject::~AccessibilityRenderObject):
(WebCore::AccessibilityRenderObject::detach):
(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
* accessibility/AccessibilityRenderObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160967 => 160968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-21 19:25:09 UTC (rev 160967)
+++ trunk/Source/WebCore/ChangeLog 2013-12-21 20:25:58 UTC (rev 160968)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2013-12-21 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r160916.
+ http://trac.webkit.org/changeset/160916
+ https://bugs.webkit.org/show_bug.cgi?id=126073
+
+ Roll out a temporary fix. The underlying issue was fixed.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::AccessibilityRenderObject):
+ (WebCore::AccessibilityRenderObject::~AccessibilityRenderObject):
+ (WebCore::AccessibilityRenderObject::detach):
+ (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+ * accessibility/AccessibilityRenderObject.h:
+
+2013-12-21 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Figure out if node is focusable without requiring renderer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126118
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (160967 => 160968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-12-21 19:25:09 UTC (rev 160967)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-12-21 20:25:58 UTC (rev 160968)
</span><span class="lines">@@ -100,7 +100,6 @@
</span><span class="cx"> #include "VisibleUnits.h"
</span><span class="cx"> #include "htmlediting.h"
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <wtf/TemporaryChange.h>
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><span class="lines">@@ -111,9 +110,6 @@
</span><span class="cx"> AccessibilityRenderObject::AccessibilityRenderObject(RenderObject* renderer)
</span><span class="cx"> : AccessibilityNodeObject(renderer->node())
</span><span class="cx"> , m_renderer(renderer)
</span><del>-#ifndef NDEBUG
- , m_inComputeAccessibilityIsIgnored(false)
-#endif
</del><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_renderer->setHasAXObject(true);
</span><span class="lines">@@ -123,7 +119,6 @@
</span><span class="cx"> AccessibilityRenderObject::~AccessibilityRenderObject()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isDetached());
</span><del>- ASSERT(!m_inComputeAccessibilityIsIgnored);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::init()
</span><span class="lines">@@ -146,7 +141,6 @@
</span><span class="cx"> if (m_renderer)
</span><span class="cx"> m_renderer->setHasAXObject(false);
</span><span class="cx"> #endif
</span><del>- ASSERT(!m_inComputeAccessibilityIsIgnored);
</del><span class="cx"> m_renderer = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1161,7 +1155,6 @@
</span><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> ASSERT(m_initialized);
</span><del>- TemporaryChange<bool>(m_inComputeAccessibilityIsIgnored, true);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Check first if any of the common reasons cause this element to be ignored.
</span><span class="lines">@@ -1190,11 +1183,7 @@
</span><span class="cx"> // Allow the platform to decide if the attachment is ignored or not.
</span><span class="cx"> if (isAttachment())
</span><span class="cx"> return accessibilityIgnoreAttachment();
</span><del>-
- // FIXME: Somehow the renderer is becoming null.
- if (!m_renderer)
- return false;
-
</del><ins>+
</ins><span class="cx"> // ignore popup menu items because AppKit does
</span><span class="cx"> if (ancestorsOfType<RenderMenuList>(*m_renderer).first())
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (160967 => 160968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2013-12-21 19:25:09 UTC (rev 160967)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2013-12-21 20:25:58 UTC (rev 160968)
</span><span class="lines">@@ -211,10 +211,6 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> RenderObject* m_renderer;
</span><del>-
-#ifndef NDEBUG
- mutable bool m_inComputeAccessibilityIsIgnored;
-#endif
</del><span class="cx">
</span><span class="cx"> void setRenderObject(RenderObject* renderer) { m_renderer = renderer; }
</span><span class="cx"> bool needsToUpdateChildren() const { return m_childrenDirty; }
</span></span></pre>
</div>
</div>
</body>
</html>