Multiselectable touchups for ARIA widgets

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

 /*
  * Copyright (C) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 1029 matching lines @@
 
 bool AXNodeObject::IsMenuButton() const {
   return RoleValue() == kMenuButtonRole;
 }
 
 bool AXNodeObject::IsMeter() const {
   return RoleValue() == kMeterRole;
 }
 
 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;
+      }
+
+      return isHTMLSelectElement(GetNode()) &&

[dmazzoni, 2017/05/19 19:40:56]

I'm not sure this covers all of the possible roles for
a <select multiple>. In particular on Android I think
a <select multiple> appears as a pop-up button (just
like a regular <select>) and when you click on it, it
pops up a list with items you can check.

I'd put this out of the switch.

+             toHTMLSelectElement(*GetNode()).IsMultiple();
+    }
+    default:
+      break;
   }
 
-  return isHTMLSelectElement(GetNode()) &&
-         toHTMLSelectElement(*GetNode()).IsMultiple();
+  return false;
 }
 
 bool AXNodeObject::IsNativeCheckboxOrRadio() const {
   Node* node = this->GetNode();
   if (!isHTMLInputElement(node))
     return false;
 
   HTMLInputElement* input = toHTMLInputElement(node);
   return input->type() == InputTypeNames::checkbox ||
          input->type() == InputTypeNames::radio;
@@ skipping 2158 matching lines @@
     return String();
   return ToTextControlElement(node)->StrippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->Trace(node_);
   AXObjectImpl::Trace(visitor);
 }
 
 }  // namespace blink