Switch to standard integer types in content/browser/.

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>
+#include <stddef.h>
+#include <stdint.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/app/strings/grit/content_strings.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
 #include "content/browser/accessibility/one_shot_accessibility_tree_search.h"
 #include "content/public/common/content_client.h"
 #import "ui/accessibility/platform/ax_platform_node_mac.h"
 
@@ skipping 436 matching lines @@
 
 - (NSNumber*)ariaSetSize {
   return [NSNumber numberWithInt:
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_SET_SIZE)];
 }
 
 // Returns an array of BrowserAccessibilityCocoa objects, representing the
 // accessibility children of this object.
 - (NSArray*)children {
   if (!children_) {
-    uint32 childCount = browserAccessibility_->PlatformChildCount();
+    uint32_t childCount = browserAccessibility_->PlatformChildCount();
     children_.reset([[NSMutableArray alloc] initWithCapacity:childCount]);
-    for (uint32 index = 0; index < childCount; ++index) {
+    for (uint32_t index = 0; index < childCount; ++index) {
       BrowserAccessibilityCocoa* child =
           browserAccessibility_->PlatformGetChild(index)->
               ToBrowserAccessibilityCocoa();
       if ([child isIgnored])
         [children_ addObjectsFromArray:[child children]];
       else
         [children_ addObject:child];
     }
 
     // Also, add indirect children (if any).
-    const std::vector<int32>& indirectChildIds =
+    const std::vector<int32_t>& indirectChildIds =
         browserAccessibility_->GetIntListAttribute(
             ui::AX_ATTR_INDIRECT_CHILD_IDS);
-    for (uint32 i = 0; i < indirectChildIds.size(); ++i) {
-      int32 child_id = indirectChildIds[i];
+    for (uint32_t i = 0; i < indirectChildIds.size(); ++i) {
+      int32_t child_id = indirectChildIds[i];
       BrowserAccessibility* child =
           browserAccessibility_->manager()->GetFromID(child_id);
 
       // This only became necessary as a result of crbug.com/93095. It should be
       // a DCHECK in the future.
       if (child) {
         BrowserAccessibilityCocoa* child_cocoa =
             child->ToBrowserAccessibilityCocoa();
         [children_ addObject:child_cocoa];
       }
@@ skipping 11 matching lines @@
   }
 }
 
 - (NSArray*)columnHeaders {
   if ([self internalRole] != ui::AX_ROLE_TABLE &&
       [self internalRole] != ui::AX_ROLE_GRID) {
     return nil;
   }
 
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
-  const std::vector<int32>& uniqueCellIds =
-      browserAccessibility_->GetIntListAttribute(
-          ui::AX_ATTR_UNIQUE_CELL_IDS);
+  const std::vector<int32_t>& uniqueCellIds =
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS);
   for (size_t i = 0; i < uniqueCellIds.size(); ++i) {
     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;
 }
 
@@ skipping 21 matching lines @@
   return ret;
 }
 
 - (NSString*)description {
   // Mac OS X wants static text exposed in AXValue.
   if ([self shouldExposeNameInAXValue])
     return @"";
 
   // If the name came from a single related element and it's present in the
   // tree, it will be exposed in AXTitleUIElement.
-  std::vector<int32> labelledby_ids =
+  std::vector<int32_t> labelledby_ids =
       browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
   ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
   if (nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT &&
       labelledby_ids.size() == 1 &&
       browserAccessibility_->manager()->GetFromID(labelledby_ids[0])) {
     return @"";
   }
 
   std::string name = browserAccessibility_->GetStringAttribute(
@@ skipping 210 matching lines @@
     return NSStringForStringAttribute(
         browserAccessibility_, ui::AX_ATTR_DESCRIPTION);
   }
 
   return NSStringForStringAttribute(
       browserAccessibility_, ui::AX_ATTR_PLACEHOLDER);
 }
 
 - (void)addLinkedUIElementsFromAttribute:(ui::AXIntListAttribute)attribute
                                    addTo:(NSMutableArray*)outArray {
-  const std::vector<int32>& attributeValues =
+  const std::vector<int32_t>& attributeValues =
       browserAccessibility_->GetIntListAttribute(attribute);
   for (size_t i = 0; i < attributeValues.size(); ++i) {
     BrowserAccessibility* element =
         browserAccessibility_->manager()->GetFromID(attributeValues[i]);
     if (element)
       [outArray addObject:element->ToBrowserAccessibilityCocoa()];
   }
 }
 
 - (NSArray*)linkedUIElements {
@@ skipping 267 matching lines @@
   return NSAccessibilityRoleDescription(role, nil);
 }
 
 - (NSArray*)rowHeaders {
   if ([self internalRole] != ui::AX_ROLE_TABLE &&
       [self internalRole] != ui::AX_ROLE_GRID) {
     return nil;
   }
 
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
-  const std::vector<int32>& uniqueCellIds =
-      browserAccessibility_->GetIntListAttribute(
-          ui::AX_ATTR_UNIQUE_CELL_IDS);
+  const std::vector<int32_t>& uniqueCellIds =
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS);
   for (size_t i = 0; i < uniqueCellIds.size(); ++i) {
     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;
 }
 
@@ skipping 15 matching lines @@
 - (NSArray*)rows {
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
 
   if ([self internalRole] == ui::AX_ROLE_TABLE||
       [self internalRole] == ui::AX_ROLE_GRID) {
     for (BrowserAccessibilityCocoa* child in [self children]) {
       if ([[child role] isEqualToString:NSAccessibilityRowRole])
         [ret addObject:child];
     }
   } else if ([self internalRole] == ui::AX_ROLE_COLUMN) {
-    const std::vector<int32>& indirectChildIds =
+    const std::vector<int32_t>& indirectChildIds =
         browserAccessibility_->GetIntListAttribute(
             ui::AX_ATTR_INDIRECT_CHILD_IDS);
-    for (uint32 i = 0; i < indirectChildIds.size(); ++i) {
+    for (uint32_t i = 0; i < indirectChildIds.size(); ++i) {
       int id = indirectChildIds[i];
       BrowserAccessibility* rowElement =
           browserAccessibility_->manager()->GetFromID(id);
       if (rowElement)
         [ret addObject:rowElement->ToBrowserAccessibilityCocoa()];
     }
   }
 
   return ret;
 }
@@ skipping 21 matching lines @@
       if (activeDescendant) {
         [ret addObject:activeDescendant->ToBrowserAccessibilityCocoa()];
         return ret;
       }
     }
   }
 
   // If it's multiselectable or if the previous attempts failed,
   // return any children with the "selected" state, which may
   // come from aria-selected.
-  uint32 childCount = browserAccessibility_->PlatformChildCount();
-  for (uint32 index = 0; index < childCount; ++index) {
+  uint32_t childCount = browserAccessibility_->PlatformChildCount();
+  for (uint32_t index = 0; index < childCount; ++index) {
     BrowserAccessibility* child =
       browserAccessibility_->PlatformGetChild(index);
     if (child->HasState(ui::AX_STATE_SELECTED))
       [ret addObject:child->ToBrowserAccessibilityCocoa()];
   }
 
   // And if nothing's selected but one has focus, use the focused one.
   if ([ret count] == 0 &&
       focusedChild &&
       focusedChild != browserAccessibility_) {
@@ skipping 64 matching lines @@
   return tabSubtree;
 }
 
 - (NSString*)title {
   // Mac OS X wants static text exposed in AXValue.
   if ([self shouldExposeNameInAXValue])
     return @"";
 
   // If the name came from a single related element and it's present in the
   // tree, it will be exposed in AXTitleUIElement.
-  std::vector<int32> labelledby_ids =
+  std::vector<int32_t> labelledby_ids =
       browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
   ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
   if (nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT &&
       labelledby_ids.size() == 1 &&
       browserAccessibility_->manager()->GetFromID(labelledby_ids[0])) {
     return @"";
   }
 
   // On Mac OS X, the accessible name of an object is exposed as its
   // title if it comes from visible text, and as its description
   // otherwise, but never both.
   if (nameFrom == ui::AX_NAME_FROM_CONTENTS ||
       nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT ||
       nameFrom == ui::AX_NAME_FROM_VALUE) {
     return NSStringForStringAttribute(
         browserAccessibility_, ui::AX_ATTR_NAME);
   }
 
   return nil;
 }
 
 - (id)titleUIElement {
-  std::vector<int32> labelledby_ids =
+  std::vector<int32_t> labelledby_ids =
       browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
   ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
   if (nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT &&
       labelledby_ids.size() == 1) {
     BrowserAccessibility* titleElement =
         browserAccessibility_->manager()->GetFromID(labelledby_ids[0]);
     if (titleElement)
       return titleElement->ToBrowserAccessibilityCocoa();
   }
@@ skipping 83 matching lines @@
   return nil;
 }
 
 - (NSValue*)visibleCharacterRange {
   base::string16 value = browserAccessibility_->GetValue();
   return [NSValue valueWithRange:NSMakeRange(0, value.size())];
 }
 
 - (NSArray*)visibleCells {
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
-  const std::vector<int32>& uniqueCellIds =
-      browserAccessibility_->GetIntListAttribute(
-          ui::AX_ATTR_UNIQUE_CELL_IDS);
+  const std::vector<int32_t>& uniqueCellIds =
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS);
   for (size_t i = 0; i < uniqueCellIds.size(); ++i) {
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromID(id);
     if (cell)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
 }
 
 - (NSArray*)visibleChildren {
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
-  uint32 childCount = browserAccessibility_->PlatformChildCount();
-  for (uint32 index = 0; index < childCount; ++index) {
+  uint32_t childCount = browserAccessibility_->PlatformChildCount();
+  for (uint32_t index = 0; index < childCount; ++index) {
     BrowserAccessibilityCocoa* child =
         browserAccessibility_->PlatformGetChild(index)->
             ToBrowserAccessibilityCocoa();
     [ret addObject:child];
   }
   return ret;
 }
 
 - (NSArray*)visibleColumns {
   return [self columns];
@@ skipping 56 matching lines @@
   int selStart, selEnd;
   if (browserAccessibility_->GetIntAttribute(
           ui::AX_ATTR_TEXT_SEL_START, &selStart) &&
       browserAccessibility_->
           GetIntAttribute(ui::AX_ATTR_TEXT_SEL_END, &selEnd)) {
     if (selStart > selEnd)
       std::swap(selStart, selEnd);
     int selLength = selEnd - selStart;
     if ([attribute isEqualToString:
         NSAccessibilityInsertionPointLineNumberAttribute]) {
-      const std::vector<int32>& line_breaks =
-          browserAccessibility_->GetIntListAttribute(
-              ui::AX_ATTR_LINE_BREAKS);
+      const std::vector<int32_t>& line_breaks =
+          browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LINE_BREAKS);
       for (int i = 0; i < static_cast<int>(line_breaks.size()); ++i) {
         if (line_breaks[i] > selStart)
           return [NSNumber numberWithInt:i];
       }
       return [NSNumber numberWithInt:static_cast<int>(line_breaks.size())];
     }
     if ([attribute isEqualToString:NSAccessibilitySelectedTextAttribute]) {
       base::string16 value = browserAccessibility_->GetValue();
       return base::SysUTF16ToNSString(value.substr(selStart, selLength));
     }
     if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
       return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
     }
   }
   return nil;
 }
 
 // Returns the accessibility value for the given attribute and parameter. If the
 // value isn't supported this will return nil.
 - (id)accessibilityAttributeValue:(NSString*)attribute
                      forParameter:(id)parameter {
   if (!browserAccessibility_)
     return nil;
 
-  const std::vector<int32>& line_breaks =
-      browserAccessibility_->GetIntListAttribute(
-          ui::AX_ATTR_LINE_BREAKS);
+  const std::vector<int32_t>& line_breaks =
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LINE_BREAKS);
   base::string16 value = browserAccessibility_->GetValue();
   int len = static_cast<int>(value.size());
 
   if ([attribute isEqualToString:
       NSAccessibilityStringForRangeParameterizedAttribute]) {
     return [self valueForRange:[(NSValue*)parameter rangeValue]];
   }
 
   if ([attribute
           isEqualToString:
@@ skipping 576 matching lines @@
   if (!browserAccessibility_)
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end