Merge to m48: Stops using SYSTEM_STATE_INDETERMINATE as it makes radio buttons appear to have a mix…

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 1013 matching lines @@
 
     const AtomicString& expanded = getAttribute(aria_expandedAttr);
     if (equalIgnoringCase(expanded, "true"))
         return ExpandedExpanded;
     if (equalIgnoringCase(expanded, "false"))
         return ExpandedCollapsed;
 
     return ExpandedUndefined;
 }
 
-bool AXNodeObject::isIndeterminate() const
-{
-    Node* node = this->node();
-    if (!isHTMLInputElement(node))
-        return false;
-
-    return toHTMLInputElement(node)->shouldAppearIndeterminate();
-}
-
 bool AXNodeObject::isPressed() const
 {
     if (!isButton())
         return false;
 
     Node* node = this->node();
     if (!node)
         return false;
 
     // ARIA button with aria-pressed not undefined, then check for aria-pressed attribute rather than node()->active()
@@ skipping 278 matching lines @@
 
     HTMLLabelElement* label = labelForElement(toElement(node()));
     if (label)
         return axObjectCache().getOrCreate(label);
 
     return 0;
 }
 
 AccessibilityButtonState AXNodeObject::checkboxOrRadioValue() const
 {
+    if (isNativeCheckboxInMixedState())
+        return ButtonStateMixed;
+
     if (isNativeCheckboxOrRadio())
         return isChecked() ? ButtonStateOn : ButtonStateOff;
 
     return AXObject::checkboxOrRadioValue();
 }
 
 RGBA32 AXNodeObject::colorValue() const
 {
     if (!isHTMLInputElement(node()) || !isColorWell())
         return AXObject::colorValue();
@@ skipping 497 matching lines @@
     if (isHTMLInputElement(node())) {
         HTMLInputElement* element = toHTMLInputElement(node());
         placeholder = element->strippedPlaceholder();
         if (!placeholder.isEmpty())
             return placeholder;
     }
 
     return String();
 }
 
+bool AXNodeObject::isNativeCheckboxInMixedState() const
+{
+    if (!isHTMLInputElement(m_node))
+        return false;
+
+    HTMLInputElement* input = toHTMLInputElement(m_node);
+    return input->type() == InputTypeNames::checkbox
+        && input->shouldAppearIndeterminate();
+}
+
 //
 // New AX name calculation.
 //
 
 String AXNodeObject::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
     // If nameSources is non-null, relatedObjects is used in filling it in, so it must be non-null as well.
     if (nameSources)
         ASSERT(relatedObjects);
 
@@ skipping 1243 matching lines @@
     return String();
 }
 
 DEFINE_TRACE(AXNodeObject)
 {
     visitor->trace(m_node);
     AXObject::trace(visitor);
 }
 
 } // namespace blin