Int and Float properties for Accessibility Object Model phase 1

third_party/WebKit/Source/modules/accessibility/AXTableCell.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 86 matching lines @@
 
 bool AXTableCell::IsTableCell() const {
   AXObjectImpl* parent = ParentObjectUnignored();
   if (!parent || !parent->IsTableRow())
     return false;
 
   return true;
 }
 
 unsigned AXTableCell::AriaColumnIndex() const {
-  const AtomicString& col_index = GetAttribute(aria_colindexAttr);
-  if (col_index.ToInt() >= 1)
-    return col_index.ToInt();
+  uint32_t col_index;
+  if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kColIndex, col_index) &&
+      col_index >= 1) {
+    return col_index;
+  }
 
   AXObjectImpl* parent = ParentObjectUnignored();
   if (!parent || !parent->IsTableRow())
     return 0;
 
   return aria_col_index_from_row_;
 }
 
 unsigned AXTableCell::AriaRowIndex() const {
-  const AtomicString& row_index = GetAttribute(aria_rowindexAttr);
-  if (row_index.ToInt() >= 1)
-    return row_index.ToInt();
+  uint32_t row_index;
+  if (HasAOMPropertyOrARIAAttribute(AOMUIntProperty::kRowIndex, row_index) &&
+      row_index >= 1) {
+    return row_index;
+  }
 
   AXObjectImpl* parent = ParentObjectUnignored();
   if (!parent || !parent->IsTableRow())
     return 0;
 
   return ToAXTableRow(parent)->AriaRowIndex();
 }
 
 static AccessibilityRole DecideRoleFromSibling(LayoutTableCell* sibling_cell) {
   if (!sibling_cell)
@@ skipping 100 matching lines @@
   if (EqualIgnoringASCIICase(aria_sort, "ascending"))
     return kSortDirectionAscending;
   if (EqualIgnoringASCIICase(aria_sort, "descending"))
     return kSortDirectionDescending;
   if (EqualIgnoringASCIICase(aria_sort, "other"))
     return kSortDirectionOther;
   return kSortDirectionUndefined;
 }
 
 }  // namespace blink