Calls BrowserAccessibility::IsCellOrTableHeaderRole() with a correct instance.

content/browser/accessibility/browser_accessibility_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 219 matching lines @@
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromID(id);
     if (cell && cell->GetRole() == ui::AX_ROLE_COLUMN_HEADER)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
 }
 
 - (NSValue*)columnIndexRange {
-  if (!browserAccessibility_->IsCellOrTableHeaderRole())
+  if (!browserAccessibility_->IsCellOrTableHeaderRole([self internalRole]))
     return nil;
 
   int column = -1;
   int colspan = -1;
   browserAccessibility_->GetIntAttribute(
       ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX, &column);
   browserAccessibility_->GetIntAttribute(
       ui::AX_ATTR_TABLE_CELL_COLUMN_SPAN, &colspan);
   if (column >= 0 && colspan >= 1)
     return [NSValue valueWithRange:NSMakeRange(column, colspan)];
@@ skipping 452 matching lines @@
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromID(id);
     if (cell && cell->GetRole() == ui::AX_ROLE_ROW_HEADER)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
 }
 
 - (NSValue*)rowIndexRange {
-  if (!browserAccessibility_->IsCellOrTableHeaderRole())
+  if (!browserAccessibility_->IsCellOrTableHeaderRole([self internalRole]))
     return nil;
 
   int row = -1;
   int rowspan = -1;
   browserAccessibility_->GetIntAttribute(
       ui::AX_ATTR_TABLE_CELL_ROW_INDEX, &row);
   browserAccessibility_->GetIntAttribute(
       ui::AX_ATTR_TABLE_CELL_ROW_SPAN, &rowspan);
   if (row >= 0 && rowspan >= 1)
     return [NSValue valueWithRange:NSMakeRange(row, rowspan)];
@@ skipping 415 matching lines @@
         continue;
       }
       if (rowIndex < row)
         continue;
       if (rowIndex > row)
         break;
       for (size_t j = 0;
            j < child->PlatformChildCount();
            ++j) {
         BrowserAccessibility* cell = child->PlatformGetChild(j);
-        if (!browserAccessibility_->IsCellOrTableHeaderRole())
+        if (!browserAccessibility_->IsCellOrTableHeaderRole(cell->GetRole()))

[dmazzoni, 2015/03/11 16:31:41]

I think this line was the one that had the bug, right?

Can you just call cell->IsCellOrTableHeaderRole() instead?

[je_julie(Not used), 2015/03/11 23:21:16]

You're right. I didn't see it correctly.

On 2015/03/11 16:31:41, dmazzoni wrote:

           continue;
         int colIndex;
         if (!cell->GetIntAttribute(
                 ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX,
                 &colIndex)) {
           continue;
         }
         if (colIndex == column)
           return cell->ToBrowserAccessibilityCocoa();
         if (colIndex > column)
@@ skipping 458 matching lines @@
   if (!browserAccessibility_)
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end