Multiselectable touchups for ARIA widgets

third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp

Index: third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
index 236cd2a75507caac6b60a0d39cdfb15fc718853a..dda213c67ef639fa74899d35e342153145c14f17 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
@@ -1047,10 +1047,20 @@ bool AXNodeObject::IsMeter() const {
 }
 
 bool AXNodeObject::IsMultiSelectable() const {
-  bool multiselectable = false;
-  if (HasAOMPropertyOrARIAAttribute(AOMBooleanProperty::kMultiselectable,
-                                    multiselectable)) {
-    return multiselectable;
+  switch (RoleValue()) {
+    case kGridRole:
+    case kTreeGridRole:
+    case kTreeRole:
+    case kListBoxRole:
+    case kTabListRole: {
+      bool multiselectable = false;
+      if (HasAOMPropertyOrARIAAttribute(AOMBooleanProperty::kMultiselectable,
+                                        multiselectable)) {
+        return multiselectable;
+      }
+    }
+    default:
+      break;
   }
 
   return isHTMLSelectElement(GetNode()) &&