AX checked state changes

third_party/WebKit/Source/web/WebAXObject.cpp

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/accessibility/AXTable.h"
 #include "modules/accessibility/AXTableCell.h"
 #include "modules/accessibility/AXTableColumn.h"
 #include "modules/accessibility/AXTableRow.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
+#include "public/web/WebAXStrings.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebNode.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 class WebAXSparseAttributeClientAdapter : public AXSparseAttributeClient {
@@ skipping 208 matching lines @@
   return m_private->ariaAutoComplete();
 }
 
 WebAXAriaCurrentState WebAXObject::ariaCurrentState() const {
   if (isDetached())
     return WebAXAriaCurrentStateUndefined;
 
   return static_cast<WebAXAriaCurrentState>(m_private->ariaCurrentState());
 }
 
-bool WebAXObject::isButtonStateMixed() const {
+WebAXCheckedState WebAXObject::checkedState() const {
   if (isDetached())
-    return false;
+    return WebAXCheckedFalse;
 
-  return m_private->checkboxOrRadioValue() == ButtonStateMixed;
+  return static_cast<WebAXCheckedState>(m_private->checkedState());
 }
 
-bool WebAXObject::isChecked() const {
-  if (isDetached())
-    return false;
+WebString WebAXObject::checked() const {

[dmazzoni, 2017/02/28 00:10:50]

You shouldn't need this. checkedState() should be
all we need to expose.

The code below looks like it belongs only in test code.

+  if (isDetached() || !m_private->isCheckable()) {
+    return WebString();
+  }
 
-  return m_private->isChecked();
+  switch(m_private->checkedState()) {
+    case ButtonStateOff:
+      return WebString::fromUTF8(kWebAXCheckedFalse);
+      break;
+    case ButtonStateOn:
+      return WebString::fromUTF8(kWebAXCheckedTrue);
+      break;
+    case ButtonStateMixed:
+      return WebString::fromUTF8(kWebAXCheckedMixed);
+      break;
+  }
 }
 
 bool WebAXObject::isClickable() const {
   if (isDetached())
     return false;
 
   return m_private->isClickable();
 }
 
 bool WebAXObject::isCollapsed() const {
@@ skipping 1226 matching lines @@
 WebAXObject& WebAXObject::operator=(AXObject* object) {
   m_private = object;
   return *this;
 }
 
 WebAXObject::operator AXObject*() const {
   return m_private.get();
 }
 
 }  // namespace blink