Int and Float properties for Accessibility Object Model phase 1

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

Index: third_party/WebKit/Source/modules/accessibility/AXProgressIndicator.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXProgressIndicator.cpp b/third_party/WebKit/Source/modules/accessibility/AXProgressIndicator.cpp
index 6182bae019b39658af393b9fce5a7ea862dc21be..3ea26dee4376e242aa1661ef95e1862ff8a073ef 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXProgressIndicator.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXProgressIndicator.cpp
@@ -20,6 +20,7 @@
 
 #include "modules/accessibility/AXProgressIndicator.h"
 
+#include "core/dom/AccessibleNode.h"
 #include "core/html/HTMLProgressElement.h"
 #include "core/layout/LayoutProgress.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
@@ -51,8 +52,9 @@ bool AXProgressIndicator::ComputeAccessibilityIsIgnored(
 }
 
 float AXProgressIndicator::ValueForRange() const {
-  if (HasAttribute(aria_valuenowAttr))
-    return GetAttribute(aria_valuenowAttr).ToFloat();
+  float value_now;
+  if (HasAOMPropertyOrARIAAttribute(AOMFloatProperty::kValueNow, value_now))
+    return value_now;
 
   if (GetProgressElement()->position() >= 0)
     return clampTo<float>(GetProgressElement()->value());
@@ -61,15 +63,17 @@ float AXProgressIndicator::ValueForRange() const {
 }
 
 float AXProgressIndicator::MaxValueForRange() const {
-  if (HasAttribute(aria_valuemaxAttr))
-    return GetAttribute(aria_valuemaxAttr).ToFloat();
+  float value_max;
+  if (HasAOMPropertyOrARIAAttribute(AOMFloatProperty::kValueMax, value_max))
+    return value_max;
 
   return clampTo<float>(GetProgressElement()->max());
 }
 
 float AXProgressIndicator::MinValueForRange() const {
-  if (HasAttribute(aria_valueminAttr))
-    return GetAttribute(aria_valueminAttr).ToFloat();
+  float value_min;
+  if (HasAOMPropertyOrARIAAttribute(AOMFloatProperty::kValueMin, value_min))
+    return value_min;
 
   return 0.0f;
 }