Index: third_party/WebKit/Source/modules/accessibility/AXTableCell.cpp |
diff --git a/third_party/WebKit/Source/modules/accessibility/AXTableCell.cpp b/third_party/WebKit/Source/modules/accessibility/AXTableCell.cpp |
index 8d701aebe1681b01122f9aeb8dbbd1ada6de9453..73424e35c70c26f89c6a22f908872554ad520548 100644 |
--- a/third_party/WebKit/Source/modules/accessibility/AXTableCell.cpp |
+++ b/third_party/WebKit/Source/modules/accessibility/AXTableCell.cpp |
@@ -104,9 +104,11 @@ bool AXTableCell::IsTableCell() const { |
} |
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()) |
@@ -116,9 +118,11 @@ unsigned AXTableCell::AriaColumnIndex() const { |
} |
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()) |