[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 761c5dff118d0673af5e2954d041962989a7acf2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 3 07:51:02 2009 +0000

    2009-11-02  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
    
            Reviewed by Xan Lopez.
    
            https://bugs.webkit.org/show_bug.cgi?id=31035
            [GTK] some accessibility tests hitting assertion in debug builds
    
            Get the correct Gtk+ object before attempting to turn it into an AtkObject.
    
            * DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
            (AccessibilityController::rootElement):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b8feca3..15b39e9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-02  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31035
+        [GTK] some accessibility tests hitting assertion in debug builds
+
+        Get the correct Gtk+ object before attempting to turn it into an AtkObject.
+
+        * DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
+        (AccessibilityController::rootElement):
+
 2009-11-02  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebKitTools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp
index 593f2eb..df06cea 100644
--- a/WebKitTools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp
@@ -58,7 +58,11 @@ AccessibilityUIElement AccessibilityController::focusedElement()
 AccessibilityUIElement AccessibilityController::rootElement()
 {
     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
-    AtkObject* axObject = gtk_widget_get_accessible(GTK_WIDGET(view));
+
+    // The presumed, desired rootElement is the parent of the web view.
+    GtkWidget* webViewParent = gtk_widget_get_parent(GTK_WIDGET(view));
+    AtkObject* axObject = gtk_widget_get_accessible(webViewParent);
+ 
     return AccessibilityUIElement(axObject);
 }
 

-- 
WebKit Debian packaging