Int and Float properties for Accessibility Object Model phase 1

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

 /*
  * Copyright (C) 2008 Apple 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 10 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/accessibility/AXTableRow.h"
 
+#include "core/dom/AccessibleNode.h"
 #include "core/layout/LayoutObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/accessibility/AXTableCell.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 AXTableRow::AXTableRow(LayoutObject* layout_object,
                        AXObjectCacheImpl& ax_object_cache)
@@ skipping 66 matching lines @@
 AXObjectImpl* AXTableRow::HeaderObject() {
   AXObjectVector headers;
   HeaderObjectsForRow(headers);
   if (!headers.size())
     return 0;
 
   return headers[0].Get();
 }
 
 unsigned AXTableRow::AriaColumnIndex() const {
-  const AtomicString& col_index_value = GetAttribute(aria_colindexAttr);
-  if (col_index_value.ToInt() >= 1)
-    return col_index_value.ToInt();
+  uint32_t col_index;
+  if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kColIndex, col_index) &&
+      col_index >= 1) {
+    return col_index;
+  }
 
   return 0;
 }
 
 unsigned AXTableRow::AriaRowIndex() const {
-  const AtomicString& row_index_value = GetAttribute(aria_rowindexAttr);
-  if (row_index_value.ToInt() >= 1)
-    return row_index_value.ToInt();
+  uint32_t row_index;
+  if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kRowIndex, row_index) &&
+      row_index >= 1) {
+    return row_index;
+  }
 
   return 0;
 }
 
 void AXTableRow::HeaderObjectsForRow(AXObjectVector& headers) {
   if (!layout_object_ || !layout_object_->IsTableRow())
     return;
 
   for (const auto& cell : Children()) {
     if (!cell->IsTableCell())
       continue;
 
     if (ToAXTableCell(cell.Get())->ScanToDecideHeaderRole() == kRowHeaderRole)
       headers.push_back(cell);
   }
 }
 
 }  // namespace blink