Changeset 50509 in webkit

Timestamp:

Nov 4, 2009 2:35:56 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-04 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=31044
[Gtk] assertion when webkit_accessible_get_index_in_parent attempts to get parent of the web view

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (atkParentOfWebView): (webkit_accessible_get_index_in_parent): (webkit_accessible_get_parent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-04  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31044
+        [Gtk] assertion when webkit_accessible_get_index_in_parent attempts to get parent of the web view
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (atkParentOfWebView):
+        (webkit_accessible_get_index_in_parent):
+        (webkit_accessible_get_parent):
+
 2009-11-04  Dominik Röttsches  <dominik.roettsches@access-company.com>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -202 +202 @@
 static gpointer webkit_accessible_parent_class = NULL;
 
-static AtkObject* webkit_accessible_get_parent(AtkObject* object)
+static AtkObject* atkParentOfWebView(AtkObject* object)
 {
     AccessibilityObject* coreParent = core(object)->parentObjectUnignored();
@@ -222 +222 @@
 
     if (!coreParent)
-        return NULL;
+        return 0;
+
+    return coreParent->wrapper();
+}
+
+static AtkObject* webkit_accessible_get_parent(AtkObject* object)
+{
+    AccessibilityObject* coreParent = core(object)->parentObjectUnignored();
+    if (!coreParent && core(object)->isWebArea())
+        return atkParentOfWebView(object);
+
+    if (!coreParent)
+        return 0;
 
     return coreParent->wrapper();
@@ -256 +268 @@
     AccessibilityObject* parent = coreObject->parentObjectUnignored();
 
-    g_return_val_if_fail(parent, 0);
+    if (!parent && core(object)->isWebArea()) {
+        AtkObject* atkParent = atkParentOfWebView(object);
+        if (!atkParent)
+            return -1;
+
+        unsigned count = atk_object_get_n_accessible_children(atkParent);
+        for (unsigned i = 0; i < count; ++i) {
+            AtkObject* child = atk_object_ref_accessible_child(atkParent, i);
+            bool childIsObject = child == object;
+            g_object_unref(child);
+            if (childIsObject)
+                return i;
+        }
+    }
 
     AccessibilityObject::AccessibilityChildrenVector children = parent->children();
@@ -265 +290 @@
     }
 
-    return 0;
+    return -1;
 }