[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d418cc47a2658ff2a2f07bd336f72d84c1dbe8fe
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 18:35:38 2010 +0000

    2010-02-04  José Millán Soto  <jmillan at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [Gtk] webkitgtk crashed when Orca open
            https://bugs.webkit.org/show_bug.cgi?id=34463
    
            * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
            (textForObject):
            Checking if render objects are texts before calling toRenderText
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c12036d..7d2b924 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-04  José Millán Soto  <jmillan at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] webkitgtk crashed when Orca open
+        https://bugs.webkit.org/show_bug.cgi?id=34463
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (textForObject):
+        Checking if render objects are texts before calling toRenderText
+
 2010-02-04  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index a4d1638..487fa5b 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -884,14 +884,14 @@ gchar* textForObject(AccessibilityRenderObject* accObject)
                 continue;
             }
 
-            RenderText* renderText = toRenderText(obj);
-            // Be sure we have a RenderText object we can work with.
-            if (!renderText || !obj->isText()) {
+            RenderText* renderText;
+            if (obj->isText())
+                renderText = toRenderText(obj);
+            else if (obj->firstChild() && obj->firstChild()->isText()) {
                 // Handle RenderInlines (and any other similiar RenderObjects).
                 renderText = toRenderText(obj->firstChild());
-                if (!renderText)
-                    continue;
-            }
+            } else
+                continue;
 
             InlineTextBox* box = renderText->firstTextBox();
             while (box) {

-- 
WebKit Debian packaging