Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(699)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/browser_accessibility_cocoa.mm

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/accessibility/browser_accessibility_auralinux.cc ('k') | content/browser/accessibility/browser_accessibility_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/accessibility/browser_accessibility_cocoa.mm
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index a5176c3650730dea1e639d3bef232bdd9cc37c6f..c3ac9994c13c818ccf0f7289ade4220a9615894b 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -3,12 +3,13 @@
// 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"
@@ -465,9 +466,9 @@ bool InitializeAccessibilityTreeSearch(
// 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();
@@ -478,11 +479,11 @@ bool InitializeAccessibilityTreeSearch(
}
// 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);
@@ -514,9 +515,8 @@ bool InitializeAccessibilityTreeSearch(
}
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 =
@@ -558,7 +558,7 @@ bool InitializeAccessibilityTreeSearch(
// 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));
@@ -789,7 +789,7 @@ bool InitializeAccessibilityTreeSearch(
- (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 =
@@ -1077,9 +1077,8 @@ bool InitializeAccessibilityTreeSearch(
}
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 =
@@ -1115,10 +1114,10 @@ bool InitializeAccessibilityTreeSearch(
[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);
@@ -1160,8 +1159,8 @@ bool InitializeAccessibilityTreeSearch(
// 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))
@@ -1246,7 +1245,7 @@ bool InitializeAccessibilityTreeSearch(
// 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));
@@ -1270,7 +1269,7 @@ bool InitializeAccessibilityTreeSearch(
}
- (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));
@@ -1374,9 +1373,8 @@ bool InitializeAccessibilityTreeSearch(
- (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 =
@@ -1389,8 +1387,8 @@ bool InitializeAccessibilityTreeSearch(
- (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();
@@ -1467,9 +1465,8 @@ bool InitializeAccessibilityTreeSearch(
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];
@@ -1494,9 +1491,8 @@ bool InitializeAccessibilityTreeSearch(
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());
« no previous file with comments | « content/browser/accessibility/browser_accessibility_auralinux.cc ('k') | content/browser/accessibility/browser_accessibility_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698