Changeset 82296 in webkit

Timestamp:

Mar 29, 2011 11:50:32 AM (13 years ago)

Author:

mario@webkit.org

Message:

2011-03-29 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[Gtk] Consistent crash from Google/ARIA combobox click
​https://bugs.webkit.org/show_bug.cgi?id=55883

Added new layout test to check this doesn't crash anymore in GTK.

• platform/gtk/accessibility/aria-options-and-menuitems-crash-expected.txt: Added.
• platform/gtk/accessibility/aria-options-and-menuitems-crash.html: Added.

2011-03-29 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[Gtk] Consistent crash from Google/ARIA combobox click
​https://bugs.webkit.org/show_bug.cgi?id=55883

Do not call to firstChild() to avoid entering into infinite loops.

This would happen when current item is a WebCore Group and some of
its children have either role 'option' or 'menuitem'. Other than
that the logic behind that call to firstChild() seems to be no
longer needed so it's safe to remove it.

Test: platform/gtk/accessibility/aria-options-and-menuitems-crash.html

• accessibility/gtk/AccessibilityObjectAtk.cpp: (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject): Remove call to firsChild, which was leading to crashes sometimes.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/aria-options-and-menuitems-crash-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/aria-options-and-menuitems-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-29  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk] Consistent crash from Google/ARIA combobox click
+        https://bugs.webkit.org/show_bug.cgi?id=55883
+
+        Added new layout test to check this doesn't crash anymore in GTK.
+
+        * platform/gtk/accessibility/aria-options-and-menuitems-crash-expected.txt: Added.
+        * platform/gtk/accessibility/aria-options-and-menuitems-crash.html: Added.
+
 2011-03-29  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-29  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk] Consistent crash from Google/ARIA combobox click
+        https://bugs.webkit.org/show_bug.cgi?id=55883
+
+        Do not call to firstChild() to avoid entering into infinite loops.
+
+        This would happen when current item is a WebCore Group and some of
+        its children have either role 'option' or 'menuitem'. Other than
+        that the logic behind that call to firstChild() seems to be no
+        longer needed so it's safe to remove it.
+
+        Test: platform/gtk/accessibility/aria-options-and-menuitems-crash.html
+
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+        Remove call to firsChild, which was leading to crashes sometimes.
+
 2011-03-29  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp

@@ -44 +44 @@
         return IncludeObject;
 
-    if (isGroup()) {
-        // When a list item is made up entirely of children (e.g. paragraphs)
-        // the list item gets ignored. We need it.
-        if (parent->isList())
-            return IncludeObject;
-
-        // We expect the parent of a table cell to be a table.
-        AccessibilityObject* child = firstChild();
-        if (child && child->roleValue() == CellRole)
-            return IgnoreObject;
-    }
+    // When a list item is made up entirely of children (e.g. paragraphs)
+    // the list item gets ignored. We need it.
+    if (isGroup() && parent->isList())
+        return IncludeObject;
 
     // Entries and password fields have extraneous children which we want to ignore.