Changeset 160916 in webkit

Timestamp:

Dec 20, 2013 11:05:34 AM (10 years ago)

Author:

Antti Koivisto

Message:

Crashes in AccessibilityRenderObject::computeAccessibilityIsIgnored()
​https://bugs.webkit.org/show_bug.cgi?id=126073

Reviewed by Ryosuke Niwa.

Prevent the crash and try to catch in debug why it is happening.

• 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-20  Antti Koivisto  <antti@apple.com>
+
+        Crashes in AccessibilityRenderObject::computeAccessibilityIsIgnored()
+        https://bugs.webkit.org/show_bug.cgi?id=126073
+
+        Reviewed by Ryosuke Niwa.
+
+        Prevent the crash and try to catch in debug why it is happening.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::AccessibilityRenderObject):
+        (WebCore::AccessibilityRenderObject::~AccessibilityRenderObject):
+        (WebCore::AccessibilityRenderObject::detach):
+        (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+        * accessibility/AccessibilityRenderObject.h:
+
 2013-12-20  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>
@@ -111 +112 @@
     : AccessibilityNodeObject(renderer->node())
     , m_renderer(renderer)
+#ifndef NDEBUG
+    , m_inComputeAccessibilityIsIgnored(false)
+#endif
 {
 #ifndef NDEBUG
@@ -120 +124 @@
 {
     ASSERT(isDetached());
+    ASSERT(!m_inComputeAccessibilityIsIgnored);
 }
 
@@ -142 +147 @@
         m_renderer->setHasAXObject(false);
 #endif
+    ASSERT(!m_inComputeAccessibilityIsIgnored);
     m_renderer = 0;
 }
@@ -1156 +1162 @@
 #ifndef NDEBUG
     ASSERT(m_initialized);
+    TemporaryChange<bool>(m_inComputeAccessibilityIsIgnored, true);
 #endif
 
@@ -1184 +1191 @@
     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; }