Mac a11y: Add RoleDescription and Value attributes to accessibility information.

content/browser/accessibility/browser_accessibility.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/accessibility_messages.h"
 #include "ui/accessibility/ax_text_utils.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace content {
 
 namespace {
 
 // Map from unique_id to BrowserAccessibility
 using UniqueIDMap = base::hash_map<int32_t, BrowserAccessibility*>;
 base::LazyInstance<UniqueIDMap> g_unique_id_map = LAZY_INSTANCE_INITIALIZER;
@@ skipping 917 matching lines @@
     *is_mixed = true;
 
   return false;  // Not set.
 }
 
 base::string16 BrowserAccessibility::GetText() const {
   return GetInnerText();
 }
 
 bool BrowserAccessibility::HasState(ui::AXState state_enum) const {
-  return (GetState() >> state_enum) & 1;
+  return ui::AXViewState::IsFlagSet(GetState(), state_enum);

[tapted, 2016/06/17 03:32:49]

Let's move the browser_accessibility* changes to a follow-up. They're kinda
orthogonal to the CL description. And, e.g., I'm not sure how tight the
correspondence between ui::AXViewState and the "state" variable is here -- maybe
it's coincidence that they're encoded the same way.

[Patti Lor, 2016/06/17 05:57:35]

Done.

 }
 
 bool BrowserAccessibility::IsCellOrTableHeaderRole() const {
   return (GetRole() == ui::AX_ROLE_CELL ||
           GetRole() == ui::AX_ROLE_COLUMN_HEADER ||
           GetRole() == ui::AX_ROLE_ROW_HEADER);
 }
 
 bool BrowserAccessibility::HasCaret() const {
   if (IsSimpleTextControl() && HasIntAttribute(ui::AX_ATTR_TEXT_SEL_START) &&
@@ skipping 220 matching lines @@
       break;
 
     manager = root->GetParent()->manager();
     root = manager->GetRoot();
   }
 
   return bounds;
 }
 
 }  // namespace content