Int and Float properties for Accessibility Object Model phase 1

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 1302 matching lines @@
   return ElementTraversal::FirstChild(*node);
 }
 
 int AXNodeObject::HeadingLevel() const {
   // headings can be in block flow and non-block flow
   Node* node = this->GetNode();
   if (!node)
     return 0;
 
   if (RoleValue() == kHeadingRole) {
-    String level_str = GetAttribute(aria_levelAttr);
-    if (!level_str.IsEmpty()) {
-      int level = level_str.ToInt();
+    uint32_t level;
+    if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kLevel, level)) {
       if (level >= 1 && level <= 9)
         return level;
       return 1;
     }
   }
 
   if (!node->IsHTMLElement())
     return 0;
 
   HTMLElement& element = ToHTMLElement(*node);
@@ skipping 12 matching lines @@
   if (element.HasTagName(h5Tag))
     return 5;
 
   if (element.HasTagName(h6Tag))
     return 6;
 
   return 0;
 }
 
 unsigned AXNodeObject::HierarchicalLevel() const {
-  Node* node = this->GetNode();
-  if (!node || !node->IsElementNode())
+  Element* element = GetElement();
+  if (!element)
     return 0;
 
-  Element* element = ToElement(node);
-  String level_str = element->getAttribute(aria_levelAttr);
-  if (!level_str.IsEmpty()) {
-    int level = level_str.ToInt();
-    if (level > 0)
+  uint32_t level;
+  if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kLevel, level)) {
+    if (level >= 1 && level <= 9)
       return level;
     return 1;
   }
 
   // Only tree item will calculate its level through the DOM currently.
   if (RoleValue() != kTreeItemRole)
     return 0;
 
   // Hierarchy leveling starts at 1, to match the aria-level spec.
   // We measure tree hierarchy by the number of groups that the item is within.
-  unsigned level = 1;
+  level = 1;
   for (AXObjectImpl* parent = ParentObject(); parent;
        parent = parent->ParentObject()) {
     AccessibilityRole parent_role = parent->RoleValue();
     if (parent_role == kGroupRole)
       level++;
     else if (parent_role == kTreeRole)
       break;
   }
 
   return level;
@@ skipping 250 matching lines @@
     bool is_invalid = !element->checkValidity(&invalid_controls,
                                               kCheckValidityDispatchNoEvent);
     return is_invalid ? kInvalidStateTrue : kInvalidStateFalse;
   }
 
   return AXObjectImpl::GetInvalidState();
 }
 
 int AXNodeObject::PosInSet() const {
   if (SupportsSetSizeAndPosInSet()) {
-    String pos_in_set_str = GetAttribute(aria_posinsetAttr);
-    if (!pos_in_set_str.IsEmpty()) {
-      int pos_in_set = pos_in_set_str.ToInt();
-      if (pos_in_set > 0)
-        return pos_in_set;
-      return 1;
-    }
+    uint32_t pos_in_set;
+    if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kPosInSet, pos_in_set))
+      return pos_in_set;
 
     return AXObjectImpl::IndexInParent() + 1;
   }
 
   return 0;
 }
 
 int AXNodeObject::SetSize() const {
   if (SupportsSetSizeAndPosInSet()) {
-    String set_size_str = GetAttribute(aria_setsizeAttr);
-    if (!set_size_str.IsEmpty()) {
-      int set_size = set_size_str.ToInt();
-      if (set_size > 0)
-        return set_size;
-      return 1;
-    }
+    int32_t set_size;
+    if (HasAOMPropertyOrARIAAttribute(AOMIntProperty::kSetSize, set_size))
+      return set_size;
 
     if (ParentObject()) {
       const auto& siblings = ParentObject()->Children();
       return siblings.size();
     }
   }
 
   return 0;
 }
 
 String AXNodeObject::AriaInvalidValue() const {
   if (GetInvalidState() == kInvalidStateOther)
     return GetAOMPropertyOrARIAAttribute(AOMStringProperty::kInvalid);
 
   return String();
 }
 
 String AXNodeObject::ValueDescription() const {
   if (!SupportsRangeValue())
     return String();
 
   return GetAOMPropertyOrARIAAttribute(AOMStringProperty::kValueText)
       .GetString();
 }
 
 float AXNodeObject::ValueForRange() const {
-  if (HasAttribute(aria_valuenowAttr))
-    return GetAttribute(aria_valuenowAttr).ToFloat();
+  float value_now;
+  if (HasAOMPropertyOrARIAAttribute(AOMFloatProperty::kValueNow, value_now))
+    return value_now;
 
   if (IsNativeSlider())
     return toHTMLInputElement(*GetNode()).valueAsNumber();
 
   if (isHTMLMeterElement(GetNode()))
     return toHTMLMeterElement(*GetNode()).value();
 
   return 0.0;
 }
 
 float AXNodeObject::MaxValueForRange() const {
-  if (HasAttribute(aria_valuemaxAttr))
-    return GetAttribute(aria_valuemaxAttr).ToFloat();
+  float value_max;
+  if (HasAOMPropertyOrARIAAttribute(AOMFloatProperty::kValueMax, value_max))
+    return value_max;
 
   if (IsNativeSlider())
     return toHTMLInputElement(*GetNode()).Maximum();
 
   if (isHTMLMeterElement(GetNode()))
     return toHTMLMeterElement(*GetNode()).max();
 
   return 0.0;
 }
 
 float AXNodeObject::MinValueForRange() const {
-  if (HasAttribute(aria_valueminAttr))
-    return GetAttribute(aria_valueminAttr).ToFloat();
+  float value_min;
+  if (HasAOMPropertyOrARIAAttribute(AOMFloatProperty::kValueMin, value_min))
+    return value_min;
 
   if (IsNativeSlider())
     return toHTMLInputElement(*GetNode()).Minimum();
 
   if (isHTMLMeterElement(GetNode()))
     return toHTMLMeterElement(*GetNode()).min();
 
   return 0.0;
 }
 
@@ skipping 1491 matching lines @@
     return String();
   return ToTextControlElement(node)->StrippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->Trace(node_);
   AXObjectImpl::Trace(visitor);
 }
 
 }  // namespace blink