Forward column index attribute for rows as well as cells & headers.

Bug: 832289
Change-Id: If82589e3e690fbf31b8806182e61568d8263119f
Reviewed-on: https://chromium-review.googlesource.com/c/1368945Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Aran Gilman <gilmanmh@google.com>
Cr-Commit-Position: refs/heads/master@{#615561}

content/renderer/accessibility/blink_ax_tree_source.cc

@@ -846,20 +846,21 @@ void BlinkAXTreeSource::SerializeNode(WebAXObject src,
                            src.CellRowIndex());
       dst->AddIntAttribute(ax::mojom::IntAttribute::kTableCellRowSpan,
                            src.CellRowSpan());
-
-      int aria_colindex = src.AriaColumnIndex();
-      if (aria_colindex) {
-        dst->AddIntAttribute(ax::mojom::IntAttribute::kAriaCellColumnIndex,
-                             aria_colindex);
-      }
     }
 
     if (ui::IsCellOrTableHeader(dst->role) || ui::IsTableRow(dst->role)) {
-      // aria-rowindex is supported on cells, headers and rows.
+      // aria-rowindex and aria-colindex are supported on cells, headers and
+      // rows.
       int aria_rowindex = src.AriaRowIndex();
       if (aria_rowindex)
         dst->AddIntAttribute(ax::mojom::IntAttribute::kAriaCellRowIndex,
                              aria_rowindex);
+
+      int aria_colindex = src.AriaColumnIndex();
+      if (aria_colindex) {
+        dst->AddIntAttribute(ax::mojom::IntAttribute::kAriaCellColumnIndex,
+                             aria_colindex);
+      }
     }
 
     if (ui::IsTableHeader(dst->role) &&

third_party/blink/renderer/modules/exported/web_ax_object.cc

@@ -1096,7 +1096,7 @@ unsigned WebAXObject::AriaColumnIndex() const {
   if (IsDetached())
     return 0;
 
-  return private_->IsTableCellLikeRole() ? private_->AriaColumnIndex() : 0;
+  return private_->AriaColumnIndex();
 }
 
 int WebAXObject::AriaRowCount() const {