Changeset 160968 in webkit

Timestamp:

Dec 21, 2013, 12:25:58 PM (11 years ago)

Author:

Antti Koivisto

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityRenderObject.cpp (modified) (6 diffs)
• accessibility/AccessibilityRenderObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-21  Antti Koivisto  <antti@apple.com>
+
+        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>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -101 +101 @@
 #include "htmlediting.h"
 #include <wtf/StdLibExtras.h>
-#include <wtf/TemporaryChange.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/unicode/CharacterNames.h>
@@ -112 +111 @@
     : AccessibilityNodeObject(renderer->node())
     , m_renderer(renderer)
-#ifndef NDEBUG
-    , m_inComputeAccessibilityIsIgnored(false)
-#endif
 {
 #ifndef NDEBUG
@@ -124 +120 @@
 {
     ASSERT(isDetached());
-    ASSERT(!m_inComputeAccessibilityIsIgnored);
 }
 
@@ -147 +142 @@
         m_renderer->setHasAXObject(false);
 #endif
-    ASSERT(!m_inComputeAccessibilityIsIgnored);
     m_renderer = 0;
 }
@@ -1162 +1156 @@
 #ifndef NDEBUG
     ASSERT(m_initialized);
-    TemporaryChange<bool>(m_inComputeAccessibilityIsIgnored, true);
 #endif
 
@@ -1191 +1184 @@
     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())

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -212 +212 @@
 protected:
     RenderObject* m_renderer;
-
-#ifndef NDEBUG
-    mutable bool m_inComputeAccessibilityIsIgnored;
-#endif
     
     void setRenderObject(RenderObject* renderer) { m_renderer = renderer; }