Int and Float properties for Accessibility Object Model phase 1

third_party/WebKit/Source/modules/accessibility/AXTable.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/AXTable.h"
 
+#include "core/dom/AccessibleNode.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/html/HTMLCollection.h"
 #include "core/html/HTMLTableCaptionElement.h"
 #include "core/html/HTMLTableCellElement.h"
 #include "core/html/HTMLTableColElement.h"
 #include "core/html/HTMLTableElement.h"
 #include "core/html/HTMLTableRowElement.h"
 #include "core/html/HTMLTableRowsCollection.h"
 #include "core/html/HTMLTableSectionElement.h"
@@ skipping 448 matching lines @@
   UpdateChildrenIfNecessary();
   unsigned row_count = rows_.size();
   for (unsigned r = 0; r < row_count; r++) {
     AXObjectImpl* row = rows_[r].Get();
     if (row->IsTableRow())
       ToAXTableRow(rows_[r].Get())->HeaderObjectsForRow(headers);
   }
 }
 
 int AXTable::AriaColumnCount() {
-  if (!HasAttribute(aria_colcountAttr))
+  int32_t col_count;
+  if (!HasAOMPropertyOrARIAAttribute(AOMIntProperty::kColCount, col_count))
     return 0;
 
-  const AtomicString& col_count_value = GetAttribute(aria_colcountAttr);
-  int col_count_int = col_count_value.ToInt();
-
-  if (col_count_int > (int)ColumnCount())
-    return col_count_int;
+  if (col_count > static_cast<int>(ColumnCount()))
+    return col_count;
 
   // Spec says that if all of the columns are present in the DOM, it
   // is not necessary to set this attribute as the user agent can
   // automatically calculate the total number of columns.
   // It returns 0 in order not to set this attribute.
-  if (col_count_int == (int)ColumnCount() || col_count_int != -1)
+  if (col_count == static_cast<int>(ColumnCount()) || col_count != -1)
     return 0;
 
   return -1;
 }
 
 int AXTable::AriaRowCount() {
-  if (!HasAttribute(aria_rowcountAttr))
+  int32_t row_count;
+  if (!HasAOMPropertyOrARIAAttribute(AOMIntProperty::kRowCount, row_count))
     return 0;
 
-  const AtomicString& row_count_value = GetAttribute(aria_rowcountAttr);
-  int row_count_int = row_count_value.ToInt();
-
-  if (row_count_int > (int)RowCount())
-    return row_count_int;
+  if (row_count > static_cast<int>(RowCount()))
+    return row_count;
 
   // Spec says that if all of the rows are present in the DOM, it is
   // not necessary to set this attribute as the user agent can
   // automatically calculate the total number of rows.
   // It returns 0 in order not to set this attribute.
-  if (row_count_int == (int)RowCount() || row_count_int != -1)
+  if (row_count == (int)RowCount() || row_count != -1)
     return 0;
 
   // In the spec, -1 explicitly means an unknown number of rows.
   return -1;
 }
 
 unsigned AXTable::ColumnCount() {
   UpdateChildrenIfNecessary();
 
   return columns_.size();
@@ skipping 66 matching lines @@
 }
 
 DEFINE_TRACE(AXTable) {
   visitor->Trace(rows_);
   visitor->Trace(columns_);
   visitor->Trace(header_container_);
   AXLayoutObject::Trace(visitor);
 }
 
 }  // namespace blink