2010-04-22  Diego Escalante Urrelo  <descalante@igalia.com>

        Reviewed by Xan Lopez.

        [Gtk] Evaluate and create tests for all the AtkRole's implemented by
        WebKitGtk
        https://bugs.webkit.org/show_bug.cgi?id=34449

        Implement ATK_ROLE_COMBO_BOX.

        * accessibility/gtk/AccessibilityObjectAtk.cpp:
        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
        (atkRole):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index ffef2a8..d09877f 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -360,8 +360,10 @@
         return ATK_ROLE_TREE;
     case MenuBarRole:
         return ATK_ROLE_MENU_BAR;
+    case MenuListPopupRole:
     case MenuRole:
         return ATK_ROLE_MENU;
+    case MenuListOptionRole:
     case MenuItemRole:
         return ATK_ROLE_MENU_ITEM;
     case ColumnRole:
@@ -379,6 +381,7 @@
         return ATK_ROLE_PROGRESS_BAR;
     case WindowRole:
         return ATK_ROLE_WINDOW;
+    case PopUpButtonRole:
     case ComboBoxRole:
         return ATK_ROLE_COMBO_BOX;
     case SplitGroupRole: