Changeset 78987 in webkit

Timestamp:

Feb 18, 2011 2:52:57 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-02-18 Philippe Normand <​pnormand@igalia.com>

Unreviewed, rolling out r78979.
​http://trac.webkit.org/changeset/78979
​https://bugs.webkit.org/show_bug.cgi?id=53146

causes multiple crashes on GTK

• platform/gtk/accessibility/combo-box-collapsed-selection-changed-expected.txt: Removed.
• platform/gtk/accessibility/combo-box-collapsed-selection-changed.html: Removed.

2011-02-18 Philippe Normand <​pnormand@igalia.com>

Unreviewed, rolling out r78979.
​http://trac.webkit.org/changeset/78979
​https://bugs.webkit.org/show_bug.cgi?id=53146

causes multiple crashes on GTK

• accessibility/gtk/AXObjectCacheAtk.cpp: (WebCore::notifyChildrenSelectionChange): (WebCore::AXObjectCache::postPlatformNotification):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/combo-box-collapsed-selection-changed-expected.txt (deleted)
• LayoutTests/platform/gtk/accessibility/combo-box-collapsed-selection-changed.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-18  Philippe Normand  <pnormand@igalia.com>
+
+        Unreviewed, rolling out r78979.
+        http://trac.webkit.org/changeset/78979
+        https://bugs.webkit.org/show_bug.cgi?id=53146
+
+        causes multiple crashes on GTK
+
+        * platform/gtk/accessibility/combo-box-collapsed-selection-changed-expected.txt: Removed.
+        * platform/gtk/accessibility/combo-box-collapsed-selection-changed.html: Removed.
+
 2011-02-18  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-18  Philippe Normand  <pnormand@igalia.com>
+
+        Unreviewed, rolling out r78979.
+        http://trac.webkit.org/changeset/78979
+        https://bugs.webkit.org/show_bug.cgi?id=53146
+
+        causes multiple crashes on GTK
+
+        * accessibility/gtk/AXObjectCacheAtk.cpp:
+        (WebCore::notifyChildrenSelectionChange):
+        (WebCore::AXObjectCache::postPlatformNotification):
+
 2011-02-18  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -43 +43 @@
 }
 
-static AccessibilityObject* getListObject(AccessibilityObject* object)
-{
-    // Only list boxes and menu lists supported so far.
-    if (!object->isListBox() && !object->isMenuList())
-        return 0;
-
-    // For list boxes the list object is just itself.
-    if (object->isListBox())
-        return object;
-
-    // For menu lists we need to return the first accessible child,
-    // with role MenuListPopupRole, since that's the one holding the list
-    // of items with role MenuListOptionRole.
-    AccessibilityObject::AccessibilityChildrenVector children = object->children();
-    if (!children.size())
-        return 0;
-
-    AccessibilityObject* listObject = children.at(0).get();
-    if (!listObject->isMenuListPopup())
-        return 0;
-
-    return listObject;
-}
-
 static void notifyChildrenSelectionChange(AccessibilityObject* object)
 {
@@ -74 +50 @@
     static RefPtr<AccessibilityObject> oldFocusedObject = 0;
 
-    // Only list boxes and menu lists supported so far.
-    if (!object || !(object->isListBox() || object->isMenuList()))
+    // Only list boxes supported so far.
+    if (!object || !object->isListBox())
         return;
 
@@ -82 +58 @@
 
     // Find the item where the selection change was triggered from.
+    AccessibilityObject::AccessibilityChildrenVector items = object->children();
     SelectElement* select = toSelectElement(static_cast<Element*>(object->node()));
     if (!select)
         return;
     int changedItemIndex = select->activeSelectionStartListIndex();
-
-    AccessibilityObject* listObject = getListObject(object);
-    if (!listObject)
-        return;
-
-    AccessibilityObject::AccessibilityChildrenVector items = listObject->children();
     if (changedItemIndex < 0 || changedItemIndex >= static_cast<int>(items.size()))
         return;
@@ -133 +104 @@
             return;
         g_signal_emit_by_name(axObject, "state-change", "checked", coreObject->isChecked());
-    } else if (notification == AXSelectedChildrenChanged || notification == AXMenuListValueChanged) {
-        if (notification == AXMenuListValueChanged && coreObject->isMenuList()) {
-            g_signal_emit_by_name(axObject, "focus-event", true);
-            g_signal_emit_by_name(axObject, "state-change", "focused", true);
-        }
+    } else if (notification == AXMenuListValueChanged) {
+        if (!coreObject->isMenuList())
+            return;
+        g_signal_emit_by_name(axObject, "focus-event", true);
+        g_signal_emit_by_name(axObject, "state-change", "focused", true);
+    } else if (notification == AXSelectedChildrenChanged)
         notifyChildrenSelectionChange(coreObject);
-    }
 }