Title: [160968] trunk/Source/WebCore
- Revision
- 160968
- Author
- [email protected]
- Date
- 2013-12-21 12:25:58 -0800 (Sat, 21 Dec 2013)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160967 => 160968)
--- 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)
@@ -1,5 +1,20 @@
2013-12-21 Antti Koivisto <[email protected]>
+ 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 <[email protected]>
+
Figure out if node is focusable without requiring renderer
https://bugs.webkit.org/show_bug.cgi?id=126118
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (160967 => 160968)
--- 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)
@@ -100,7 +100,6 @@
#include "VisibleUnits.h"
#include "htmlediting.h"
#include <wtf/StdLibExtras.h>
-#include <wtf/TemporaryChange.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/unicode/CharacterNames.h>
@@ -111,9 +110,6 @@
AccessibilityRenderObject::AccessibilityRenderObject(RenderObject* renderer)
: AccessibilityNodeObject(renderer->node())
, m_renderer(renderer)
-#ifndef NDEBUG
- , m_inComputeAccessibilityIsIgnored(false)
-#endif
{
#ifndef NDEBUG
m_renderer->setHasAXObject(true);
@@ -123,7 +119,6 @@
AccessibilityRenderObject::~AccessibilityRenderObject()
{
ASSERT(isDetached());
- ASSERT(!m_inComputeAccessibilityIsIgnored);
}
void AccessibilityRenderObject::init()
@@ -146,7 +141,6 @@
if (m_renderer)
m_renderer->setHasAXObject(false);
#endif
- ASSERT(!m_inComputeAccessibilityIsIgnored);
m_renderer = 0;
}
@@ -1161,7 +1155,6 @@
{
#ifndef NDEBUG
ASSERT(m_initialized);
- TemporaryChange<bool>(m_inComputeAccessibilityIsIgnored, true);
#endif
// Check first if any of the common reasons cause this element to be ignored.
@@ -1190,11 +1183,7 @@
// Allow the platform to decide if the attachment is ignored or not.
if (isAttachment())
return accessibilityIgnoreAttachment();
-
- // FIXME: Somehow the renderer is becoming null.
- if (!m_renderer)
- return false;
-
+
// ignore popup menu items because AppKit does
if (ancestorsOfType<RenderMenuList>(*m_renderer).first())
return true;
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (160967 => 160968)
--- 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)
@@ -211,10 +211,6 @@
protected:
RenderObject* m_renderer;
-
-#ifndef NDEBUG
- mutable bool m_inComputeAccessibilityIsIgnored;
-#endif
void setRenderObject(RenderObject* renderer) { m_renderer = renderer; }
bool needsToUpdateChildren() const { return m_childrenDirty; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
