Table headers are not retrieved properly by Accessibility API

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 451 matching lines @@
 
     return m_rows;
 }
 
 void AXTable::columnHeaders(AccessibilityChildrenVector& headers)
 {
     if (!m_renderer)
         return;
 
     updateChildrenIfNecessary();
-
-    unsigned colCount = m_columns.size();
-    for (unsigned k = 0; k < colCount; ++k) {
-        AXObject* header = toAXTableColumn(m_columns[k].get())->headerObject();
-        if (!header)
-            continue;
-        headers.append(header);
-    }
+    unsigned columnCount = m_columns.size();
+    for (unsigned c = 0; c < columnCount; c++)
+        toAXTableColumn(m_columns[c].get())->headerObjectsForColumn(headers);
 }
 
 void AXTable::rowHeaders(AccessibilityChildrenVector& headers)
 {
     if (!m_renderer)
         return;
 
     updateChildrenIfNecessary();
-
     unsigned rowCount = m_rows.size();
-    for (unsigned r = 0; r < rowCount; r++) {
-        if (AXObject* header = toAXTableRow(m_rows[r].get())->headerObject())
-            headers.append(header);
-    }
+    for (unsigned r = 0; r < rowCount; r++)
+        toAXTableRow(m_rows[r].get())->headerObjectsForRow(headers);
 }
 
 void AXTable::cells(AXObject::AccessibilityChildrenVector& cells)
 {
     if (!m_renderer)
         return;
 
     updateChildrenIfNecessary();
 
     int numRows = m_rows.size();
@@ skipping 91 matching lines @@
     }
 
     // try the standard
     if (title.isEmpty())
         title = AXRenderObject::title();
 
     return title;
 }
 
 } // namespace blink