Changeset 49885 in webkit

Timestamp:

Oct 20, 2009 2:20:50 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-20 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=25411
[GTK] ATK accessible ancestry broken

Work around for the problem of bogus additional objects in the ancestry.
We now set the parent when we ref the child, then ask the Atk child if
it knows its parent. This solves the bulk of the cases. For those it
doesn't, fall back to the existing logic.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (webkit_accessible_get_parent): (webkit_accessible_ref_child):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-20  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25411
+        [GTK] ATK accessible ancestry broken
+
+        Work around for the problem of bogus additional objects in the ancestry.
+        We now set the parent when we ref the child, then ask the Atk child if
+        it knows its parent. This solves the bulk of the cases. For those it
+        doesn't, fall back to the existing logic.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_get_parent):
+        (webkit_accessible_ref_child):
+
 2009-10-20  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -133 +133 @@
 }
 
+static gpointer webkit_accessible_parent_class = NULL;
+
 static AtkObject* webkit_accessible_get_parent(AtkObject* object)
 {
+    // To work around bogus additional objects in the ancestry, we set the
+    // parent when we ref the child. If the child knows its parent, use that.
+    AtkObject* parent = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->get_parent(object);
+    if (parent)
+        return parent;
+
     AccessibilityObject* coreParent = core(object)->parentObject();
 
@@ -176 +184 @@
 
     AtkObject* child = coreChild->wrapper();
-    // TODO: Should we call atk_object_set_parent() here?
-    //atk_object_set_parent(child, object);
+    atk_object_set_parent(child, object);
     g_object_ref(child);
 
@@ -400 +407 @@
 }
 
-static gpointer webkit_accessible_parent_class = NULL;
-
 static AtkStateSet* webkit_accessible_ref_state_set(AtkObject* object)
 {