Switch to standard integer types in content/renderer/.

content/renderer/accessibility/blink_ax_tree_source.cc

 // Copyright 2014 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 "content/renderer/accessibility/blink_ax_tree_source.h"
 
+#include <stddef.h>
+
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/accessibility_messages.h"
 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
 #include "content/renderer/accessibility/renderer_accessibility.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/render_frame_impl.h"
@@ skipping 75 matching lines @@
     default:
       break;
   }
 
   return std::string();
 }
 
 void AddIntListAttributeFromWebObjects(ui::AXIntListAttribute attr,
                                        WebVector<WebAXObject> objects,
                                        AXContentNodeData* dst) {
-  std::vector<int32> ids;
+  std::vector<int32_t> ids;
   for(size_t i = 0; i < objects.size(); i++)
     ids.push_back(objects[i].axID());
   if (ids.size() > 0)
     dst->AddIntListAttribute(attr, ids);
 }
 
 }  // namespace
 
 BlinkAXTreeSource::BlinkAXTreeSource(RenderFrameImpl* render_frame)
     : render_frame_(render_frame),
@@ skipping 28 matching lines @@
   tree_data.mimetype = document.isXHTMLDocument() ? "text/xhtml" : "text/html";
   tree_data.loaded = root.isLoaded();
   tree_data.loading_progress = root.estimatedLoadingProgress();
   tree_data.doctype = "html";
 
   WebAXObject anchor_object, focus_object;
   int anchor_offset, focus_offset;
   root.selection(anchor_object, anchor_offset, focus_object, focus_offset);
   if (!anchor_object.isNull() && !focus_object.isNull() &&
       anchor_offset >= 0 && focus_offset >= 0) {
-    int32 anchor_id = anchor_object.axID();
-    int32 focus_id = focus_object.axID();
+    int32_t anchor_id = anchor_object.axID();
+    int32_t focus_id = focus_object.axID();
     tree_data.sel_anchor_object_id = anchor_id;
     tree_data.sel_anchor_offset = anchor_offset;
     tree_data.sel_focus_object_id = focus_id;
     tree_data.sel_focus_offset = focus_offset;
   }
 
   // Get the tree ID for this frame and possibly the parent frame.
   WebLocalFrame* web_frame = document.frame();
   if (web_frame) {
     RenderFrame* render_frame = RenderFrame::FromWebFrame(web_frame);
@@ skipping 11 matching lines @@
 
   return tree_data;
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   if (!root_.isNull())
     return root_;
   return GetMainDocument().accessibilityObject();
 }
 
-blink::WebAXObject BlinkAXTreeSource::GetFromId(int32 id) const {
+blink::WebAXObject BlinkAXTreeSource::GetFromId(int32_t id) const {
   return GetMainDocument().accessibilityObjectFromID(id);
 }
 
-int32 BlinkAXTreeSource::GetId(blink::WebAXObject node) const {
+int32_t BlinkAXTreeSource::GetId(blink::WebAXObject node) const {
   return node.axID();
 }
 
 void BlinkAXTreeSource::GetChildren(
     blink::WebAXObject parent,
     std::vector<blink::WebAXObject>* out_children) const {
   if (parent.role() == blink::WebAXRoleStaticText) {
     blink::WebAXObject ancestor = parent;
     while (!ancestor.isDetached()) {
       if (ancestor.axID() == accessibility_focus_id_) {
@@ skipping 124 matching lines @@
 
   if (src.textStyle()) {
     dst->AddIntAttribute(ui::AX_ATTR_TEXT_STYLE,
                          AXTextStyleFromBlink(src.textStyle()));
   }
 
 
   if (dst->role == ui::AX_ROLE_INLINE_TEXT_BOX) {
     WebVector<int> src_character_offsets;
     src.characterOffsets(src_character_offsets);
-    std::vector<int32> character_offsets;
+    std::vector<int32_t> character_offsets;
     character_offsets.reserve(src_character_offsets.size());
     for (size_t i = 0; i < src_character_offsets.size(); ++i)
       character_offsets.push_back(src_character_offsets[i]);
     dst->AddIntListAttribute(ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets);
 
     WebVector<int> src_word_starts;
     WebVector<int> src_word_ends;
     src.wordBoundaries(src_word_starts, src_word_ends);
-    std::vector<int32> word_starts;
-    std::vector<int32> word_ends;
+    std::vector<int32_t> word_starts;
+    std::vector<int32_t> word_ends;
     word_starts.reserve(src_word_starts.size());
     word_ends.reserve(src_word_starts.size());
     for (size_t i = 0; i < src_word_starts.size(); ++i) {
       word_starts.push_back(src_word_starts[i]);
       word_ends.push_back(src_word_ends[i]);
     }
     dst->AddIntListAttribute(ui::AX_ATTR_WORD_STARTS, word_starts);
     dst->AddIntListAttribute(ui::AX_ATTR_WORD_ENDS, word_ends);
   }
 
@@ skipping 75 matching lines @@
       dst->html_attributes.push_back(std::make_pair(name, value));
     }
 
     if (src.isEditable()) {
       dst->AddIntAttribute(ui::AX_ATTR_TEXT_SEL_START, src.selectionStart());
       dst->AddIntAttribute(ui::AX_ATTR_TEXT_SEL_END, src.selectionEnd());
 
       WebVector<int> src_line_breaks;
       src.lineBreaks(src_line_breaks);
       if (src_line_breaks.size() > 0) {
-        std::vector<int32> line_breaks;
+        std::vector<int32_t> line_breaks;
         line_breaks.reserve(src_line_breaks.size());
         for (size_t i = 0; i < src_line_breaks.size(); ++i)
           line_breaks.push_back(src_line_breaks[i]);
         dst->AddIntListAttribute(ui::AX_ATTR_LINE_BREAKS, line_breaks);
       }
     }
 
     // ARIA role.
     if (element.hasAttribute("role")) {
       dst->AddStringAttribute(
@@ skipping 67 matching lines @@
                            src.minValueForRange());
   }
 
   if (dst->role == ui::AX_ROLE_WEB_AREA)
     dst->AddStringAttribute(ui::AX_ATTR_HTML_TAG, "#document");
 
   if (dst->role == ui::AX_ROLE_TABLE) {
     int column_count = src.columnCount();
     int row_count = src.rowCount();
     if (column_count > 0 && row_count > 0) {
-      std::set<int32> unique_cell_id_set;
-      std::vector<int32> cell_ids;
-      std::vector<int32> unique_cell_ids;
+      std::set<int32_t> unique_cell_id_set;
+      std::vector<int32_t> cell_ids;
+      std::vector<int32_t> unique_cell_ids;
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_COUNT, column_count);
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_COUNT, row_count);
       WebAXObject header = src.headerContainerObject();
       if (!header.isDetached())
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_HEADER_ID, header.axID());
       for (int i = 0; i < column_count * row_count; ++i) {
         WebAXObject cell = src.cellForColumnAndRow(
             i % column_count, i / column_count);
         int cell_id = -1;
         if (!cell.isDetached()) {
@@ skipping 42 matching lines @@
   }
 
   // Add the ids of *indirect* children - those who are children of this node,
   // but whose parent is *not* this node. One example is a table
   // cell, which is a child of both a row and a column. Because the cell's
   // parent is the row, the row adds it as a child, and the column adds it
   // as an indirect child.
   int child_count = src.childCount();
   for (int i = 0; i < child_count; ++i) {
     WebAXObject child = src.childAt(i);
-    std::vector<int32> indirect_child_ids;
+    std::vector<int32_t> indirect_child_ids;
     if (!is_iframe && !child.isDetached() && !IsParentUnignoredOf(src, child))
       indirect_child_ids.push_back(child.axID());
     if (indirect_child_ids.size() > 0) {
       dst->AddIntListAttribute(
           ui::AX_ATTR_INDIRECT_CHILD_IDS, indirect_child_ids);
     }
   }
 
   WebVector<WebAXObject> controls;
   if (src.ariaControls(controls))
@@ skipping 18 matching lines @@
   }
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content