Changeset 54355 in webkit

Timestamp:

Feb 4, 2010 10:35:38 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-04 José Millán Soto <​jmillan@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

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-04  José Millán Soto  <jmillan@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@igalia.com>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -885 +885 @@
             }
 
-            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();