Switch to standard integer types in content/renderer/.
BUG=138542
[email protected]
Review URL: https://codereview.chromium.org/1547073003
Cr-Commit-Position: refs/heads/master@{#366847}
diff --git a/content/renderer/accessibility/blink_ax_enum_conversion.cc b/content/renderer/accessibility/blink_ax_enum_conversion.cc
index 72c8779..1c56d5a 100644
--- a/content/renderer/accessibility/blink_ax_enum_conversion.cc
+++ b/content/renderer/accessibility/blink_ax_enum_conversion.cc
@@ -8,8 +8,8 @@
namespace content {
-uint32 AXStateFromBlink(const blink::WebAXObject& o) {
- uint32 state = 0;
+uint32_t AXStateFromBlink(const blink::WebAXObject& o) {
+ uint32_t state = 0;
if (o.isChecked())
state |= (1 << ui::AX_STATE_CHECKED);
diff --git a/content/renderer/accessibility/blink_ax_enum_conversion.h b/content/renderer/accessibility/blink_ax_enum_conversion.h
index 84929d0..74cb2cdb 100644
--- a/content/renderer/accessibility/blink_ax_enum_conversion.h
+++ b/content/renderer/accessibility/blink_ax_enum_conversion.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_ENUM_CONVERSION_H_
#define CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_ENUM_CONVERSION_H_
+#include <stdint.h>
+
#include "third_party/WebKit/public/web/WebAXObject.h"
#include "ui/accessibility/ax_enums.h"
@@ -20,7 +22,7 @@
// accessors and a state bitmask stored in an AXNodeData.
// (Note that some rare states are sent as boolean attributes
// in AXNodeData instead.)
-uint32 AXStateFromBlink(const blink::WebAXObject& o);
+uint32_t AXStateFromBlink(const blink::WebAXObject& o);
// Convert a Blink WebAXTextDirection to an AXTextDirection defined in
// ui/accessibility.
diff --git a/content/renderer/accessibility/blink_ax_tree_source.cc b/content/renderer/accessibility/blink_ax_tree_source.cc
index 4451834..eab8b34 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -4,6 +4,8 @@
#include "content/renderer/accessibility/blink_ax_tree_source.h"
+#include <stddef.h>
+
#include <set>
#include "base/strings/string_number_conversions.h"
@@ -99,7 +101,7 @@
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)
@@ -148,8 +150,8 @@
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;
@@ -181,11 +183,11 @@
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();
}
@@ -330,7 +332,7 @@
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]);
@@ -339,8 +341,8 @@
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) {
@@ -436,7 +438,7 @@
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]);
@@ -524,9 +526,9 @@
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();
@@ -589,7 +591,7 @@
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) {
diff --git a/content/renderer/accessibility/blink_ax_tree_source.h b/content/renderer/accessibility/blink_ax_tree_source.h
index 16525b6..e7a7d4aa 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.h
+++ b/content/renderer/accessibility/blink_ax_tree_source.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_TREE_SOURCE_H_
#define CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_TREE_SOURCE_H_
+#include <stdint.h>
+
#include "content/common/ax_content_node_data.h"
#include "third_party/WebKit/public/web/WebAXObject.h"
#include "ui/accessibility/ax_node_data.h"
@@ -39,8 +41,8 @@
// AXTreeSource implementation.
AXContentTreeData GetTreeData() const override;
blink::WebAXObject GetRoot() const override;
- blink::WebAXObject GetFromId(int32 id) const override;
- int32 GetId(blink::WebAXObject node) const override;
+ blink::WebAXObject GetFromId(int32_t id) const override;
+ int32_t GetId(blink::WebAXObject node) const override;
void GetChildren(
blink::WebAXObject node,
std::vector<blink::WebAXObject>* out_children) const override;
diff --git a/content/renderer/accessibility/renderer_accessibility.cc b/content/renderer/accessibility/renderer_accessibility.cc
index 8ad43d6..0eab211 100644
--- a/content/renderer/accessibility/renderer_accessibility.cc
+++ b/content/renderer/accessibility/renderer_accessibility.cc
@@ -4,6 +4,9 @@
#include "content/renderer/accessibility/renderer_accessibility.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <queue>
#include "base/bind.h"
@@ -11,6 +14,7 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
#include "content/common/accessibility_messages.h"
#include "content/renderer/accessibility/blink_ax_enum_conversion.h"
#include "content/renderer/render_frame_impl.h"
@@ -192,7 +196,7 @@
acc_event.event_type = event;
// Discard duplicate accessibility events.
- for (uint32 i = 0; i < pending_events_.size(); ++i) {
+ for (uint32_t i = 0; i < pending_events_.size(); ++i) {
if (pending_events_[i].id == acc_event.id &&
pending_events_[i].event_type == acc_event.event_type) {
return;
diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h
index 66670eafd..91bcd55 100644
--- a/content/renderer/accessibility/renderer_accessibility.h
+++ b/content/renderer/accessibility/renderer_accessibility.h
@@ -8,6 +8,7 @@
#include <vector>
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/ax_content_node_data.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index 7f2747e..0c6958e 100644
--- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "content/common/accessibility_messages.h"
#include "content/common/frame_messages.h"
#include "content/common/site_isolation_policy.h"
diff --git a/content/renderer/android/address_detector.h b/content/renderer/android/address_detector.h
index 1db869e..5734c5b 100644
--- a/content/renderer/android/address_detector.h
+++ b/content/renderer/android/address_detector.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_ANDROID_ADDRESS_DETECTOR_H_
#define CONTENT_RENDERER_ANDROID_ADDRESS_DETECTOR_H_
+#include <stddef.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/renderer/android/content_detector.h"
#include "url/gurl.h"
diff --git a/content/renderer/android/content_detector.h b/content/renderer/android/content_detector.h
index 28a153a..7294793 100644
--- a/content/renderer/android/content_detector.h
+++ b/content/renderer/android/content_detector.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_
#define CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_
+#include <stddef.h>
+
+#include "base/macros.h"
#include "third_party/WebKit/public/web/WebRange.h"
#include "url/gurl.h"
diff --git a/content/renderer/android/email_detector.h b/content/renderer/android/email_detector.h
index 8d108492..d3544693 100644
--- a/content/renderer/android/email_detector.h
+++ b/content/renderer/android/email_detector.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_ANDROID_EMAIL_DETECTOR_H_
#define CONTENT_RENDERER_ANDROID_EMAIL_DETECTOR_H_
+#include <stddef.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/renderer/android/content_detector.h"
diff --git a/content/renderer/android/email_detector_unittest.cc b/content/renderer/android/email_detector_unittest.cc
index c695617..6dee428 100644
--- a/content/renderer/android/email_detector_unittest.cc
+++ b/content/renderer/android/email_detector_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/android/email_detector.h"
+#include <stddef.h>
+
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/android/phone_number_detector.h b/content/renderer/android/phone_number_detector.h
index 6503eee..2d6b4d27 100644
--- a/content/renderer/android/phone_number_detector.h
+++ b/content/renderer/android/phone_number_detector.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_ANDROID_PHONE_NUMBER_DETECTOR_H_
#define CONTENT_RENDERER_ANDROID_PHONE_NUMBER_DETECTOR_H_
+#include <stddef.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/renderer/android/content_detector.h"
diff --git a/content/renderer/android/phone_number_detector_unittest.cc b/content/renderer/android/phone_number_detector_unittest.cc
index d10744b..474003b0 100644
--- a/content/renderer/android/phone_number_detector_unittest.cc
+++ b/content/renderer/android/phone_number_detector_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/android/phone_number_detector.h"
+#include <stddef.h>
+
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/android/renderer_date_time_picker.cc b/content/renderer/android/renderer_date_time_picker.cc
index 7319c44..b936490b 100644
--- a/content/renderer/android/renderer_date_time_picker.cc
+++ b/content/renderer/android/renderer_date_time_picker.cc
@@ -4,6 +4,8 @@
#include "content/renderer/android/renderer_date_time_picker.h"
+#include <stddef.h>
+
#include "base/strings/string_util.h"
#include "content/common/date_time_suggestion.h"
#include "content/common/view_messages.h"
diff --git a/content/renderer/android/renderer_date_time_picker.h b/content/renderer/android/renderer_date_time_picker.h
index 970f93b..d04016b 100644
--- a/content/renderer/android/renderer_date_time_picker.h
+++ b/content/renderer/android/renderer_date_time_picker.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_
#define CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/public/renderer/render_view_observer.h"
#include "third_party/WebKit/public/web/WebDateTimeChooserParams.h"
diff --git a/content/renderer/android/synchronous_compositor_external_begin_frame_source.h b/content/renderer/android/synchronous_compositor_external_begin_frame_source.h
index 32216095..cc3e9e53 100644
--- a/content/renderer/android/synchronous_compositor_external_begin_frame_source.h
+++ b/content/renderer/android/synchronous_compositor_external_begin_frame_source.h
@@ -5,8 +5,8 @@
#ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_
#define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "cc/scheduler/begin_frame_source.h"
diff --git a/content/renderer/android/synchronous_compositor_filter.h b/content/renderer/android/synchronous_compositor_filter.h
index 550bf1e..89d83002 100644
--- a/content/renderer/android/synchronous_compositor_filter.h
+++ b/content/renderer/android/synchronous_compositor_filter.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FILTER_H_
#define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FILTER_H_
+#include <stdint.h>
+
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
#include "base/single_thread_task_runner.h"
diff --git a/content/renderer/android/synchronous_compositor_output_surface.cc b/content/renderer/android/synchronous_compositor_output_surface.cc
index 59dd93a..567c2a2e 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.cc
+++ b/content/renderer/android/synchronous_compositor_output_surface.cc
@@ -6,6 +6,7 @@
#include "base/auto_reset.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/context_provider.h"
#include "cc/output/output_surface_client.h"
diff --git a/content/renderer/android/synchronous_compositor_output_surface.h b/content/renderer/android/synchronous_compositor_output_surface.h
index 16320cdb..c09ff98 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.h
+++ b/content/renderer/android/synchronous_compositor_output_surface.h
@@ -5,11 +5,13 @@
#ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
#define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
+#include <stddef.h>
+
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/android/synchronous_compositor_proxy.h b/content/renderer/android/synchronous_compositor_proxy.h
index 07488ef..2d26036 100644
--- a/content/renderer/android/synchronous_compositor_proxy.h
+++ b/content/renderer/android/synchronous_compositor_proxy.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
#define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/macros.h"
#include "content/common/input/input_event_ack_state.h"
#include "content/renderer/android/synchronous_compositor_external_begin_frame_source.h"
diff --git a/content/renderer/background_sync/background_sync_client_impl.cc b/content/renderer/background_sync/background_sync_client_impl.cc
index d0a7e9f..7d9c405 100644
--- a/content/renderer/background_sync/background_sync_client_impl.cc
+++ b/content/renderer/background_sync/background_sync_client_impl.cc
@@ -17,7 +17,7 @@
// static
void BackgroundSyncClientImpl::Create(
- int64 service_worker_registration_id,
+ int64_t service_worker_registration_id,
mojo::InterfaceRequest<BackgroundSyncServiceClient> request) {
new BackgroundSyncClientImpl(service_worker_registration_id, request.Pass());
}
@@ -25,7 +25,7 @@
BackgroundSyncClientImpl::~BackgroundSyncClientImpl() {}
BackgroundSyncClientImpl::BackgroundSyncClientImpl(
- int64 service_worker_registration_id,
+ int64_t service_worker_registration_id,
mojo::InterfaceRequest<BackgroundSyncServiceClient> request)
: service_worker_registration_id_(service_worker_registration_id),
binding_(this, request.Pass()),
diff --git a/content/renderer/background_sync/background_sync_client_impl.h b/content/renderer/background_sync/background_sync_client_impl.h
index 18a53ee..78d1a1a4 100644
--- a/content/renderer/background_sync/background_sync_client_impl.h
+++ b/content/renderer/background_sync/background_sync_client_impl.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_BACKGROUND_SYNC_BACKGROUND_SYNC_CLIENT_IMPL_H_
#define CONTENT_RENDERER_BACKGROUND_SYNC_BACKGROUND_SYNC_CLIENT_IMPL_H_
+#include <stdint.h>
+
#include <map>
#include "base/compiler_specific.h"
diff --git a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
index 2b16f6b3..435e92a 100644
--- a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
+++ b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
@@ -4,6 +4,7 @@
#include "content/renderer/battery_status/battery_status_dispatcher.h"
+#include "base/macros.h"
#include "content/public/test/mock_render_thread.h"
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.cc b/content/renderer/bluetooth/bluetooth_dispatcher.cc
index 5f10eed..9ffca9e0 100644
--- a/content/renderer/bluetooth/bluetooth_dispatcher.cc
+++ b/content/renderer/bluetooth/bluetooth_dispatcher.cc
@@ -4,6 +4,8 @@
#include "content/renderer/bluetooth/bluetooth_dispatcher.h"
+#include <stddef.h>
+
#include "base/lazy_instance.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -612,7 +614,7 @@
int thread_id,
int request_id,
const std::string& characteristic_instance_id,
- uint32 characteristic_properties) {
+ uint32_t characteristic_properties) {
DCHECK(pending_characteristic_requests_.Lookup(request_id)) << request_id;
BluetoothCharacteristicRequest* request =
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.h b/content/renderer/bluetooth/bluetooth_dispatcher.h
index ff6a0751..6dbd5ea 100644
--- a/content/renderer/bluetooth/bluetooth_dispatcher.h
+++ b/content/renderer/bluetooth/bluetooth_dispatcher.h
@@ -5,10 +5,13 @@
#ifndef CONTENT_CHILD_BLUETOOTH_BLUETOOTH_DISPATCHER_H_
#define CONTENT_CHILD_BLUETOOTH_BLUETOOTH_DISPATCHER_H_
+#include <stdint.h>
+
#include <map>
#include <queue>
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/bluetooth/bluetooth_device.h"
#include "content/public/child/worker_thread.h"
@@ -178,7 +181,7 @@
void OnGetCharacteristicSuccess(int thread_id,
int request_id,
const std::string& characteristic_instance_id,
- uint32 characteristic_properties);
+ uint32_t characteristic_properties);
void OnGetCharacteristicError(int thread_id,
int request_id,
blink::WebBluetoothError error);
diff --git a/content/renderer/bluetooth/bluetooth_message_filter.h b/content/renderer/bluetooth/bluetooth_message_filter.h
index 5692dcce..365e21a 100644
--- a/content/renderer/bluetooth/bluetooth_message_filter.h
+++ b/content/renderer/bluetooth/bluetooth_message_filter.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_CHILD_BLUETOOTH_BLUETOOTH_MESSAGE_FILTER_H_
#define CONTENT_CHILD_BLUETOOTH_BLUETOOTH_MESSAGE_FILTER_H_
+#include "base/macros.h"
#include "content/child/worker_thread_message_filter.h"
namespace content {
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
index f475c00..b5f85d47 100644
--- a/content/renderer/bluetooth/web_bluetooth_impl.h
+++ b/content/renderer/bluetooth/web_bluetooth_impl.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_CHILD_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
#define CONTENT_CHILD_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
+#include <stdint.h>
+
#include <string>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h"
diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc
index 14193ccc..59e4680e 100644
--- a/content/renderer/bmp_image_decoder_unittest.cc
+++ b/content/renderer/bmp_image_decoder_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "content/test/image_decoder_test.h"
#include "third_party/WebKit/public/web/WebImageDecoder.h"
@@ -18,7 +20,7 @@
// Thus it is split into fast and slow versions. The threshold is
// set to 10KB because the fast test can finish under Valgrind in
// less than 30 seconds.
- static const int64 kThresholdSize = 10240;
+ static const int64_t kThresholdSize = 10240;
};
TEST_F(BMPImageDecoderTest, DecodingFast) {
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 60451d6..40110cd 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -4,6 +4,8 @@
#include "content/renderer/browser_plugin/browser_plugin.h"
+#include <stddef.h>
+
#include "base/command_line.h"
#include "base/location.h"
#include "base/single_thread_task_runner.h"
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index 5069e87b..79907df 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -7,6 +7,7 @@
#include "third_party/WebKit/public/web/WebPlugin.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner_helpers.h"
diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h
index a762b88..4703fd8 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/browser_plugin_manager.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/public/renderer/render_process_observer.h"
#include "ipc/ipc_sender.h"
diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc
index 9d878a9..19f57802 100644
--- a/content/renderer/browser_render_view_browsertest.cc
+++ b/content/renderer/browser_render_view_browsertest.cc
@@ -6,7 +6,6 @@
// Note that these tests rely on single-process mode, and hence may be
// disabled in some configurations (check gyp files).
-#include "base/basictypes.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/command_line.h"
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc
index 70f0db3..9091468 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.cc
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
@@ -4,6 +4,8 @@
#include "content/renderer/cache_storage/cache_storage_dispatcher.h"
+#include <stddef.h>
+
#include <map>
#include <string>
#include <utility>
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.h b/content/renderer/cache_storage/cache_storage_dispatcher.h
index f08712c..a43757d 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.h
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_
#define CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_
+#include <stdint.h>
+
#include <vector>
#include "base/id_map.h"
@@ -162,7 +164,7 @@
typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks,
IDMapOwnPointer> StorageMatchCallbacksMap;
- typedef base::hash_map<int32, base::TimeTicks> TimeMap;
+ typedef base::hash_map<int32_t, base::TimeTicks> TimeMap;
typedef IDMap<blink::WebServiceWorkerCache::CacheMatchCallbacks,
IDMapOwnPointer> MatchCallbacksMap;
@@ -173,7 +175,7 @@
using BatchCallbacksMap =
IDMap<blink::WebServiceWorkerCache::CacheBatchCallbacks, IDMapOwnPointer>;
- static int32 CurrentWorkerId() { return WorkerThread::GetCurrentId(); }
+ static int32_t CurrentWorkerId() { return WorkerThread::GetCurrentId(); }
void PopulateWebResponseFromResponse(
const ServiceWorkerResponse& response,
diff --git a/content/renderer/cache_storage/cache_storage_message_filter.h b/content/renderer/cache_storage/cache_storage_message_filter.h
index 5d92d696..28d0a41 100644
--- a/content/renderer/cache_storage/cache_storage_message_filter.h
+++ b/content/renderer/cache_storage/cache_storage_message_filter.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_SERVICE_WORKER_CACHE_STORAGE_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_SERVICE_WORKER_CACHE_STORAGE_MESSAGE_FILTER_H_
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/child/worker_thread_message_filter.h"
diff --git a/content/renderer/cache_storage/webserviceworkercachestorage_impl.h b/content/renderer/cache_storage/webserviceworkercachestorage_impl.h
index 77f443d..cc6d8e8 100644
--- a/content/renderer/cache_storage/webserviceworkercachestorage_impl.h
+++ b/content/renderer/cache_storage/webserviceworkercachestorage_impl.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_SERVICE_WORKER_WEB_SERVICE_WORKER_CACHE_STORAGE_IMPL_H_
#define CONTENT_RENDERER_SERVICE_WORKER_WEB_SERVICE_WORKER_CACHE_STORAGE_IMPL_H_
+#include "base/macros.h"
#include "content/child/thread_safe_sender.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCache.h"
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index e37d5ab..e931773 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -183,7 +183,7 @@
void ChildFrameCompositingHelper::OnCompositorFrameSwapped(
scoped_ptr<cc::CompositorFrame> frame,
int route_id,
- uint32 output_surface_id,
+ uint32_t output_surface_id,
int host_id,
base::SharedMemoryHandle handle) {
cc::DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h
index 1f26c9f..d2d4e78 100644
--- a/content/renderer/child_frame_compositing_helper.h
+++ b/content/renderer/child_frame_compositing_helper.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
#define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
@@ -66,7 +69,7 @@
void OnContainerDestroy();
void OnCompositorFrameSwapped(scoped_ptr<cc::CompositorFrame> frame,
int route_id,
- uint32 output_surface_id,
+ uint32_t output_surface_id,
int host_id,
base::SharedMemoryHandle handle);
void OnSetSurface(const cc::SurfaceId& surface_id,
@@ -126,7 +129,7 @@
int host_routing_id_;
int last_route_id_;
- uint32 last_output_surface_id_;
+ uint32_t last_output_surface_id_;
int last_host_id_;
bool ack_pending_;
bool opaque_;
diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc
index 6c7752a..12ff2ad 100644
--- a/content/renderer/context_menu_params_builder.cc
+++ b/content/renderer/context_menu_params_builder.cc
@@ -4,6 +4,8 @@
#include "content/renderer/context_menu_params_builder.h"
+#include <stddef.h>
+
#include "content/common/ssl_status_serialization.h"
#include "content/public/common/context_menu_params.h"
#include "content/public/renderer/content_renderer_client.h"
diff --git a/content/renderer/device_sensors/device_light_event_pump.h b/content/renderer/device_sensors/device_light_event_pump.h
index b5dd1f43..3561484 100644
--- a/content/renderer/device_sensors/device_light_event_pump.h
+++ b/content/renderer/device_sensors/device_light_event_pump.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_
#define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/device_sensors/device_light_data.h"
#include "content/renderer/device_sensors/device_sensor_event_pump.h"
diff --git a/content/renderer/device_sensors/device_light_event_pump_unittest.cc b/content/renderer/device_sensors/device_light_event_pump_unittest.cc
index c5f1e7d4..8a4f30e 100644
--- a/content/renderer/device_sensors/device_light_event_pump_unittest.cc
+++ b/content/renderer/device_sensors/device_light_event_pump_unittest.cc
@@ -5,6 +5,7 @@
#include "device_light_event_pump.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "content/common/device_sensors/device_light_hardware_buffer.h"
diff --git a/content/renderer/device_sensors/device_motion_event_pump.h b/content/renderer/device_sensors/device_motion_event_pump.h
index 61b046d..7ae880e 100644
--- a/content/renderer/device_sensors/device_motion_event_pump.h
+++ b/content/renderer/device_sensors/device_motion_event_pump.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_MOTION_EVENT_PUMP_H_
#define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_MOTION_EVENT_PUMP_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/device_sensors/device_sensor_event_pump.h"
#include "content/renderer/shared_memory_seqlock_reader.h"
diff --git a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
index 9d8b7cd..35cc267 100644
--- a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
+++ b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
@@ -6,6 +6,7 @@
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
diff --git a/content/renderer/device_sensors/device_orientation_event_pump.h b/content/renderer/device_sensors/device_orientation_event_pump.h
index 8f0ce5e..74ecacd 100644
--- a/content/renderer/device_sensors/device_orientation_event_pump.h
+++ b/content/renderer/device_sensors/device_orientation_event_pump.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_ORIENTATION_EVENT_PUMP_H_
#define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_ORIENTATION_EVENT_PUMP_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/device_sensors/device_sensor_event_pump.h"
#include "content/renderer/shared_memory_seqlock_reader.h"
diff --git a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
index d069d88..f46eb8d 100644
--- a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
+++ b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
@@ -6,6 +6,7 @@
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "content/common/device_sensors/device_orientation_hardware_buffer.h"
diff --git a/content/renderer/device_sensors/device_sensor_event_pump.h b/content/renderer/device_sensors/device_sensor_event_pump.h
index 700f28e..46252a7 100644
--- a/content/renderer/device_sensors/device_sensor_event_pump.h
+++ b/content/renderer/device_sensors/device_sensor_event_pump.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_SENSOR_EVENT_PUMP_H_
#define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_SENSOR_EVENT_PUMP_H_
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
index 0b9af90..6de2625 100644
--- a/content/renderer/devtools/devtools_agent.cc
+++ b/content/renderer/devtools/devtools_agent.cc
@@ -4,6 +4,8 @@
#include "content/renderer/devtools/devtools_agent.h"
+#include <stddef.h>
+
#include <map>
#include "base/lazy_instance.h"
diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h
index 4ad9696..ca763b7c 100644
--- a/content/renderer/devtools/devtools_agent.h
+++ b/content/renderer/devtools/devtools_agent.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/public/common/console_message_level.h"
diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc
index 94b9e0d4..a5e6b886 100644
--- a/content/renderer/devtools/devtools_agent_filter.cc
+++ b/content/renderer/devtools/devtools_agent_filter.cc
@@ -75,24 +75,25 @@
}
-void DevToolsAgentFilter::AddEmbeddedWorkerRouteOnMainThread(int32 routing_id) {
+void DevToolsAgentFilter::AddEmbeddedWorkerRouteOnMainThread(
+ int32_t routing_id) {
io_task_runner_->PostTask(
FROM_HERE, base::Bind(&DevToolsAgentFilter::AddEmbeddedWorkerRoute, this,
routing_id));
}
void DevToolsAgentFilter::RemoveEmbeddedWorkerRouteOnMainThread(
- int32 routing_id) {
+ int32_t routing_id) {
io_task_runner_->PostTask(
FROM_HERE, base::Bind(&DevToolsAgentFilter::RemoveEmbeddedWorkerRoute,
this, routing_id));
}
-void DevToolsAgentFilter::AddEmbeddedWorkerRoute(int32 routing_id) {
+void DevToolsAgentFilter::AddEmbeddedWorkerRoute(int32_t routing_id) {
embedded_worker_routes_.insert(routing_id);
}
-void DevToolsAgentFilter::RemoveEmbeddedWorkerRoute(int32 routing_id) {
+void DevToolsAgentFilter::RemoveEmbeddedWorkerRoute(int32_t routing_id) {
embedded_worker_routes_.erase(routing_id);
}
diff --git a/content/renderer/devtools/devtools_agent_filter.h b/content/renderer/devtools/devtools_agent_filter.h
index 00da43e1..ce85638 100644
--- a/content/renderer/devtools/devtools_agent_filter.h
+++ b/content/renderer/devtools/devtools_agent_filter.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
+#include <stdint.h>
+
#include <set>
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "ipc/message_filter.h"
struct DevToolsMessageData;
@@ -37,8 +39,8 @@
bool OnMessageReceived(const IPC::Message& message) override;
// Called on the main thread.
- void AddEmbeddedWorkerRouteOnMainThread(int32 routing_id);
- void RemoveEmbeddedWorkerRouteOnMainThread(int32 routing_id);
+ void AddEmbeddedWorkerRouteOnMainThread(int32_t routing_id);
+ void RemoveEmbeddedWorkerRouteOnMainThread(int32_t routing_id);
protected:
~DevToolsAgentFilter() override;
@@ -47,14 +49,14 @@
void OnDispatchOnInspectorBackend(int session_id, const std::string& message);
// Called on IO thread
- void AddEmbeddedWorkerRoute(int32 routing_id);
- void RemoveEmbeddedWorkerRoute(int32 routing_id);
+ void AddEmbeddedWorkerRoute(int32_t routing_id);
+ void RemoveEmbeddedWorkerRoute(int32_t routing_id);
base::MessageLoop* render_thread_loop_;
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
int current_routing_id_;
- std::set<int32> embedded_worker_routes_;
+ std::set<int32_t> embedded_worker_routes_;
DISALLOW_COPY_AND_ASSIGN(DevToolsAgentFilter);
};
diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools/devtools_client.h
index 0dba7f1..befa179 100644
--- a/content/renderer/devtools/devtools_client.h
+++ b/content/renderer/devtools/devtools_client.h
@@ -5,9 +5,11 @@
#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/web/WebDevToolsFrontendClient.h"
@@ -43,7 +45,7 @@
bool isUnderTest() override;
void OnDispatchOnInspectorFrontend(const std::string& message,
- uint32 total_size);
+ uint32_t total_size);
std::string compatibility_script_;
scoped_ptr<blink::WebDevToolsFrontend> web_tools_frontend_;
diff --git a/content/renderer/devtools/devtools_cpu_throttler.cc b/content/renderer/devtools/devtools_cpu_throttler.cc
index 9aa56dc4..f565067 100644
--- a/content/renderer/devtools/devtools_cpu_throttler.cc
+++ b/content/renderer/devtools/devtools_cpu_throttler.cc
@@ -10,8 +10,10 @@
#endif
#include "base/atomicops.h"
+#include "base/macros.h"
#include "base/synchronization/cancellation_flag.h"
#include "base/threading/platform_thread.h"
+#include "build/build_config.h"
using base::subtle::Atomic32;
using base::subtle::Acquire_Load;
diff --git a/content/renderer/devtools/devtools_cpu_throttler.h b/content/renderer/devtools/devtools_cpu_throttler.h
index 34a9e83f..78c901a 100644
--- a/content/renderer/devtools/devtools_cpu_throttler.h
+++ b/content/renderer/devtools/devtools_cpu_throttler.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CPU_THROTTLER_H_
#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CPU_THROTTLER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/devtools/lock_free_circular_queue.h b/content/renderer/devtools/lock_free_circular_queue.h
index dfa780b..f8a4811 100644
--- a/content/renderer/devtools/lock_free_circular_queue.h
+++ b/content/renderer/devtools/lock_free_circular_queue.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_DEVTOOLS_LOCK_FREE_CIRCULAR_QUEUE_H_
#define CONTENT_RENDERER_DEVTOOLS_LOCK_FREE_CIRCULAR_QUEUE_H_
+#include <stddef.h>
+
#include "base/atomicops.h"
+#include "base/macros.h"
#include "base/memory/aligned_memory.h"
#define CACHELINE_ALIGNED ALIGNAS(64)
diff --git a/content/renderer/devtools/v8_sampling_profiler.cc b/content/renderer/devtools/v8_sampling_profiler.cc
index 59d824c..1e43709f 100644
--- a/content/renderer/devtools/v8_sampling_profiler.cc
+++ b/content/renderer/devtools/v8_sampling_profiler.cc
@@ -4,6 +4,22 @@
#include "content/renderer/devtools/v8_sampling_profiler.h"
+#include <stdint.h>
+
+#include "base/format_macros.h"
+#include "base/location.h"
+#include "base/macros.h"
+#include "base/strings/stringprintf.h"
+#include "base/synchronization/cancellation_flag.h"
+#include "base/thread_task_runner_handle.h"
+#include "base/threading/platform_thread.h"
+#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_argument.h"
+#include "build/build_config.h"
+#include "content/renderer/devtools/lock_free_circular_queue.h"
+#include "content/renderer/render_thread_impl.h"
+#include "v8/include/v8.h"
+
#if defined(OS_POSIX)
#include <signal.h>
#define USE_SIGNALS
@@ -13,18 +29,6 @@
#include <windows.h>
#endif
-#include "base/format_macros.h"
-#include "base/location.h"
-#include "base/strings/stringprintf.h"
-#include "base/synchronization/cancellation_flag.h"
-#include "base/thread_task_runner_handle.h"
-#include "base/threading/platform_thread.h"
-#include "base/trace_event/trace_event.h"
-#include "base/trace_event/trace_event_argument.h"
-#include "content/renderer/devtools/lock_free_circular_queue.h"
-#include "content/renderer/render_thread_impl.h"
-#include "v8/include/v8.h"
-
using base::trace_event::ConvertableToTraceFormat;
using base::trace_event::TraceLog;
using base::trace_event::TracedValue;
@@ -87,7 +91,7 @@
std::string PtrToString(const void* value) {
return base::StringPrintf(
- "0x%" PRIx64, static_cast<uint64>(reinterpret_cast<intptr_t>(value)));
+ "0x%" PRIx64, static_cast<uint64_t>(reinterpret_cast<intptr_t>(value)));
}
class SampleRecord {
diff --git a/content/renderer/devtools/v8_sampling_profiler.h b/content/renderer/devtools/v8_sampling_profiler.h
index 2ead2f78..84fa97d25 100644
--- a/content/renderer/devtools/v8_sampling_profiler.h
+++ b/content/renderer/devtools/v8_sampling_profiler.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DEVTOOLS_V8_SAMPLING_PROFILER_H_
#define CONTENT_RENDERER_DEVTOOLS_V8_SAMPLING_PROFILER_H_
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h"
#include "base/trace_event/trace_log.h"
diff --git a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
index 1703d5d..9e7df0b 100644
--- a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
+++ b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/json/json_reader.h"
#include "base/run_loop.h"
#include "base/trace_event/trace_buffer.h"
diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc
index 3bcd8a5d..246877a 100644
--- a/content/renderer/disambiguation_popup_helper.cc
+++ b/content/renderer/disambiguation_popup_helper.cc
@@ -4,6 +4,8 @@
#include "content/renderer/disambiguation_popup_helper.h"
+#include <stddef.h>
+
#include "third_party/WebKit/public/platform/WebRect.h"
#include "ui/gfx/geometry/size_conversions.h"
diff --git a/content/renderer/disambiguation_popup_helper_unittest.cc b/content/renderer/disambiguation_popup_helper_unittest.cc
index 65976e2..2157f29 100644
--- a/content/renderer/disambiguation_popup_helper_unittest.cc
+++ b/content/renderer/disambiguation_popup_helper_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/disambiguation_popup_helper.h"
+#include <stddef.h>
+
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebRect.h"
#include "third_party/WebKit/public/platform/WebVector.h"
diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h
index 01efefd..67d98e2 100644
--- a/content/renderer/dom_automation_controller.h
+++ b/content/renderer/dom_automation_controller.h
@@ -5,7 +5,9 @@
#ifndef CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_
#define CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
#include "content/public/renderer/render_frame_observer.h"
#include "gin/wrappable.h"
@@ -92,7 +94,7 @@
// Makes the renderer send a javascript value to the app.
// The value to be sent can be either of type String,
- // Number (double casted to int32) or Boolean. Any other type or no
+ // Number (double casted to int32_t) or Boolean. Any other type or no
// argument at all is ignored.
bool SendMsg(const gin::Arguments& args);
diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc
index 1737cac9..a726d9c 100644
--- a/content/renderer/dom_serializer_browsertest.cc
+++ b/content/renderer/dom_serializer_browsertest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
@@ -10,6 +13,7 @@
#include "base/files/file_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
@@ -606,7 +610,7 @@
}
private:
- int32 render_view_routing_id_;
+ int32_t render_view_routing_id_;
std::string serialized_contents_;
bool serialization_reported_end_of_data_;
};
diff --git a/content/renderer/dom_storage/dom_storage_cached_area.h b/content/renderer/dom_storage/dom_storage_cached_area.h
index cf345fa2..6121914 100644
--- a/content/renderer/dom_storage/dom_storage_cached_area.h
+++ b/content/renderer/dom_storage/dom_storage_cached_area.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_
#define CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_
+#include <stddef.h>
#include <stdint.h>
#include <map>
diff --git a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
index 631a281..4c433271 100644
--- a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
+++ b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/dom_storage/dom_storage_cached_area.h"
+#include <stdint.h>
+
#include <list>
#include "base/bind.h"
@@ -118,7 +120,7 @@
kPageUrl("http://dom_storage/page") {
}
- const int64 kNamespaceId;
+ const int64_t kNamespaceId;
const GURL kOrigin;
const base::string16 kKey;
const base::string16 kValue;
diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc
index a4d877f..29dbb04 100644
--- a/content/renderer/dom_storage/dom_storage_dispatcher.cc
+++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc
@@ -99,11 +99,11 @@
explicit ProxyImpl(RenderThreadImpl* sender);
// Methods for use by DomStorageDispatcher directly.
- DOMStorageCachedArea* OpenCachedArea(
- int64 namespace_id, const GURL& origin);
+ DOMStorageCachedArea* OpenCachedArea(int64_t namespace_id,
+ const GURL& origin);
void CloseCachedArea(DOMStorageCachedArea* area);
- DOMStorageCachedArea* LookupCachedArea(
- int64 namespace_id, const GURL& origin);
+ DOMStorageCachedArea* LookupCachedArea(int64_t namespace_id,
+ const GURL& origin);
void CompleteOnePendingCallback(bool success);
void Shutdown();
@@ -155,7 +155,7 @@
return callback;
}
- std::string GetCachedAreaKey(int64 namespace_id, const GURL& origin) {
+ std::string GetCachedAreaKey(int64_t namespace_id, const GURL& origin) {
return base::Int64ToString(namespace_id) + origin.spec();
}
@@ -179,7 +179,8 @@
}
DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::OpenCachedArea(
- int64 namespace_id, const GURL& origin) {
+ int64_t namespace_id,
+ const GURL& origin) {
std::string key = GetCachedAreaKey(namespace_id, origin);
if (CachedAreaHolder* holder = GetAreaHolder(key)) {
++(holder->open_count_);
@@ -204,7 +205,8 @@
}
DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::LookupCachedArea(
- int64 namespace_id, const GURL& origin) {
+ int64_t namespace_id,
+ const GURL& origin) {
std::string key = GetCachedAreaKey(namespace_id, origin);
CachedAreaHolder* holder = GetAreaHolder(key);
if (!holder)
@@ -268,7 +270,9 @@
}
scoped_refptr<DOMStorageCachedArea> DomStorageDispatcher::OpenCachedArea(
- int connection_id, int64 namespace_id, const GURL& origin) {
+ int connection_id,
+ int64_t namespace_id,
+ const GURL& origin) {
RenderThreadImpl::current()->Send(
new DOMStorageHostMsg_OpenStorageArea(
connection_id, namespace_id, origin));
diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.h b/content/renderer/dom_storage/dom_storage_dispatcher.h
index 0e980a6..0ff9644 100644
--- a/content/renderer/dom_storage/dom_storage_dispatcher.h
+++ b/content/renderer/dom_storage/dom_storage_dispatcher.h
@@ -5,7 +5,8 @@
#ifndef CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_DISPATCHER_H_
#define CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_DISPATCHER_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/memory/ref_counted.h"
class GURL;
@@ -31,7 +32,7 @@
// Each call to open should be balanced with a call to close.
scoped_refptr<DOMStorageCachedArea> OpenCachedArea(int connection_id,
- int64 namespace_id,
+ int64_t namespace_id,
const GURL& origin);
void CloseCachedArea(int connection_id, DOMStorageCachedArea* area);
diff --git a/content/renderer/dom_storage/webstoragearea_impl.cc b/content/renderer/dom_storage/webstoragearea_impl.cc
index c307535..dd20bece 100644
--- a/content/renderer/dom_storage/webstoragearea_impl.cc
+++ b/content/renderer/dom_storage/webstoragearea_impl.cc
@@ -34,12 +34,11 @@
return g_all_areas_map.Pointer()->Lookup(id);
}
-WebStorageAreaImpl::WebStorageAreaImpl(
- int64 namespace_id, const GURL& origin)
+WebStorageAreaImpl::WebStorageAreaImpl(int64_t namespace_id, const GURL& origin)
: connection_id_(g_all_areas_map.Pointer()->Add(this)),
- cached_area_(dispatcher()->
- OpenCachedArea(connection_id_, namespace_id, origin)) {
-}
+ cached_area_(dispatcher()->OpenCachedArea(connection_id_,
+ namespace_id,
+ origin)) {}
WebStorageAreaImpl::~WebStorageAreaImpl() {
g_all_areas_map.Pointer()->Remove(connection_id_);
diff --git a/content/renderer/dom_storage/webstoragearea_impl.h b/content/renderer/dom_storage/webstoragearea_impl.h
index 61a8153..310250b 100644
--- a/content/renderer/dom_storage/webstoragearea_impl.h
+++ b/content/renderer/dom_storage/webstoragearea_impl.h
@@ -5,7 +5,9 @@
#ifndef CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGEAREA_IMPL_H_
#define CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGEAREA_IMPL_H_
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/memory/ref_counted.h"
#include "third_party/WebKit/public/platform/WebStorageArea.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -20,7 +22,7 @@
public:
static WebStorageAreaImpl* FromConnectionId(int id);
- WebStorageAreaImpl(int64 namespace_id, const GURL& origin);
+ WebStorageAreaImpl(int64_t namespace_id, const GURL& origin);
~WebStorageAreaImpl() override;
// See WebStorageArea.h for documentation on these functions.
diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.cc b/content/renderer/dom_storage/webstoragenamespace_impl.cc
index 531263d..4c86057 100644
--- a/content/renderer/dom_storage/webstoragenamespace_impl.cc
+++ b/content/renderer/dom_storage/webstoragenamespace_impl.cc
@@ -20,8 +20,7 @@
: namespace_id_(kLocalStorageNamespaceId) {
}
-WebStorageNamespaceImpl::WebStorageNamespaceImpl(
- int64 namespace_id)
+WebStorageNamespaceImpl::WebStorageNamespaceImpl(int64_t namespace_id)
: namespace_id_(namespace_id) {
DCHECK_NE(kInvalidSessionStorageNamespaceId, namespace_id);
}
diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.h b/content/renderer/dom_storage/webstoragenamespace_impl.h
index ecf3c74..d169df5 100644
--- a/content/renderer/dom_storage/webstoragenamespace_impl.h
+++ b/content/renderer/dom_storage/webstoragenamespace_impl.h
@@ -5,7 +5,8 @@
#ifndef CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGENAMESPACE_IMPL_H_
#define CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGENAMESPACE_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "third_party/WebKit/public/platform/WebStorageNamespace.h"
namespace content {
@@ -15,7 +16,7 @@
// The default constructor creates a local storage namespace, the second
// constructor should be used for session storage namepaces.
WebStorageNamespaceImpl();
- explicit WebStorageNamespaceImpl(int64 namespace_id);
+ explicit WebStorageNamespaceImpl(int64_t namespace_id);
~WebStorageNamespaceImpl() override;
// See WebStorageNamespace.h for documentation on these functions.
@@ -25,7 +26,7 @@
bool isSameNamespace(const WebStorageNamespace&) const override;
private:
- int64 namespace_id_;
+ int64_t namespace_id_;
};
} // namespace content
diff --git a/content/renderer/drop_data_builder.cc b/content/renderer/drop_data_builder.cc
index 37b7231..beb98b6d 100644
--- a/content/renderer/drop_data_builder.cc
+++ b/content/renderer/drop_data_builder.cc
@@ -4,6 +4,8 @@
#include "content/renderer/drop_data_builder.h"
+#include <stddef.h>
+
#include "base/strings/string_util.h"
#include "content/public/common/drop_data.h"
#include "third_party/WebKit/public/platform/WebDragData.h"
diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc
index f2363e3..7bb01a1d 100644
--- a/content/renderer/external_popup_menu.cc
+++ b/content/renderer/external_popup_menu.cc
@@ -4,6 +4,9 @@
#include "content/renderer/external_popup_menu.h"
+#include <stddef.h>
+
+#include "build/build_config.h"
#include "content/common/frame_messages.h"
#include "content/renderer/menu_item_builder.h"
#include "content/renderer/render_frame_impl.h"
diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h
index c73e4d7..0d99eb7 100644
--- a/content/renderer/external_popup_menu.h
+++ b/content/renderer/external_popup_menu.h
@@ -7,7 +7,8 @@
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
+#include "build/build_config.h"
#include "third_party/WebKit/public/web/WebExternalPopupMenu.h"
#include "third_party/WebKit/public/web/WebPopupMenuInfo.h"
#include "ui/gfx/geometry/point_f.h"
diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc
index 885070e..d7f9312 100644
--- a/content/renderer/external_popup_menu_browsertest.cc
+++ b/content/renderer/external_popup_menu_browsertest.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "content/common/frame_messages.h"
#include "content/public/test/render_view_test.h"
#include "content/renderer/render_frame_impl.h"
#include "content/renderer/render_view_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/web/WebView.h"
// Tests for the external select popup menu (Mac specific).
diff --git a/content/renderer/fetchers/manifest_fetcher.h b/content/renderer/fetchers/manifest_fetcher.h
index a75a660..bfb3b8c 100644
--- a/content/renderer/fetchers/manifest_fetcher.h
+++ b/content/renderer/fetchers/manifest_fetcher.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
index de44ace..0b8671e6 100644
--- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
+++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "url/gurl.h"
diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h
index b6c1c74..e260b0981 100644
--- a/content/renderer/fetchers/resource_fetcher_impl.h
+++ b/content/renderer/fetchers/resource_fetcher_impl.h
@@ -7,9 +7,9 @@
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/timer/timer.h"
#include "content/public/renderer/resource_fetcher.h"
diff --git a/content/renderer/fetchers/web_url_loader_client_impl.h b/content/renderer/fetchers/web_url_loader_client_impl.h
index e51b3ce0..70fb7da 100644
--- a/content/renderer/fetchers/web_url_loader_client_impl.h
+++ b/content/renderer/fetchers/web_url_loader_client_impl.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_FETCHERS_WEB_URL_LOADER_CLIENT_IMPL_H_
#define CONTENT_RENDERER_FETCHERS_WEB_URL_LOADER_CLIENT_IMPL_H_
+#include <stdint.h>
+
#include <string>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h
index 40af1b8..3aed543 100644
--- a/content/renderer/gamepad_shared_memory_reader.h
+++ b/content/renderer/gamepad_shared_memory_reader.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_
#define CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "content/common/gamepad_messages.h"
diff --git a/content/renderer/gin_browsertest.cc b/content/renderer/gin_browsertest.cc
index e536bd6..4244205 100644
--- a/content/renderer/gin_browsertest.cc
+++ b/content/renderer/gin_browsertest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/command_line.h"
+#include "base/macros.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/render_view_test.h"
#include "content/renderer/render_view_impl.h"
diff --git a/content/renderer/gpu/compositor_external_begin_frame_source.h b/content/renderer/gpu/compositor_external_begin_frame_source.h
index 92f9184..d555832 100644
--- a/content/renderer/gpu/compositor_external_begin_frame_source.h
+++ b/content/renderer/gpu/compositor_external_begin_frame_source.h
@@ -5,8 +5,8 @@
#ifndef CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_
#define CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "cc/scheduler/begin_frame_source.h"
#include "content/renderer/gpu/compositor_forwarding_message_filter.h"
diff --git a/content/renderer/gpu/compositor_forwarding_message_filter.h b/content/renderer/gpu/compositor_forwarding_message_filter.h
index 9e2afaf7b..92527cc 100644
--- a/content/renderer/gpu/compositor_forwarding_message_filter.h
+++ b/content/renderer/gpu/compositor_forwarding_message_filter.h
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/callback_forward.h"
+#include "base/macros.h"
#include "base/synchronization/lock.h"
#include "base/task_runner.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index eaea1d5..3a6e69929 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -8,6 +8,7 @@
#include "base/location.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/compositor_frame_ack.h"
#include "cc/output/managed_memory_policy.h"
@@ -26,8 +27,8 @@
namespace content {
CompositorOutputSurface::CompositorOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
scoped_ptr<cc::SoftwareOutputDevice> software_device,
@@ -38,8 +39,8 @@
software_device.Pass()),
output_surface_id_(output_surface_id),
use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
- output_surface_filter_(
- RenderThreadImpl::current()->compositor_message_filter()),
+ output_surface_filter_(RenderThreadImpl::current()
+ ->compositor_message_filter()),
frame_swap_message_queue_(swap_frame_message_queue),
routing_id_(routing_id),
#if defined(OS_ANDROID)
@@ -92,7 +93,7 @@
}
void CompositorOutputSurface::ShortcutSwapAck(
- uint32 output_surface_id,
+ uint32_t output_surface_id,
scoped_ptr<cc::GLFrameData> gl_frame_data) {
if (!layout_test_previous_frame_ack_) {
layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
@@ -175,7 +176,7 @@
CommitVSyncParameters(timebase, interval);
}
-void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
+void CompositorOutputSurface::OnSwapAck(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack) {
// Ignore message if it's a stale one coming from a different output surface
// (e.g. after a lost context).
@@ -186,7 +187,7 @@
}
void CompositorOutputSurface::OnReclaimResources(
- uint32 output_surface_id,
+ uint32_t output_surface_id,
const cc::CompositorFrameAck& ack) {
// Ignore message if it's a stale one coming from a different output surface
// (e.g. after a lost context).
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index 909bf5fb..cbbad42 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -5,14 +5,17 @@
#ifndef CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
#define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/threading/platform_thread.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "cc/output/begin_frame_args.h"
#include "cc/output/output_surface.h"
#include "content/renderer/gpu/compositor_forwarding_message_filter.h"
@@ -39,8 +42,8 @@
NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
CompositorOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>&
worker_context_provider,
@@ -59,13 +62,13 @@
void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override;
protected:
- void ShortcutSwapAck(uint32 output_surface_id,
+ void ShortcutSwapAck(uint32_t output_surface_id,
scoped_ptr<cc::GLFrameData> gl_frame_data);
- virtual void OnSwapAck(uint32 output_surface_id,
+ virtual void OnSwapAck(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack);
- virtual void OnReclaimResources(uint32 output_surface_id,
+ virtual void OnReclaimResources(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack);
- uint32 output_surface_id_;
+ uint32_t output_surface_id_;
private:
class CompositorOutputSurfaceProxy :
diff --git a/content/renderer/gpu/delegated_compositor_output_surface.cc b/content/renderer/gpu/delegated_compositor_output_surface.cc
index 6d02fab..9e8ad78a 100644
--- a/content/renderer/gpu/delegated_compositor_output_surface.cc
+++ b/content/renderer/gpu/delegated_compositor_output_surface.cc
@@ -8,8 +8,8 @@
namespace content {
DelegatedCompositorOutputSurface::DelegatedCompositorOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
diff --git a/content/renderer/gpu/delegated_compositor_output_surface.h b/content/renderer/gpu/delegated_compositor_output_surface.h
index 061f1d3..f98d60a 100644
--- a/content/renderer/gpu/delegated_compositor_output_surface.h
+++ b/content/renderer/gpu/delegated_compositor_output_surface.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_GPU_DELEGATED_COMPOSITOR_OUTPUT_SURFACE_H_
#define CONTENT_RENDERER_GPU_DELEGATED_COMPOSITOR_OUTPUT_SURFACE_H_
+#include <stdint.h>
+
#include "base/memory/ref_counted.h"
#include "content/renderer/gpu/compositor_output_surface.h"
@@ -14,8 +16,8 @@
class DelegatedCompositorOutputSurface : public CompositorOutputSurface {
public:
DelegatedCompositorOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>&
worker_context_provider,
diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc
index 7e7a75b..33ae9fc 100644
--- a/content/renderer/gpu/frame_swap_message_queue.cc
+++ b/content/renderer/gpu/frame_swap_message_queue.cc
@@ -9,6 +9,7 @@
#include "base/containers/hash_tables.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/stl_util.h"
#include "ipc/ipc_message.h"
diff --git a/content/renderer/gpu/frame_swap_message_queue.h b/content/renderer/gpu/frame_swap_message_queue.h
index 87ce2d8..f45a36a 100644
--- a/content/renderer/gpu/frame_swap_message_queue.h
+++ b/content/renderer/gpu/frame_swap_message_queue.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/auto_reset.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index 1c7368db..dbed38e4 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -4,11 +4,14 @@
#include "content/renderer/gpu/gpu_benchmarking_extension.h"
+#include <stddef.h>
+
#include <string>
#include "base/base64.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "cc/layers/layer.h"
#include "content/common/input/synthetic_gesture_params.h"
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.h b/content/renderer/gpu/gpu_benchmarking_extension.h
index 08d7f900..4da0448 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.h
+++ b/content/renderer/gpu/gpu_benchmarking_extension.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_GPU_GPU_BENCHMARKING_EXTENSION_H_
#define CONTENT_RENDERER_GPU_GPU_BENCHMARKING_EXTENSION_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "gin/wrappable.h"
namespace blink {
diff --git a/content/renderer/gpu/mailbox_output_surface.cc b/content/renderer/gpu/mailbox_output_surface.cc
index de98102..19a7efdb 100644
--- a/content/renderer/gpu/mailbox_output_surface.cc
+++ b/content/renderer/gpu/mailbox_output_surface.cc
@@ -23,8 +23,8 @@
namespace content {
MailboxOutputSurface::MailboxOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
@@ -152,7 +152,7 @@
0);
}
-void MailboxOutputSurface::OnSwapAck(uint32 output_surface_id,
+void MailboxOutputSurface::OnSwapAck(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack) {
// Ignore message if it's a stale one coming from a different output surface
// (e.g. after a lost context).
@@ -189,7 +189,7 @@
// The browser always keeps one texture as the frontbuffer.
// If it does not return a mailbox, it discarded the frontbuffer which is
// the oldest texture we sent.
- uint32 texture_id = pending_textures_.front().texture_id;
+ uint32_t texture_id = pending_textures_.front().texture_id;
if (texture_id)
context_provider_->ContextGL()->DeleteTextures(1, &texture_id);
pending_textures_.pop_front();
@@ -224,7 +224,7 @@
MailboxOutputSurface::TransferableFrame::TransferableFrame() : texture_id(0) {}
MailboxOutputSurface::TransferableFrame::TransferableFrame(
- uint32 texture_id,
+ uint32_t texture_id,
const gpu::Mailbox& mailbox,
const gfx::Size size)
: texture_id(texture_id), mailbox(mailbox), size(size) {}
diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h
index 148efa3..1d4b9555 100644
--- a/content/renderer/gpu/mailbox_output_surface.h
+++ b/content/renderer/gpu/mailbox_output_surface.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
#define CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <queue>
#include "base/memory/ref_counted.h"
@@ -27,8 +30,8 @@
class MailboxOutputSurface : public CompositorOutputSurface {
public:
MailboxOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>&
worker_context_provider,
@@ -46,18 +49,18 @@
private:
// CompositorOutputSurface overrides.
- void OnSwapAck(uint32 output_surface_id,
+ void OnSwapAck(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack) override;
size_t GetNumAcksPending();
struct TransferableFrame {
TransferableFrame();
- TransferableFrame(uint32 texture_id,
+ TransferableFrame(uint32_t texture_id,
const gpu::Mailbox& mailbox,
const gfx::Size size);
- uint32 texture_id;
+ uint32_t texture_id;
gpu::Mailbox mailbox;
gpu::SyncToken sync_token;
gfx::Size size;
@@ -67,7 +70,7 @@
std::deque<TransferableFrame> pending_textures_;
std::queue<TransferableFrame> returned_textures_;
- uint32 fbo_;
+ uint32_t fbo_;
bool is_backbuffer_discarded_;
cc::ResourceFormat format_;
};
diff --git a/content/renderer/gpu/queue_message_swap_promise.cc b/content/renderer/gpu/queue_message_swap_promise.cc
index 170243e8..5d8386d8 100644
--- a/content/renderer/gpu/queue_message_swap_promise.cc
+++ b/content/renderer/gpu/queue_message_swap_promise.cc
@@ -67,7 +67,7 @@
#endif
}
-int64 QueueMessageSwapPromise::TraceId() const {
+int64_t QueueMessageSwapPromise::TraceId() const {
return 0;
}
diff --git a/content/renderer/gpu/queue_message_swap_promise.h b/content/renderer/gpu/queue_message_swap_promise.h
index 37198b2..a43626b 100644
--- a/content/renderer/gpu/queue_message_swap_promise.h
+++ b/content/renderer/gpu/queue_message_swap_promise.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_GPU_QUEUE_MESSAGE_SWAP_PROMISE_H_
#define CONTENT_RENDERER_GPU_QUEUE_MESSAGE_SWAP_PROMISE_H_
+#include <stdint.h>
+
#include "base/memory/ref_counted.h"
#include "cc/output/swap_promise.h"
@@ -28,7 +30,7 @@
void DidSwap(cc::CompositorFrameMetadata* metadata) override;
void DidNotSwap(DidNotSwapReason reason) override;
- int64 TraceId() const override;
+ int64_t TraceId() const override;
private:
void PromiseCompleted();
diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
index 7f3837f..234ff77b 100644
--- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc
+++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -4,8 +4,11 @@
#include "content/renderer/gpu/queue_message_swap_promise.h"
+#include <stddef.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "cc/output/swap_promise.h"
#include "content/renderer/gpu/frame_swap_message_queue.h"
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 74aae79..aae1834 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -4,6 +4,8 @@
#include "content/renderer/gpu/render_widget_compositor.h"
+#include <stddef.h>
+
#include <limits>
#include <string>
@@ -18,6 +20,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "base/values.h"
+#include "build/build_config.h"
#include "cc/animation/animation_host.h"
#include "cc/animation/animation_timeline.h"
#include "cc/base/switches.h"
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index 3a37e50..0eac7cd 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
#define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
+#include <stdint.h>
+
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc
index 18e48a5a..f202310 100644
--- a/content/renderer/gpu/render_widget_compositor_unittest.cc
+++ b/content/renderer/gpu/render_widget_compositor_unittest.cc
@@ -5,6 +5,7 @@
#include "content/renderer/gpu/render_widget_compositor.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "cc/output/begin_frame_args.h"
diff --git a/content/renderer/gpu/stream_texture_host_android.cc b/content/renderer/gpu/stream_texture_host_android.cc
index fe63557..41e96b7 100644
--- a/content/renderer/gpu/stream_texture_host_android.cc
+++ b/content/renderer/gpu/stream_texture_host_android.cc
@@ -24,7 +24,7 @@
channel_->RemoveRoute(stream_id_);
}
-bool StreamTextureHost::BindToCurrentThread(int32 stream_id,
+bool StreamTextureHost::BindToCurrentThread(int32_t stream_id,
Listener* listener) {
listener_ = listener;
if (channel_.get() && stream_id && !stream_id_) {
diff --git a/content/renderer/gpu/stream_texture_host_android.h b/content/renderer/gpu/stream_texture_host_android.h
index 871cb63..998cff548 100644
--- a/content/renderer/gpu/stream_texture_host_android.h
+++ b/content/renderer/gpu/stream_texture_host_android.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_GPU_STREAM_TEXTURE_HOST_ANDROID_H_
#define CONTENT_RENDERER_GPU_STREAM_TEXTURE_HOST_ANDROID_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/android/surface_texture_peer.h"
#include "ipc/ipc_listener.h"
@@ -35,7 +38,7 @@
virtual ~Listener() {}
};
- bool BindToCurrentThread(int32 stream_id, Listener* listener);
+ bool BindToCurrentThread(int32_t stream_id, Listener* listener);
// IPC::Channel::Listener implementation:
bool OnMessageReceived(const IPC::Message& message) override;
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h
index f3da175..aeeae01 100644
--- a/content/renderer/history_controller.h
+++ b/content/renderer/history_controller.h
@@ -36,6 +36,7 @@
#define CONTENT_RENDERER_HISTORY_CONTROLLER_H_
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/renderer/history_entry.h"
diff --git a/content/renderer/history_controller_browsertest.cc b/content/renderer/history_controller_browsertest.cc
index 5dc89a8b2..148c0c3 100644
--- a/content/renderer/history_controller_browsertest.cc
+++ b/content/renderer/history_controller_browsertest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "build/build_config.h"
#include "content/common/site_isolation_policy.h"
#include "content/public/test/render_view_test.h"
#include "content/renderer/history_controller.h"
diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
index d015cf2..a8e3692b 100644
--- a/content/renderer/history_serialization.cc
+++ b/content/renderer/history_serialization.cc
@@ -4,6 +4,8 @@
#include "content/renderer/history_serialization.h"
+#include <stddef.h>
+
#include "content/common/page_state_serialization.h"
#include "content/public/common/page_state.h"
#include "content/renderer/history_entry.h"
diff --git a/content/renderer/idle_user_detector.h b/content/renderer/idle_user_detector.h
index 58e7037..3e3beba 100644
--- a/content/renderer/idle_user_detector.h
+++ b/content/renderer/idle_user_detector.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_IDLE_USER_DETECTOR_H_
#define CONTENT_RENDERER_IDLE_USER_DETECTOR_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/public/renderer/render_view_observer.h"
namespace blink {
diff --git a/content/renderer/image_downloader/image_downloader_impl.h b/content/renderer/image_downloader/image_downloader_impl.h
index 828c72d..888d839 100644
--- a/content/renderer/image_downloader/image_downloader_impl.h
+++ b/content/renderer/image_downloader/image_downloader_impl.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_
#define CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_
+#include <stdint.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "content/common/image_downloader/image_downloader.mojom.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/in_process_renderer_thread.cc b/content/renderer/in_process_renderer_thread.cc
index 94a41e6..a2c8c5d 100644
--- a/content/renderer/in_process_renderer_thread.cc
+++ b/content/renderer/in_process_renderer_thread.cc
@@ -4,6 +4,7 @@
#include "content/renderer/in_process_renderer_thread.h"
+#include "build/build_config.h"
#include "content/renderer/render_process.h"
#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/in_process_renderer_thread.h b/content/renderer/in_process_renderer_thread.h
index 1156160..ab256f4a 100644
--- a/content/renderer/in_process_renderer_thread.h
+++ b/content/renderer/in_process_renderer_thread.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "base/threading/thread.h"
#include "content/common/content_export.h"
#include "content/common/in_process_child_thread_params.h"
diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc
index d072303..1aace83d 100644
--- a/content/renderer/input/input_event_filter_unittest.cc
+++ b/content/renderer/input/input_event_filter_unittest.cc
@@ -2,12 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include <new>
#include <utility>
#include <vector>
#include "base/bind.h"
+#include "base/macros.h"
#include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
#include "content/common/input/synthetic_web_input_event_builders.h"
#include "content/common/input_messages.h"
#include "content/common/view_messages.h"
diff --git a/content/renderer/input/input_handler_manager_client.h b/content/renderer/input/input_handler_manager_client.h
index 9455af3..cf4fe00 100644
--- a/content/renderer/input/input_handler_manager_client.h
+++ b/content/renderer/input/input_handler_manager_client.h
@@ -5,9 +5,9 @@
#ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_CLIENT_H_
#define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_CLIENT_H_
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/callback_forward.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/common/input/input_event_ack_state.h"
#include "ui/gfx/geometry/vector2d_f.h"
diff --git a/content/renderer/input/input_handler_wrapper.h b/content/renderer/input/input_handler_wrapper.h
index 69ff5c671..0589a0f 100644
--- a/content/renderer/input/input_handler_wrapper.h
+++ b/content/renderer/input/input_handler_wrapper.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_
#define CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "content/renderer/input/input_handler_manager.h"
diff --git a/content/renderer/input/main_thread_input_event_filter.cc b/content/renderer/input/main_thread_input_event_filter.cc
index cd6c2ea..61814c9 100644
--- a/content/renderer/input/main_thread_input_event_filter.cc
+++ b/content/renderer/input/main_thread_input_event_filter.cc
@@ -29,7 +29,7 @@
}
bool MainThreadInputEventFilter::GetSupportedMessageClasses(
- std::vector<uint32>* supported_message_classes) const {
+ std::vector<uint32_t>* supported_message_classes) const {
supported_message_classes->push_back(InputMsgStart);
return true;
}
diff --git a/content/renderer/input/main_thread_input_event_filter.h b/content/renderer/input/main_thread_input_event_filter.h
index 9ff560d..5fc513a 100644
--- a/content/renderer/input/main_thread_input_event_filter.h
+++ b/content/renderer/input/main_thread_input_event_filter.h
@@ -5,7 +5,8 @@
#ifndef CONTENT_RENDERER_INPUT_MAIN_THREAD_INPUT_EVENT_FILTER_H_
#define CONTENT_RENDERER_INPUT_MAIN_THREAD_INPUT_EVENT_FILTER_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/callback.h"
#include "ipc/message_filter.h"
@@ -32,7 +33,7 @@
// IPC::MessageFilter implementation.
bool OnMessageReceived(const IPC::Message& message) override;
bool GetSupportedMessageClasses(
- std::vector<uint32>* supported_message_classes) const override;
+ std::vector<uint32_t>* supported_message_classes) const override;
private:
~MainThreadInputEventFilter() override;
diff --git a/content/renderer/input/render_widget_input_handler.cc b/content/renderer/input/render_widget_input_handler.cc
index 275b77e..78c6465 100644
--- a/content/renderer/input/render_widget_input_handler.cc
+++ b/content/renderer/input/render_widget_input_handler.cc
@@ -4,9 +4,13 @@
#include "content/renderer/input/render_widget_input_handler.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/auto_reset.h"
#include "base/metrics/histogram_macros.h"
#include "base/trace_event/trace_event_synthetic_delay.h"
+#include "build/build_config.h"
#include "cc/trees/swap_promise_monitor.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
#include "content/common/input/input_event_ack.h"
@@ -47,7 +51,7 @@
// be spent in input hanlders before input starts getting throttled.
const int kInputHandlingTimeThrottlingThresholdMicroseconds = 4166;
-int64 GetEventLatencyMicros(double event_timestamp, base::TimeTicks now) {
+int64_t GetEventLatencyMicros(double event_timestamp, base::TimeTicks now) {
return (now - base::TimeDelta::FromSecondsD(event_timestamp))
.ToInternalValue();
}
@@ -120,7 +124,7 @@
}
}
-void LogPassiveLatency(int64 latency) {
+void LogPassiveLatency(int64_t latency) {
UMA_HISTOGRAM_CUSTOM_COUNTS("Event.PassiveListeners.Latency", latency, 1,
10000000, 100);
}
diff --git a/content/renderer/input/render_widget_input_handler.h b/content/renderer/input/render_widget_input_handler.h
index a44e020..f8ff1d3 100644
--- a/content/renderer/input/render_widget_input_handler.h
+++ b/content/renderer/input/render_widget_input_handler.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_INPUT_RENDER_WIDGET_INPUT_HANDLER_H_
#define CONTENT_RENDERER_INPUT_RENDER_WIDGET_INPUT_HANDLER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "content/common/input/did_overscroll_params.h"
diff --git a/content/renderer/internal_document_state_data.h b/content/renderer/internal_document_state_data.h
index 47097805..23335a5 100644
--- a/content/renderer/internal_document_state_data.h
+++ b/content/renderer/internal_document_state_data.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/supports_user_data.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
diff --git a/content/renderer/java/gin_java_bridge_dispatcher.h b/content/renderer/java/gin_java_bridge_dispatcher.h
index 877e46f..05e1427 100644
--- a/content/renderer/java/gin_java_bridge_dispatcher.h
+++ b/content/renderer/java/gin_java_bridge_dispatcher.h
@@ -9,6 +9,7 @@
#include <set>
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
diff --git a/content/renderer/java/gin_java_bridge_object.h b/content/renderer/java/gin_java_bridge_object.h
index 55846c4..25d1840 100644
--- a/content/renderer/java/gin_java_bridge_object.h
+++ b/content/renderer/java/gin_java_bridge_object.h
@@ -7,6 +7,7 @@
#include <map>
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/renderer/java/gin_java_bridge_dispatcher.h"
#include "gin/handle.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter.cc b/content/renderer/java/gin_java_bridge_value_converter.cc
index 2fdf658b..849ef6a 100644
--- a/content/renderer/java/gin_java_bridge_value_converter.cc
+++ b/content/renderer/java/gin_java_bridge_value_converter.cc
@@ -4,8 +4,12 @@
#include "content/renderer/java/gin_java_bridge_value_converter.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <cmath>
+#include "base/macros.h"
#include "base/values.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "content/renderer/java/gin_java_bridge_object.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter.h b/content/renderer/java/gin_java_bridge_value_converter.h
index 33e3af5..5c4ee984 100644
--- a/content/renderer/java/gin_java_bridge_value_converter.h
+++ b/content/renderer/java/gin_java_bridge_value_converter.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_JAVA_GIN_JAVA_BRIDGE_VALUE_CONVERTER_H_
#define CONTENT_RENDERER_JAVA_GIN_JAVA_BRIDGE_VALUE_CONVERTER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/public/child/v8_value_converter.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
index 056aaeb..2de3e12 100644
--- a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
+++ b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include <cmath>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/stringprintf.h"
#include "content/common/android/gin_java_bridge_value.h"
diff --git a/content/renderer/java/gin_java_function_invocation_helper.h b/content/renderer/java/gin_java_function_invocation_helper.h
index 2860820..823420d5 100644
--- a/content/renderer/java/gin_java_function_invocation_helper.h
+++ b/content/renderer/java/gin_java_function_invocation_helper.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_JAVA_GIN_JAVA_FUNCTION_INVOCATION_HELPER_H_
#define CONTENT_RENDERER_JAVA_GIN_JAVA_FUNCTION_INVOCATION_HELPER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/renderer/java/gin_java_bridge_dispatcher.h"
diff --git a/content/renderer/manifest/manifest_manager.h b/content/renderer/manifest/manifest_manager.h
index 16ce857..f78482f3 100644
--- a/content/renderer/manifest/manifest_manager.h
+++ b/content/renderer/manifest/manifest_manager.h
@@ -8,6 +8,7 @@
#include <list>
#include "base/callback_forward.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/common/manifest.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc
index 417188d5..b43e712 100644
--- a/content/renderer/manifest/manifest_parser.cc
+++ b/content/renderer/manifest/manifest_parser.cc
@@ -4,6 +4,8 @@
#include "content/renderer/manifest/manifest_parser.h"
+#include <stddef.h>
+
#include "base/json/json_reader.h"
#include "base/strings/nullable_string16.h"
#include "base/strings/string_number_conversions.h"
@@ -203,9 +205,10 @@
return Manifest::kInvalidOrMissingColor;
}
- // We do this here because Java does not have an unsigned int32 type so colors
- // with high alpha values will be negative. Instead of doing the conversion
- // after we pass over to Java, we do it here as it is easier and clearer.
+ // We do this here because Java does not have an unsigned int32_t type so
+ // colors with high alpha values will be negative. Instead of doing the
+ // conversion after we pass over to Java, we do it here as it is easier and
+ // clearer.
int32_t signed_color = reinterpret_cast<int32_t&>(color);
return static_cast<int64_t>(signed_color);
}
diff --git a/content/renderer/manifest/manifest_parser.h b/content/renderer/manifest/manifest_parser.h
index 581f76e..666f86d 100644
--- a/content/renderer/manifest/manifest_parser.h
+++ b/content/renderer/manifest/manifest_parser.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include "base/macros.h"
#include "base/strings/nullable_string16.h"
#include "base/strings/string_piece.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/manifest/manifest_parser_unittest.cc b/content/renderer/manifest/manifest_parser_unittest.cc
index d38a082..f98691c 100644
--- a/content/renderer/manifest/manifest_parser_unittest.cc
+++ b/content/renderer/manifest/manifest_parser_unittest.cc
@@ -4,6 +4,9 @@
#include "content/renderer/manifest/manifest_parser.h"
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/strings/string_util.h"
#include "content/public/common/manifest.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/media/aec_dump_message_filter.h b/content/renderer/media/aec_dump_message_filter.h
index 45df9be..0fb0cf930 100644
--- a/content/renderer/media/aec_dump_message_filter.h
+++ b/content/renderer/media/aec_dump_message_filter.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_AEC_DUMP_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_MEDIA_AEC_DUMP_MESSAGE_FILTER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/media/android/audio_decoder_android.cc b/content/renderer/media/android/audio_decoder_android.cc
index 6373ccd..2601fea4 100644
--- a/content/renderer/media/android/audio_decoder_android.cc
+++ b/content/renderer/media/android/audio_decoder_android.cc
@@ -7,12 +7,14 @@
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
+#include <stdint.h>
#include <sys/mman.h>
#include <unistd.h>
#include <vector>
#include "base/file_descriptor_posix.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/posix/eintr_wrapper.h"
#include "base/process/process_handle.h"
@@ -106,7 +108,7 @@
// basic guide to the WAVE file format.
class WAVEDecoder {
public:
- WAVEDecoder(const uint8* data, size_t data_size);
+ WAVEDecoder(const uint8_t* data, size_t data_size);
~WAVEDecoder();
// Try to decode the data as a WAVE file. If the data is a supported
diff --git a/content/renderer/media/android/audio_decoder_android.h b/content/renderer/media/android/audio_decoder_android.h
index 983e8b4..3f4c45b 100644
--- a/content/renderer/media/android/audio_decoder_android.h
+++ b/content/renderer/media/android/audio_decoder_android.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_AUDIO_DECODER_ANDROID_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_AUDIO_DECODER_ANDROID_H_
+#include <stddef.h>
+
#include "content/child/thread_safe_sender.h"
namespace blink {
diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h
index 81d8484b..d09ac13 100644
--- a/content/renderer/media/android/media_info_loader.h
+++ b/content/renderer/media/android/media_info_loader.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
+#include <stdint.h>
+
#include <string>
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/android/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc
index c5fc8bd9..8438924 100644
--- a/content/renderer/media/android/media_info_loader_unittest.cc
+++ b/content/renderer/media/android/media_info_loader_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "content/renderer/media/android/media_info_loader.h"
#include "content/test/mock_webframeclient.h"
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 1f45238a..8b23408 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -35,7 +35,7 @@
// 4: approximately 64ms of content in 60 fps movies.
const size_t kAccessUnitSizeForMediaSource = 4;
-const uint8 kVorbisPadding[] = { 0xff, 0xff, 0xff, 0xff };
+const uint8_t kVorbisPadding[] = {0xff, 0xff, 0xff, 0xff};
} // namespace
@@ -668,7 +668,7 @@
void MediaSourceDelegate::OnEncryptedMediaInitData(
media::EmeInitDataType init_data_type,
- const std::vector<uint8>& init_data) {
+ const std::vector<uint8_t>& init_data) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
if (encrypted_media_init_data_cb_.is_null())
return;
diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
index ee5e1a4..9571d5a7 100644
--- a/content/renderer/media/android/media_source_delegate.h
+++ b/content/renderer/media/android/media_source_delegate.h
@@ -5,10 +5,14 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <string>
#include <vector>
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -139,7 +143,7 @@
void OnDemuxerOpened();
void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type,
- const std::vector<uint8>& init_data);
+ const std::vector<uint8_t>& init_data);
void NotifyDemuxerReady();
// Stops and clears objects on the media thread.
diff --git a/content/renderer/media/android/renderer_demuxer_android.h b/content/renderer/media/android/renderer_demuxer_android.h
index 29469ede..986b481 100644
--- a/content/renderer/media/android/renderer_demuxer_android.h
+++ b/content/renderer/media/android/renderer_demuxer_android.h
@@ -7,6 +7,7 @@
#include "base/atomic_sequence_num.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "ipc/message_filter.h"
#include "media/base/android/demuxer_stream_player_params.h"
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
index 5e754bc..94cb9fd 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -8,7 +8,7 @@
#include <map>
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/time/time.h"
#include "content/common/media/media_player_messages_enums_android.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/media/android/stream_texture_factory.h b/content/renderer/media/android/stream_texture_factory.h
index ae2ac3a..87977cf 100644
--- a/content/renderer/media/android/stream_texture_factory.h
+++ b/content/renderer/media/android/stream_texture_factory.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
+#include <stdint.h>
+
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
@@ -29,7 +31,7 @@
// Initialize and bind to the loop, which becomes the thread that
// a connected client will receive callbacks on. This can be called
// on any thread, but must be called with the same loop every time.
- virtual void BindToLoop(int32 stream_id,
+ virtual void BindToLoop(int32_t stream_id,
cc::VideoFrameProvider::Client* client,
scoped_refptr<base::SingleThreadTaskRunner> loop) = 0;
@@ -60,7 +62,9 @@
// object for the given stream_id. After the the surface is created,
// it will be passed back to the WebMediaPlayerAndroid object identified by
// the player_id.
- virtual void EstablishPeer(int32 stream_id, int player_id, int frame_id) = 0;
+ virtual void EstablishPeer(int32_t stream_id,
+ int player_id,
+ int frame_id) = 0;
// Creates a StreamTexture and returns its id. Sets |*texture_id| to the
// client-side id of the StreamTexture. The texture is produced into
@@ -70,7 +74,7 @@
gpu::Mailbox* texture_mailbox) = 0;
// Set the streamTexture size for the given stream Id.
- virtual void SetStreamTextureSize(int32 texture_id,
+ virtual void SetStreamTextureSize(int32_t texture_id,
const gfx::Size& size) = 0;
virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
diff --git a/content/renderer/media/android/stream_texture_factory_impl.cc b/content/renderer/media/android/stream_texture_factory_impl.cc
index 740fed3c..945442e 100644
--- a/content/renderer/media/android/stream_texture_factory_impl.cc
+++ b/content/renderer/media/android/stream_texture_factory_impl.cc
@@ -4,6 +4,7 @@
#include "content/renderer/media/android/stream_texture_factory_impl.h"
+#include "base/macros.h"
#include "cc/output/context_provider.h"
#include "content/common/gpu/client/context_provider_command_buffer.h"
#include "content/common/gpu/client/gpu_channel_host.h"
@@ -23,7 +24,7 @@
~StreamTextureProxyImpl() override;
// StreamTextureProxy implementation:
- void BindToLoop(int32 stream_id,
+ void BindToLoop(int32_t stream_id,
cc::VideoFrameProvider::Client* client,
scoped_refptr<base::SingleThreadTaskRunner> loop) override;
void Release() override;
@@ -33,7 +34,7 @@
void OnMatrixChanged(const float matrix[16]) override;
private:
- void BindOnThread(int32 stream_id);
+ void BindOnThread(int32_t stream_id);
const scoped_ptr<StreamTextureHost> host_;
@@ -67,7 +68,7 @@
}
void StreamTextureProxyImpl::BindToLoop(
- int32 stream_id,
+ int32_t stream_id,
cc::VideoFrameProvider::Client* client,
scoped_refptr<base::SingleThreadTaskRunner> loop) {
DCHECK(loop.get());
@@ -91,7 +92,7 @@
stream_id));
}
-void StreamTextureProxyImpl::BindOnThread(int32 stream_id) {
+void StreamTextureProxyImpl::BindOnThread(int32_t stream_id) {
host_->BindToCurrentThread(stream_id, this);
}
@@ -131,7 +132,7 @@
return new StreamTextureProxyImpl(host);
}
-void StreamTextureFactoryImpl::EstablishPeer(int32 stream_id,
+void StreamTextureFactoryImpl::EstablishPeer(int32_t stream_id,
int player_id,
int frame_id) {
DCHECK(channel_.get());
@@ -155,7 +156,7 @@
return stream_id;
}
-void StreamTextureFactoryImpl::SetStreamTextureSize(int32 stream_id,
+void StreamTextureFactoryImpl::SetStreamTextureSize(int32_t stream_id,
const gfx::Size& size) {
channel_->Send(new GpuStreamTextureMsg_SetSize(stream_id, size));
}
diff --git a/content/renderer/media/android/stream_texture_factory_impl.h b/content/renderer/media/android/stream_texture_factory_impl.h
index f39ba49..648f70fb 100644
--- a/content/renderer/media/android/stream_texture_factory_impl.h
+++ b/content/renderer/media/android/stream_texture_factory_impl.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "content/renderer/media/android/stream_texture_factory.h"
namespace cc {
@@ -30,11 +33,11 @@
// StreamTextureFactory implementation.
StreamTextureProxy* CreateProxy() override;
- void EstablishPeer(int32 stream_id, int player_id, int frame_id) override;
+ void EstablishPeer(int32_t stream_id, int player_id, int frame_id) override;
unsigned CreateStreamTexture(unsigned texture_target,
unsigned* texture_id,
gpu::Mailbox* texture_mailbox) override;
- void SetStreamTextureSize(int32 texture_id, const gfx::Size& size) override;
+ void SetStreamTextureSize(int32_t texture_id, const gfx::Size& size) override;
gpu::gles2::GLES2Interface* ContextGL() override;
void AddObserver(StreamTextureFactoryContextObserver* obs) override;
void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
index 116fc011..44ae072b 100644
--- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
+++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/process/process_handle.h"
#include "base/single_thread_task_runner.h"
@@ -34,13 +35,13 @@
~StreamTextureProxyImpl() override;
// StreamTextureProxy implementation:
- void BindToLoop(int32 stream_id,
+ void BindToLoop(int32_t stream_id,
cc::VideoFrameProvider::Client* client,
scoped_refptr<base::SingleThreadTaskRunner> loop) override;
void Release() override;
private:
- void BindOnThread(int32 stream_id);
+ void BindOnThread(int32_t stream_id);
void OnFrameAvailable();
// Protects access to |client_| and |loop_|.
@@ -84,7 +85,7 @@
}
void StreamTextureProxyImpl::BindToLoop(
- int32 stream_id,
+ int32_t stream_id,
cc::VideoFrameProvider::Client* client,
scoped_refptr<base::SingleThreadTaskRunner> loop) {
DCHECK(loop.get());
@@ -108,7 +109,7 @@
stream_id));
}
-void StreamTextureProxyImpl::BindOnThread(int32 stream_id) {
+void StreamTextureProxyImpl::BindOnThread(int32_t stream_id) {
surface_texture_ = context_provider_->GetSurfaceTexture(stream_id);
if (!surface_texture_.get()) {
LOG(ERROR) << "Failed to get SurfaceTexture for stream.";
@@ -178,7 +179,7 @@
return new StreamTextureProxyImpl(context_provider_.get());
}
-void StreamTextureFactorySynchronousImpl::EstablishPeer(int32 stream_id,
+void StreamTextureFactorySynchronousImpl::EstablishPeer(int32_t stream_id,
int player_id,
int frame_id) {
DCHECK(context_provider_.get());
@@ -210,7 +211,7 @@
}
void StreamTextureFactorySynchronousImpl::SetStreamTextureSize(
- int32 stream_id,
+ int32_t stream_id,
const gfx::Size& size) {}
gpu::gles2::GLES2Interface* StreamTextureFactorySynchronousImpl::ContextGL() {
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
index 6f1da28..cca38a8 100644
--- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
+++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H_
+#include <stdint.h>
+
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
#include "content/renderer/media/android/stream_texture_factory.h"
@@ -28,9 +31,9 @@
class ContextProvider : public base::RefCountedThreadSafe<ContextProvider> {
public:
virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
- uint32 stream_id) = 0;
+ uint32_t stream_id) = 0;
- virtual uint32 CreateStreamTexture(uint32 texture_id) = 0;
+ virtual uint32_t CreateStreamTexture(uint32_t texture_id) = 0;
virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
@@ -50,11 +53,11 @@
int frame_id);
StreamTextureProxy* CreateProxy() override;
- void EstablishPeer(int32 stream_id, int player_id, int frame_id) override;
+ void EstablishPeer(int32_t stream_id, int player_id, int frame_id) override;
unsigned CreateStreamTexture(unsigned texture_target,
unsigned* texture_id,
gpu::Mailbox* texture_mailbox) override;
- void SetStreamTextureSize(int32 stream_id, const gfx::Size& size) override;
+ void SetStreamTextureSize(int32_t stream_id, const gfx::Size& size) override;
gpu::gles2::GLES2Interface* ContextGL() override;
void AddObserver(StreamTextureFactoryContextObserver* obs) override;
void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 93f1826..4a1f4f74 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/android/webmediaplayer_android.h"
+#include <stddef.h>
+
#include <limits>
#include "base/android/build_info.h"
@@ -66,7 +68,7 @@
#include "third_party/skia/include/gpu/SkGrPixelRef.h"
#include "ui/gfx/image/image.h"
-static const uint32 kGLTextureExternalOES = 0x8D65;
+static const uint32_t kGLTextureExternalOES = 0x8D65;
static const int kSDKVersionToSupportSecurityOriginCheck = 20;
using blink::WebMediaPlayer;
@@ -97,7 +99,7 @@
// File-static function is to allow it to run even after WMPA is deleted.
void OnReleaseTexture(
const scoped_refptr<content::StreamTextureFactory>& factories,
- uint32 texture_id,
+ uint32_t texture_id,
const gpu::SyncToken& sync_token) {
GLES2Interface* gl = factories->ContextGL();
gl->WaitSyncTokenCHROMIUM(sync_token.GetConstData());
@@ -704,9 +706,8 @@
// Ensure the target of texture is set before copyTextureCHROMIUM, otherwise
// an invalid texture target may be used for copy texture.
- uint32 src_texture =
- web_graphics_context->createAndConsumeTextureCHROMIUM(
- mailbox_holder.texture_target, mailbox_holder.mailbox.name);
+ uint32_t src_texture = web_graphics_context->createAndConsumeTextureCHROMIUM(
+ mailbox_holder.texture_target, mailbox_holder.mailbox.name);
// Application itself needs to take care of setting the right flip_y
// value down to get the expected result.
@@ -1765,7 +1766,7 @@
void WebMediaPlayerAndroid::OnKeyError(const std::string& session_id,
media::MediaKeys::KeyError error_code,
- uint32 system_code) {
+ uint32_t system_code) {
EmeUMAHistogramEnumeration(current_key_system_, "KeyError",
error_code, media::MediaKeys::kMaxKeyError);
@@ -1786,7 +1787,7 @@
}
void WebMediaPlayerAndroid::OnKeyMessage(const std::string& session_id,
- const std::vector<uint8>& message,
+ const std::vector<uint8_t>& message,
const GURL& destination_url) {
DCHECK(destination_url.is_empty() || destination_url.is_valid());
@@ -1803,7 +1804,7 @@
void WebMediaPlayerAndroid::OnEncryptedMediaInitData(
media::EmeInitDataType init_data_type,
- const std::vector<uint8>& init_data) {
+ const std::vector<uint8_t>& init_data) {
DCHECK(main_thread_checker_.CalledOnValidThread());
// Do not fire NeedKey event if encrypted media is not enabled.
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 5b41f2c8..51ba4af 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -253,15 +255,15 @@
void OnKeyAdded(const std::string& session_id);
void OnKeyError(const std::string& session_id,
media::MediaKeys::KeyError error_code,
- uint32 system_code);
+ uint32_t system_code);
void OnKeyMessage(const std::string& session_id,
- const std::vector<uint8>& message,
+ const std::vector<uint8_t>& message,
const GURL& destination_url);
void OnMediaSourceOpened(blink::WebMediaSource* web_media_source);
void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type,
- const std::vector<uint8>& init_data);
+ const std::vector<uint8_t>& init_data);
// Called when a decoder detects that the key needed to decrypt the stream
// is not available.
diff --git a/content/renderer/media/audio_decoder.cc b/content/renderer/media/audio_decoder.cc
index b839744c..d6978fe5 100644
--- a/content/renderer/media/audio_decoder.cc
+++ b/content/renderer/media/audio_decoder.cc
@@ -4,9 +4,10 @@
#include "content/renderer/media/audio_decoder.h"
+#include <stdint.h>
+
#include <vector>
-#include "base/basictypes.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "media/base/audio_bus.h"
@@ -33,7 +34,7 @@
#if !defined(MEDIA_DISABLE_FFMPEG)
// Uses the FFmpeg library for audio file reading.
- InMemoryUrlProtocol url_protocol(reinterpret_cast<const uint8*>(data),
+ InMemoryUrlProtocol url_protocol(reinterpret_cast<const uint8_t*>(data),
data_size, false);
AudioFileReader reader(&url_protocol);
diff --git a/content/renderer/media/audio_decoder.h b/content/renderer/media/audio_decoder.h
index 454a80a1..aebe89fd 100644
--- a/content/renderer/media/audio_decoder.h
+++ b/content/renderer/media/audio_decoder.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_AUDIO_DECODER_H_
#define CONTENT_RENDERER_MEDIA_AUDIO_DECODER_H_
-#include "base/basictypes.h"
+#include <stddef.h>
namespace blink { class WebAudioBus; }
diff --git a/content/renderer/media/audio_device_factory.h b/content/renderer/media/audio_device_factory.h
index e3f26310..1d6a53ad 100644
--- a/content/renderer/media/audio_device_factory.h
+++ b/content/renderer/media/audio_device_factory.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc
index 9c40772..09a4174 100644
--- a/content/renderer/media/audio_input_message_filter.cc
+++ b/content/renderer/media/audio_input_message_filter.cc
@@ -39,7 +39,7 @@
int session_id,
const media::AudioParameters& params,
bool automatic_gain_control,
- uint32 total_segments) override;
+ uint32_t total_segments) override;
void RecordStream() override;
void SetVolume(double volume) override;
void CloseStream() override;
@@ -126,8 +126,8 @@
int stream_id,
base::SharedMemoryHandle handle,
base::SyncSocket::TransitDescriptor socket_descriptor,
- uint32 length,
- uint32 total_segments) {
+ uint32_t length,
+ uint32_t total_segments) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
LogMessage(stream_id, "OnStreamCreated");
@@ -190,7 +190,7 @@
int session_id,
const media::AudioParameters& params,
bool automatic_gain_control,
- uint32 total_segments) {
+ uint32_t total_segments) {
DCHECK(filter_->io_task_runner_->BelongsToCurrentThread());
DCHECK(delegate);
diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h
index c4fd183..30a8d239 100644
--- a/content/renderer/media/audio_input_message_filter.h
+++ b/content/renderer/media/audio_input_message_filter.h
@@ -5,10 +5,14 @@
#ifndef CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
+#include <stdint.h>
+
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
+#include "build/build_config.h"
#include "content/common/content_export.h"
#include "ipc/message_filter.h"
#include "media/audio/audio_input_ipc.h"
@@ -66,8 +70,8 @@
#else
base::FileDescriptor socket_descriptor,
#endif
- uint32 length,
- uint32 total_segments);
+ uint32_t length,
+ uint32_t total_segments);
// Notification of volume property of an audio input stream.
void OnStreamVolume(int stream_id, double volume);
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index b3e4b2e..7ecf9b16 100644
--- a/content/renderer/media/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -200,7 +200,7 @@
int stream_id,
base::SharedMemoryHandle handle,
base::SyncSocket::TransitDescriptor socket_descriptor,
- uint32 length) {
+ uint32_t length) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
WebRtcLogMessage(base::StringPrintf(
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index 93ffc16..dcdc7cd 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_
+#include <stdint.h>
+
#include "base/gtest_prod_util.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
@@ -73,9 +76,10 @@
const media::AudioParameters& output_params);
// Received when browser process has created an audio output stream.
- void OnStreamCreated(int stream_id, base::SharedMemoryHandle handle,
+ void OnStreamCreated(int stream_id,
+ base::SharedMemoryHandle handle,
base::SyncSocket::TransitDescriptor socket_descriptor,
- uint32 length);
+ uint32_t length);
// Received when internal state of browser process' audio output device has
// changed.
diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc
index c82943e..46302a4 100644
--- a/content/renderer/media/audio_message_filter_unittest.cc
+++ b/content/renderer/media/audio_message_filter_unittest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include <string>
+#include "base/macros.h"
#include "content/common/media/audio_messages.h"
#include "content/renderer/media/audio_message_filter.h"
#include "media/audio/audio_output_ipc.h"
@@ -68,7 +71,7 @@
bool created_received() { return created_received_; }
base::SharedMemoryHandle handle() { return handle_; }
- uint32 length() { return length_; }
+ uint32_t length() { return length_; }
private:
bool state_changed_received_;
@@ -125,7 +128,7 @@
// AudioMsg_NotifyStreamCreated
base::SyncSocket::TransitDescriptor socket_descriptor;
- const uint32 kLength = 1024;
+ const uint32_t kLength = 1024;
EXPECT_FALSE(delegate.created_received());
filter->OnMessageReceived(AudioMsg_NotifyStreamCreated(
kStreamId, base::SharedMemory::NULLHandle(), socket_descriptor, kLength));
diff --git a/content/renderer/media/audio_renderer_mixer_manager.cc b/content/renderer/media/audio_renderer_mixer_manager.cc
index 73d984a..95ca916 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "build/build_config.h"
#include "content/renderer/media/audio_device_factory.h"
#include "media/audio/audio_output_device.h"
#include "media/base/audio_hardware_config.h"
diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h
index 9256013..fa8f9620 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.h
+++ b/content/renderer/media/audio_renderer_mixer_manager.h
@@ -9,6 +9,7 @@
#include <string>
#include <utility>
+#include "base/macros.h"
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
#include "media/audio/audio_parameters.h"
diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
index bfc0f9f..b1371b22 100644
--- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/media/audio_renderer_mixer_manager.h"
diff --git a/content/renderer/media/audio_repetition_detector.h b/content/renderer/media/audio_repetition_detector.h
index 03d7eae..ce61dca 100644
--- a/content/renderer/media/audio_repetition_detector.h
+++ b/content/renderer/media/audio_repetition_detector.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_AUDIO_REPETITION_DETECTOR_H_
#define CONTENT_RENDERER_MEDIA_AUDIO_REPETITION_DETECTOR_H_
+#include <stddef.h>
+
#include <vector>
#include "base/callback.h"
diff --git a/content/renderer/media/audio_repetition_detector_unittest.cc b/content/renderer/media/audio_repetition_detector_unittest.cc
index b9b9a54..487a7a0 100644
--- a/content/renderer/media/audio_repetition_detector_unittest.cc
+++ b/content/renderer/media/audio_repetition_detector_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include <map>
#include "base/bind.h"
diff --git a/content/renderer/media/audio_track_recorder.cc b/content/renderer/media/audio_track_recorder.cc
index dc624ac..99e3b5b 100644
--- a/content/renderer/media/audio_track_recorder.cc
+++ b/content/renderer/media/audio_track_recorder.cc
@@ -4,7 +4,10 @@
#include "content/renderer/media/audio_track_recorder.h"
+#include <stdint.h>
+
#include "base/bind.h"
+#include "base/macros.h"
#include "base/stl_util.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
@@ -230,7 +233,7 @@
out->resize(OPUS_MAX_PAYLOAD_SIZE);
const opus_int32 result = opus_encode_float(
opus_encoder_, buffer_.get(), frames_per_buffer_,
- reinterpret_cast<uint8*>(string_as_array(out)), OPUS_MAX_PAYLOAD_SIZE);
+ reinterpret_cast<uint8_t*>(string_as_array(out)), OPUS_MAX_PAYLOAD_SIZE);
if (result > 1) {
// TODO(ajose): Investigate improving this. http://crbug.com/547918
out->resize(result);
diff --git a/content/renderer/media/audio_track_recorder_unittest.cc b/content/renderer/media/audio_track_recorder_unittest.cc
index f000ea1..c28e008 100644
--- a/content/renderer/media/audio_track_recorder_unittest.cc
+++ b/content/renderer/media/audio_track_recorder_unittest.cc
@@ -4,6 +4,9 @@
#include "content/renderer/media/audio_track_recorder.h"
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -160,7 +163,7 @@
1000,
opus_decode_float(
opus_decoder_,
- reinterpret_cast<uint8*>(string_as_array(encoded_data.get())),
+ reinterpret_cast<uint8_t*>(string_as_array(encoded_data.get())),
encoded_data->size(), buffer_.get(), max_frames_per_buffer_, 0));
DoOnEncodedAudio(params, *encoded_data, timestamp);
diff --git a/content/renderer/media/canvas_capture_handler.cc b/content/renderer/media/canvas_capture_handler.cc
index 7e1e8e7..0f48508 100644
--- a/content/renderer/media/canvas_capture_handler.cc
+++ b/content/renderer/media/canvas_capture_handler.cc
@@ -6,6 +6,7 @@
#include "base/base64.h"
#include "base/bind_helpers.h"
+#include "base/macros.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/renderer/render_thread.h"
diff --git a/content/renderer/media/canvas_capture_handler.h b/content/renderer/media/canvas_capture_handler.h
index b2a5cc2e..adec2624 100644
--- a/content/renderer/media/canvas_capture_handler.h
+++ b/content/renderer/media/canvas_capture_handler.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_
#define CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -73,7 +76,7 @@
const blink::WebSize size_;
gfx::Size last_size;
- std::vector<uint8> temp_data_;
+ std::vector<uint8_t> temp_data_;
size_t row_bytes_;
SkImageInfo image_info_;
media::VideoFramePool frame_pool_;
diff --git a/content/renderer/media/cdm/ppapi_decryptor.h b/content/renderer/media/cdm/ppapi_decryptor.h
index 29a7a35..7aff248 100644
--- a/content/renderer/media/cdm/ppapi_decryptor.h
+++ b/content/renderer/media/cdm/ppapi_decryptor.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_
#define CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
diff --git a/content/renderer/media/cdm/proxy_media_keys.cc b/content/renderer/media/cdm/proxy_media_keys.cc
index 3e4a4bd6..d628c35 100644
--- a/content/renderer/media/cdm/proxy_media_keys.cc
+++ b/content/renderer/media/cdm/proxy_media_keys.cc
@@ -6,7 +6,6 @@
#include <vector>
-#include "base/basictypes.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "content/renderer/media/cdm/renderer_cdm_manager.h"
diff --git a/content/renderer/media/cdm/proxy_media_keys.h b/content/renderer/media/cdm/proxy_media_keys.h
index 7bfabe4..e809244 100644
--- a/content/renderer/media/cdm/proxy_media_keys.h
+++ b/content/renderer/media/cdm/proxy_media_keys.h
@@ -5,13 +5,15 @@
#ifndef CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_
#define CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
#include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
#include "media/base/cdm_context.h"
#include "media/base/cdm_factory.h"
#include "media/base/cdm_promise.h"
diff --git a/content/renderer/media/cdm/renderer_cdm_manager.cc b/content/renderer/media/cdm/renderer_cdm_manager.cc
index f2f90d5..7c1a866 100644
--- a/content/renderer/media/cdm/renderer_cdm_manager.cc
+++ b/content/renderer/media/cdm/renderer_cdm_manager.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/cdm/renderer_cdm_manager.h"
+#include <stddef.h>
+
#include "base/stl_util.h"
#include "content/common/media/cdm_messages.h"
#include "content/renderer/media/cdm/proxy_media_keys.h"
@@ -130,7 +132,7 @@
int cdm_id,
const std::string& session_id,
media::MediaKeys::MessageType message_type,
- const std::vector<uint8>& message,
+ const std::vector<uint8_t>& message,
const GURL& legacy_destination_url) {
if (message.size() > kMaxSessionMessageLength) {
NOTREACHED();
@@ -155,7 +157,7 @@
int cdm_id,
const std::string& session_id,
MediaKeys::Exception exception,
- uint32 system_code,
+ uint32_t system_code,
const std::string& error_message) {
ProxyMediaKeys* media_keys = GetMediaKeys(cdm_id);
if (media_keys)
diff --git a/content/renderer/media/cdm/renderer_cdm_manager.h b/content/renderer/media/cdm/renderer_cdm_manager.h
index af2772f..e25ce55 100644
--- a/content/renderer/media/cdm/renderer_cdm_manager.h
+++ b/content/renderer/media/cdm/renderer_cdm_manager.h
@@ -5,11 +5,13 @@
#ifndef CONTENT_RENDERER_MEDIA_CDM_RENDERER_CDM_MANAGER_H_
#define CONTENT_RENDERER_MEDIA_CDM_RENDERER_CDM_MANAGER_H_
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/common/media/cdm_messages_enums.h"
#include "content/public/renderer/render_frame_observer.h"
#include "media/base/media_keys.h"
@@ -42,13 +44,13 @@
bool use_hw_secure_codecs);
void SetServerCertificate(int cdm_id,
uint32_t promise_id,
- const std::vector<uint8>& certificate);
+ const std::vector<uint8_t>& certificate);
void CreateSessionAndGenerateRequest(
int cdm_id,
uint32_t promise_id,
media::MediaKeys::SessionType session_type,
CdmHostMsg_CreateSession_InitDataType init_data_type,
- const std::vector<uint8>& init_data);
+ const std::vector<uint8_t>& init_data);
void LoadSession(int cdm_id,
uint32_t promise_id,
media::MediaKeys::SessionType session_type,
@@ -56,7 +58,7 @@
void UpdateSession(int cdm_id,
uint32_t promise_id,
const std::string& session_id,
- const std::vector<uint8>& response);
+ const std::vector<uint8_t>& response);
void CloseSession(int cdm_id,
uint32_t promise_id,
const std::string& session_id);
@@ -79,13 +81,13 @@
void OnSessionMessage(int cdm_id,
const std::string& session_id,
media::MediaKeys::MessageType message_type,
- const std::vector<uint8>& message,
+ const std::vector<uint8_t>& message,
const GURL& legacy_destination_url);
void OnSessionClosed(int cdm_id, const std::string& session_id);
void OnLegacySessionError(int cdm_id,
const std::string& session_id,
media::MediaKeys::Exception exception,
- uint32 system_code,
+ uint32_t system_code,
const std::string& error_message);
void OnSessionKeysChange(
int cdm_id,
@@ -107,7 +109,7 @@
const std::string& error_message);
// CDM ID should be unique per renderer frame.
- // TODO(xhwang): Use uint32 to prevent undefined overflow behavior.
+ // TODO(xhwang): Use uint32_t to prevent undefined overflow behavior.
int next_cdm_id_;
// CDM ID to ProxyMediaKeys mapping.
diff --git a/content/renderer/media/media_permission_dispatcher.h b/content/renderer/media/media_permission_dispatcher.h
index 701afe6..7bed6fc 100644
--- a/content/renderer/media/media_permission_dispatcher.h
+++ b/content/renderer/media/media_permission_dispatcher.h
@@ -10,8 +10,11 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_
+#include <stdint.h>
+
#include <map>
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/media_permission_dispatcher_impl.h b/content/renderer/media/media_permission_dispatcher_impl.h
index 5bb1128b..8aebc89 100644
--- a/content/renderer/media/media_permission_dispatcher_impl.h
+++ b/content/renderer/media/media_permission_dispatcher_impl.h
@@ -11,8 +11,11 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_IMPL_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_IMPL_H_
+#include <stdint.h>
+
#include <map>
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/media_permission_dispatcher_proxy.cc b/content/renderer/media/media_permission_dispatcher_proxy.cc
index 693e5f0..e883ac9 100644
--- a/content/renderer/media/media_permission_dispatcher_proxy.cc
+++ b/content/renderer/media/media_permission_dispatcher_proxy.cc
@@ -4,9 +4,12 @@
#include "content/renderer/media/media_permission_dispatcher_proxy.h"
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/thread_task_runner_handle.h"
#include "url/gurl.h"
diff --git a/content/renderer/media/media_permission_dispatcher_proxy.h b/content/renderer/media/media_permission_dispatcher_proxy.h
index bf6babc..aa931e80 100644
--- a/content/renderer/media/media_permission_dispatcher_proxy.h
+++ b/content/renderer/media/media_permission_dispatcher_proxy.h
@@ -9,6 +9,7 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_PROXY_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_PROXY_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/media_recorder_handler.cc b/content/renderer/media/media_recorder_handler.cc
index 8130693..7fc40dc 100644
--- a/content/renderer/media/media_recorder_handler.cc
+++ b/content/renderer/media/media_recorder_handler.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "content/renderer/media/audio_track_recorder.h"
diff --git a/content/renderer/media/media_recorder_handler.h b/content/renderer/media/media_recorder_handler.h
index 453923b..cc50c84 100644
--- a/content/renderer/media/media_recorder_handler.h
+++ b/content/renderer/media/media_recorder_handler.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece.h"
diff --git a/content/renderer/media/media_recorder_handler_unittest.cc b/content/renderer/media/media_recorder_handler_unittest.cc
index 44d1296..e1aaeab2 100644
--- a/content/renderer/media/media_recorder_handler_unittest.cc
+++ b/content/renderer/media/media_recorder_handler_unittest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
+#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "content/child/child_process.h"
diff --git a/content/renderer/media/media_stream.h b/content/renderer/media/media_stream.h
index 538fd6c..c702366 100644
--- a/content/renderer/media/media_stream.h
+++ b/content/renderer/media/media_stream.h
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc
index 5e4c1c0..40889700 100644
--- a/content/renderer/media/media_stream_audio_processor.cc
+++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -4,11 +4,15 @@
#include "content/renderer/media/media_stream_audio_processor.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/command_line.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
#include "content/public/common/content_switches.h"
#include "content/renderer/media/media_stream_audio_processor_options.h"
#include "content/renderer/media/rtc_media_constraints.h"
@@ -705,7 +709,7 @@
base::subtle::Atomic32 render_delay_ms =
base::subtle::Acquire_Load(&render_delay_ms_);
- int64 capture_delay_ms = capture_delay.InMilliseconds();
+ int64_t capture_delay_ms = capture_delay.InMilliseconds();
DCHECK_LT(capture_delay_ms,
std::numeric_limits<base::subtle::Atomic32>::max());
int total_delay_ms = capture_delay_ms + render_delay_ms;
diff --git a/content/renderer/media/media_stream_audio_processor.h b/content/renderer/media/media_stream_audio_processor.h
index f5d5781..dabc42f 100644
--- a/content/renderer/media/media_stream_audio_processor.h
+++ b/content/renderer/media/media_stream_audio_processor.h
@@ -8,6 +8,7 @@
#include "base/atomicops.h"
#include "base/files/file.h"
#include "base/gtest_prod_util.h"
+#include "base/macros.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
diff --git a/content/renderer/media/media_stream_audio_processor_options.cc b/content/renderer/media/media_stream_audio_processor_options.cc
index 778676e..379f4ca 100644
--- a/content/renderer/media/media_stream_audio_processor_options.cc
+++ b/content/renderer/media/media_stream_audio_processor_options.cc
@@ -4,15 +4,19 @@
#include "content/renderer/media/media_stream_audio_processor_options.h"
+#include <stddef.h>
+
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "content/common/media/media_stream_options.h"
#include "content/renderer/media/media_stream_constraints_util.h"
#include "content/renderer/media/media_stream_source.h"
diff --git a/content/renderer/media/media_stream_audio_processor_options.h b/content/renderer/media/media_stream_audio_processor_options.h
index cf98b34..6a2048a 100644
--- a/content/renderer/media/media_stream_audio_processor_options.h
+++ b/content/renderer/media/media_stream_audio_processor_options.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/files/file.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/public/common/media_stream_request.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
diff --git a/content/renderer/media/media_stream_audio_processor_unittest.cc b/content/renderer/media/media_stream_audio_processor_unittest.cc
index 6008601..a23d03e 100644
--- a/content/renderer/media/media_stream_audio_processor_unittest.cc
+++ b/content/renderer/media/media_stream_audio_processor_unittest.cc
@@ -2,14 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/aligned_memory.h"
#include "base/path_service.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "content/public/common/media_stream_request.h"
#include "content/renderer/media/media_stream_audio_processor.h"
#include "content/renderer/media/media_stream_audio_processor_options.h"
@@ -60,7 +65,7 @@
.Append(FILE_PATH_LITERAL("data"))
.Append(FILE_PATH_LITERAL("speech_16b_stereo_48kHz.raw"));
DCHECK(base::PathExists(file));
- int64 data_file_size64 = 0;
+ int64_t data_file_size64 = 0;
DCHECK(base::GetFileSize(file, &data_file_size64));
EXPECT_EQ(length, base::ReadFile(file, data, length));
DCHECK(data_file_size64 > length);
@@ -88,7 +93,8 @@
const size_t length = packet_size * kNumberOfPacketsForTest;
scoped_ptr<char[]> capture_data(new char[length]);
ReadDataFromSpeechFile(capture_data.get(), length);
- const int16* data_ptr = reinterpret_cast<const int16*>(capture_data.get());
+ const int16_t* data_ptr =
+ reinterpret_cast<const int16_t*>(capture_data.get());
scoped_ptr<media::AudioBus> data_bus = media::AudioBus::Create(
params.channels(), params.frames_per_buffer());
diff --git a/content/renderer/media/media_stream_audio_sink_owner.h b/content/renderer/media/media_stream_audio_sink_owner.h
index f9fddf28..1cc98b9 100644
--- a/content/renderer/media/media_stream_audio_sink_owner.h
+++ b/content/renderer/media/media_stream_audio_sink_owner.h
@@ -7,6 +7,7 @@
#include <vector>
+#include "base/macros.h"
#include "base/synchronization/lock.h"
#include "content/renderer/media/media_stream_audio_track_sink.h"
diff --git a/content/renderer/media/media_stream_audio_source.h b/content/renderer/media/media_stream_audio_source.h
index 7825226..e332b83e 100644
--- a/content/renderer/media/media_stream_audio_source.h
+++ b/content/renderer/media/media_stream_audio_source.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/renderer/media/media_stream_source.h"
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
diff --git a/content/renderer/media/media_stream_audio_track.h b/content/renderer/media/media_stream_audio_track.h
index 087c9d70..2175b4e 100644
--- a/content/renderer/media/media_stream_audio_track.h
+++ b/content/renderer/media/media_stream_audio_track.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_
+#include "base/macros.h"
#include "content/renderer/media/media_stream_track.h"
namespace webrtc {
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
index 68e24992..ad7f8ddf 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/media_stream_center.h"
+#include <stddef.h>
+
#include <string>
#include "base/command_line.h"
diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h
index d3627557..2b1253b 100644
--- a/content/renderer/media/media_stream_center.h
+++ b/content/renderer/media/media_stream_center.h
@@ -7,8 +7,8 @@
#include <map>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/common/media/media_stream_options.h"
#include "content/public/renderer/render_process_observer.h"
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index 86f508f..274c80a 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/media_stream_dispatcher.h"
+#include <stddef.h>
+
#include "base/logging.h"
#include "content/common/media/media_stream_messages.h"
#include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
index d451ccc..153746081 100644
--- a/content/renderer/media/media_stream_dispatcher.h
+++ b/content/renderer/media/media_stream_dispatcher.h
@@ -9,8 +9,8 @@
#include <map>
#include <string>
-#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc
index d4dbec6..bc82587 100644
--- a/content/renderer/media/media_stream_dispatcher_unittest.cc
+++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include <string>
#include "base/memory/ref_counted.h"
diff --git a/content/renderer/media/media_stream_renderer_factory_impl.h b/content/renderer/media/media_stream_renderer_factory_impl.h
index a346227..75f15b18 100644
--- a/content/renderer/media/media_stream_renderer_factory_impl.h
+++ b/content/renderer/media/media_stream_renderer_factory_impl.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_
+#include "base/macros.h"
#include "content/public/renderer/media_stream_renderer_factory.h"
namespace content {
diff --git a/content/renderer/media/media_stream_source.h b/content/renderer/media/media_stream_source.h
index 5884a03..940efcc 100644
--- a/content/renderer/media/media_stream_source.h
+++ b/content/renderer/media/media_stream_source.h
@@ -8,6 +8,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/common/media/media_stream_options.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
diff --git a/content/renderer/media/media_stream_track.h b/content/renderer/media/media_stream_track.h
index 9499511..d898e1b 100644
--- a/content/renderer/media/media_stream_track.h
+++ b/content/renderer/media/media_stream_track.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "media/audio/audio_parameters.h"
diff --git a/content/renderer/media/media_stream_video_capturer_source.cc b/content/renderer/media/media_stream_video_capturer_source.cc
index d5e7f40..ca80b63 100644
--- a/content/renderer/media/media_stream_video_capturer_source.cc
+++ b/content/renderer/media/media_stream_video_capturer_source.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/common/media_stream_request.h"
#include "content/renderer/media/media_stream_constraints_util.h"
diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h
index 699c486..a2f48916 100644
--- a/content/renderer/media/media_stream_video_capturer_source.h
+++ b/content/renderer/media/media_stream_video_capturer_source.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/common/media/video_capture.h"
diff --git a/content/renderer/media/media_stream_video_renderer_sink.h b/content/renderer/media/media_stream_video_renderer_sink.h
index c0ec1ff5..ad3c9eb 100644
--- a/content/renderer/media/media_stream_video_renderer_sink.h
+++ b/content/renderer/media/media_stream_video_renderer_sink.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
#include "content/common/media/video_capture.h"
diff --git a/content/renderer/media/media_stream_video_renderer_sink_unittest.cc b/content/renderer/media/media_stream_video_renderer_sink_unittest.cc
index d04c141..9b3b35a 100644
--- a/content/renderer/media/media_stream_video_renderer_sink_unittest.cc
+++ b/content/renderer/media/media_stream_video_renderer_sink_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "content/child/child_process.h"
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index 1274ecf7..38f19b0 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -9,6 +9,7 @@
#include <string>
#include "base/logging.h"
+#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"
#include "content/child/child_process.h"
diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h
index 50b4c84..cd403750 100644
--- a/content/renderer/media/media_stream_video_source.h
+++ b/content/renderer/media/media_stream_video_source.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/non_thread_safe.h"
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc
index 15eeb83..bbb88f3 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h
index 353ed2af..bfcf419 100644
--- a/content/renderer/media/media_stream_video_track.h
+++ b/content/renderer/media/media_stream_video_track.h
@@ -9,6 +9,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
+#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "content/public/renderer/media_stream_video_sink.h"
diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc
index 0e9e0d14..9959efeb 100644
--- a/content/renderer/media/media_stream_video_track_unittest.cc
+++ b/content/renderer/media/media_stream_video_track_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
@@ -19,8 +21,8 @@
namespace content {
-const uint8 kBlackValue = 0x00;
-const uint8 kColorValue = 0xAB;
+const uint8_t kBlackValue = 0x00;
+const uint8_t kColorValue = 0xAB;
ACTION_P(RunClosure, closure) {
closure.Run();
diff --git a/content/renderer/media/midi_dispatcher.h b/content/renderer/media/midi_dispatcher.h
index 582e0931..ab85d770 100644
--- a/content/renderer/media/midi_dispatcher.h
+++ b/content/renderer/media/midi_dispatcher.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_MIDI_DISPATCHER_H_
#include "base/id_map.h"
+#include "base/macros.h"
#include "content/common/permission_service.mojom.h"
#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/web/WebMIDIClient.h"
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc
index 82bdc70..7bc0a54 100644
--- a/content/renderer/media/midi_message_filter.cc
+++ b/content/renderer/media/midi_message_filter.cc
@@ -65,8 +65,8 @@
}
}
-void MidiMessageFilter::SendMidiData(uint32 port,
- const uint8* data,
+void MidiMessageFilter::SendMidiData(uint32_t port,
+ const uint8_t* data,
size_t length,
double timestamp) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -77,7 +77,7 @@
}
unacknowledged_bytes_sent_ += length;
- std::vector<uint8> v(data, data + length);
+ std::vector<uint8_t> v(data, data + length);
io_task_runner_->PostTask(
FROM_HERE, base::Bind(&MidiMessageFilter::SendMidiDataOnIOThread, this,
port, v, timestamp));
@@ -89,8 +89,8 @@
Send(new MidiHostMsg_StartSession());
}
-void MidiMessageFilter::SendMidiDataOnIOThread(uint32 port,
- const std::vector<uint8>& data,
+void MidiMessageFilter::SendMidiDataOnIOThread(uint32_t port,
+ const std::vector<uint8_t>& data,
double timestamp) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
Send(new MidiHostMsg_SendData(port, data, timestamp));
@@ -166,7 +166,7 @@
base::Bind(&MidiMessageFilter::HandleAddOutputPort, this, info));
}
-void MidiMessageFilter::OnSetInputPortState(uint32 port,
+void MidiMessageFilter::OnSetInputPortState(uint32_t port,
media::midi::MidiPortState state) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
main_task_runner_->PostTask(
@@ -174,7 +174,7 @@
port, state));
}
-void MidiMessageFilter::OnSetOutputPortState(uint32 port,
+void MidiMessageFilter::OnSetOutputPortState(uint32_t port,
media::midi::MidiPortState state) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
main_task_runner_->PostTask(
@@ -182,8 +182,8 @@
port, state));
}
-void MidiMessageFilter::OnDataReceived(uint32 port,
- const std::vector<uint8>& data,
+void MidiMessageFilter::OnDataReceived(uint32_t port,
+ const std::vector<uint8_t>& data,
double timestamp) {
TRACE_EVENT0("midi", "MidiMessageFilter::OnDataReceived");
DCHECK(io_task_runner_->BelongsToCurrentThread());
@@ -282,8 +282,8 @@
client->didAddOutputPort(id, manufacturer, name, version, state);
}
-void MidiMessageFilter::HandleDataReceived(uint32 port,
- const std::vector<uint8>& data,
+void MidiMessageFilter::HandleDataReceived(uint32_t port,
+ const std::vector<uint8_t>& data,
double timestamp) {
TRACE_EVENT0("midi", "MidiMessageFilter::HandleDataReceived");
DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -301,7 +301,7 @@
}
void MidiMessageFilter::HandleSetInputPortState(
- uint32 port,
+ uint32_t port,
media::midi::MidiPortState state) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
inputs_[port].state = state;
@@ -310,7 +310,7 @@
}
void MidiMessageFilter::HandleSetOutputPortState(
- uint32 port,
+ uint32_t port,
media::midi::MidiPortState state) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
outputs_[port].state = state;
diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h
index 77cbb73..bf818ad 100644
--- a/content/renderer/media/midi_message_filter.h
+++ b/content/renderer/media/midi_message_filter.h
@@ -5,9 +5,13 @@
#ifndef CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <set>
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "ipc/message_filter.h"
@@ -34,8 +38,8 @@
// A client will only be able to call this method if it has a suitable
// output port (from addOutputPort()).
- void SendMidiData(uint32 port,
- const uint8* data,
+ void SendMidiData(uint32_t port,
+ const uint8_t* data,
size_t length,
double timestamp);
@@ -58,8 +62,8 @@
private:
void StartSessionOnIOThread();
- void SendMidiDataOnIOThread(uint32 port,
- const std::vector<uint8>& data,
+ void SendMidiDataOnIOThread(uint32_t port,
+ const std::vector<uint8_t>& data,
double timestamp);
void EndSessionOnIOThread();
@@ -88,13 +92,13 @@
// These functions are called to notify the recipient that a device that is
// notified via OnAddInputPort() or OnAddOutputPort() gets disconnected, or
// connected again.
- void OnSetInputPortState(uint32 port, media::midi::MidiPortState state);
- void OnSetOutputPortState(uint32 port, media::midi::MidiPortState state);
+ void OnSetInputPortState(uint32_t port, media::midi::MidiPortState state);
+ void OnSetOutputPortState(uint32_t port, media::midi::MidiPortState state);
// Called when the browser process has sent MIDI data containing one or
// more messages.
- void OnDataReceived(uint32 port,
- const std::vector<uint8>& data,
+ void OnDataReceived(uint32_t port,
+ const std::vector<uint8_t>& data,
double timestamp);
// From time-to-time, the browser incrementally informs us of how many bytes
@@ -107,11 +111,12 @@
void HandleAddInputPort(media::midi::MidiPortInfo info);
void HandleAddOutputPort(media::midi::MidiPortInfo info);
- void HandleSetInputPortState(uint32 port, media::midi::MidiPortState state);
- void HandleSetOutputPortState(uint32 port, media::midi::MidiPortState state);
+ void HandleSetInputPortState(uint32_t port, media::midi::MidiPortState state);
+ void HandleSetOutputPortState(uint32_t port,
+ media::midi::MidiPortState state);
- void HandleDataReceived(uint32 port,
- const std::vector<uint8>& data,
+ void HandleDataReceived(uint32_t port,
+ const std::vector<uint8_t>& data,
double timestamp);
void HandleAckknowledgeSentData(size_t bytes_sent);
diff --git a/content/renderer/media/mock_data_channel_impl.h b/content/renderer/media/mock_data_channel_impl.h
index 919f4c2c..9b82669 100644
--- a/content/renderer/media/mock_data_channel_impl.h
+++ b/content/renderer/media/mock_data_channel_impl.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_
#define CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_
+#include <stdint.h>
+
#include <string>
#include "base/macros.h"
diff --git a/content/renderer/media/mock_media_constraint_factory.cc b/content/renderer/media/mock_media_constraint_factory.cc
index ad70b9c..1bed3456 100644
--- a/content/renderer/media/mock_media_constraint_factory.cc
+++ b/content/renderer/media/mock_media_constraint_factory.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
+#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/media_stream_audio_processor_options.h"
diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h
index ffe9fb0d..f211ed2 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.h
+++ b/content/renderer/media/mock_media_stream_dispatcher.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "content/renderer/media/media_stream_dispatcher.h"
#include "url/gurl.h"
diff --git a/content/renderer/media/mock_media_stream_video_source.h b/content/renderer/media/mock_media_stream_video_source.h
index f9126014..e5e4d7e 100644
--- a/content/renderer/media/mock_media_stream_video_source.h
+++ b/content/renderer/media/mock_media_stream_video_source.h
@@ -7,6 +7,7 @@
#include "content/renderer/media/media_stream_video_source.h"
+#include "base/macros.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace content {
diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc
index 4be2d77..cc8f0bb 100644
--- a/content/renderer/media/mock_peer_connection_impl.cc
+++ b/content/renderer/media/mock_peer_connection_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/mock_peer_connection_impl.h"
+#include <stddef.h>
+
#include <vector>
#include "base/logging.h"
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index 2787b99..dae0b9c 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -7,9 +7,9 @@
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
index 31b5a02..064665a 100644
--- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
+++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
#include "third_party/WebKit/public/platform/WebRTCICECandidate.h"
diff --git a/content/renderer/media/peer_connection_identity_store.h b/content/renderer/media/peer_connection_identity_store.h
index b920beef..82afbdc3 100644
--- a/content/renderer/media/peer_connection_identity_store.h
+++ b/content/renderer/media/peer_connection_identity_store.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_STORE_H_
#define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_STORE_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
#include "third_party/libjingle/source/talk/app/webrtc/dtlsidentitystore.h"
diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
index af77250..63d6f56 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -3,6 +3,9 @@
// found in the LICENSE file.
#include "content/renderer/media/peer_connection_tracker.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
@@ -270,7 +273,8 @@
case StatsReport::Value::kBool:
values->AppendBoolean(value->bool_val());
break;
- case StatsReport::Value::kInt64: // int64 isn't supported, so use string.
+ case StatsReport::Value::kInt64: // int64_t isn't supported, so use
+ // string.
case StatsReport::Value::kId:
default:
values->AppendString(value->ToString());
diff --git a/content/renderer/media/peer_connection_tracker.h b/content/renderer/media/peer_connection_tracker.h
index 2e12a15c..63c55145 100644
--- a/content/renderer/media/peer_connection_tracker.h
+++ b/content/renderer/media/peer_connection_tracker.h
@@ -8,6 +8,7 @@
#include <map>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/public/renderer/render_process_observer.h"
diff --git a/content/renderer/media/pepper_to_video_track_adapter.cc b/content/renderer/media/pepper_to_video_track_adapter.cc
index 5f40798..c9fa038 100644
--- a/content/renderer/media/pepper_to_video_track_adapter.cc
+++ b/content/renderer/media/pepper_to_video_track_adapter.cc
@@ -8,6 +8,7 @@
#include "base/base64.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/trace_event/trace_event.h"
@@ -40,7 +41,7 @@
// FrameWriterInterface implementation.
// This method will be called by the Pepper host from render thread.
- void PutFrame(PPB_ImageData_Impl* image_data, int64 time_stamp_ns) override;
+ void PutFrame(PPB_ImageData_Impl* image_data, int64_t time_stamp_ns) override;
protected:
// MediaStreamVideoSource implementation.
@@ -145,7 +146,7 @@
// Note: PutFrame must copy or process image_data directly in this function,
// because it may be overwritten as soon as we return from this function.
void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data,
- int64 time_stamp_ns) {
+ int64_t time_stamp_ns) {
DCHECK(CalledOnValidThread());
TRACE_EVENT0("video", "PpFrameWriter::PutFrame");
DVLOG(3) << "PpFrameWriter::PutFrame()";
@@ -167,7 +168,7 @@
return;
}
- const uint8* src_data = static_cast<uint8*>(bitmap->getPixels());
+ const uint8_t* src_data = static_cast<uint8_t*>(bitmap->getPixels());
const int src_stride = static_cast<int>(bitmap->rowBytes());
const int width = bitmap->width();
const int height = bitmap->height();
@@ -213,7 +214,8 @@
~PpFrameWriterProxy() override {}
- void PutFrame(PPB_ImageData_Impl* image_data, int64 time_stamp_ns) override {
+ void PutFrame(PPB_ImageData_Impl* image_data,
+ int64_t time_stamp_ns) override {
writer_->PutFrame(image_data, time_stamp_ns);
}
diff --git a/content/renderer/media/pepper_to_video_track_adapter.h b/content/renderer/media/pepper_to_video_track_adapter.h
index 46822186..2b9ea42 100644
--- a/content/renderer/media/pepper_to_video_track_adapter.h
+++ b/content/renderer/media/pepper_to_video_track_adapter.h
@@ -5,10 +5,13 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
@@ -24,7 +27,7 @@
// The ownership of the |image_data| doesn't transfer. So the implementation
// of this interface should make a copy of the |image_data| before return.
virtual void PutFrame(PPB_ImageData_Impl* image_data,
- int64 time_stamp_ns) = 0;
+ int64_t time_stamp_ns) = 0;
virtual ~FrameWriterInterface() {}
};
diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc
index 40aa0578..848d6bf 100644
--- a/content/renderer/media/remote_media_stream_impl.cc
+++ b/content/renderer/media/remote_media_stream_impl.cc
@@ -4,12 +4,15 @@
#include "content/renderer/media/remote_media_stream_impl.h"
+#include <stddef.h>
+
#include <string>
#include <vector>
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
#include "content/renderer/media/media_stream.h"
diff --git a/content/renderer/media/remote_media_stream_impl.h b/content/renderer/media/remote_media_stream_impl.h
index 703e4e65..91b92940 100644
--- a/content/renderer/media/remote_media_stream_impl.h
+++ b/content/renderer/media/remote_media_stream_impl.h
@@ -5,16 +5,16 @@
#ifndef CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
#define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
+#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
namespace content {
diff --git a/content/renderer/media/render_media_client.h b/content/renderer/media/render_media_client.h
index dbc1db4..01d5189b 100644
--- a/content/renderer/media/render_media_client.h
+++ b/content/renderer/media/render_media_client.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_
#include "base/lazy_instance.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/tick_clock.h"
diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h
index b5e41a56..bc48630 100644
--- a/content/renderer/media/render_media_log.h
+++ b/content/renderer/media/render_media_log.h
@@ -7,6 +7,7 @@
#include <vector>
+#include "base/macros.h"
#include "base/time/time.h"
#include "content/common/content_export.h"
#include "media/base/media_log.h"
diff --git a/content/renderer/media/render_media_log_unittest.cc b/content/renderer/media/render_media_log_unittest.cc
index fd192639..a6a58a4c 100644
--- a/content/renderer/media/render_media_log_unittest.cc
+++ b/content/renderer/media/render_media_log_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/macros.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/test/test_mock_time_task_runner.h"
#include "content/common/view_messages.h"
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
index 8c403c6c..c3a0cd1c4 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
@@ -106,11 +106,11 @@
}
bool RendererGpuVideoAcceleratorFactories::CreateTextures(
- int32 count,
+ int32_t count,
const gfx::Size& size,
- std::vector<uint32>* texture_ids,
+ std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
- uint32 texture_target) {
+ uint32_t texture_target) {
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(texture_target);
@@ -123,7 +123,7 @@
gles2->GenTextures(count, &texture_ids->at(0));
for (int i = 0; i < count; ++i) {
gles2->ActiveTexture(GL_TEXTURE0);
- uint32 texture_id = texture_ids->at(i);
+ uint32_t texture_id = texture_ids->at(i);
gles2->BindTexture(texture_target, texture_id);
gles2->TexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
gles2->TexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -154,7 +154,7 @@
return true;
}
-void RendererGpuVideoAcceleratorFactories::DeleteTexture(uint32 texture_id) {
+void RendererGpuVideoAcceleratorFactories::DeleteTexture(uint32_t texture_id) {
DCHECK(task_runner_->BelongsToCurrentThread());
if (CheckContextLost())
return;
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
index 5f68546..b9bdd14 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
#define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/waitable_event.h"
@@ -60,12 +63,12 @@
override;
// Creates textures and produces them into mailboxes. Returns true on success
// or false on failure.
- bool CreateTextures(int32 count,
+ bool CreateTextures(int32_t count,
const gfx::Size& size,
- std::vector<uint32>* texture_ids,
+ std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
- uint32 texture_target) override;
- void DeleteTexture(uint32 texture_id) override;
+ uint32_t texture_target) override;
+ void DeleteTexture(uint32_t texture_id) override;
void WaitSyncToken(const gpu::SyncToken& sync_token) override;
scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc
index a0dbd3e..a7e9408 100644
--- a/content/renderer/media/renderer_webaudiodevice_impl.cc
+++ b/content/renderer/media/renderer_webaudiodevice_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/renderer_webaudiodevice_impl.h"
+#include <stddef.h>
+
#include <string>
#include "base/command_line.h"
@@ -11,6 +13,7 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/render_frame_impl.h"
#include "media/audio/audio_output_device.h"
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h
index 9dd2954..e90c74bb 100644
--- a/content/renderer/media/renderer_webaudiodevice_impl.h
+++ b/content/renderer/media/renderer_webaudiodevice_impl.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_
#define CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_
+#include <stdint.h>
+
#include "base/cancelable_callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_parameters.h"
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc
index e811655e..081f774 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/renderer_webmediaplayer_delegate.h"
+#include <stdint.h>
+
#include "content/common/frame_messages.h"
#include "third_party/WebKit/public/platform/WebMediaPlayer.h"
@@ -18,13 +20,13 @@
void RendererWebMediaPlayerDelegate::DidPlay(blink::WebMediaPlayer* player) {
has_played_media_ = true;
Send(new FrameHostMsg_MediaPlayingNotification(
- routing_id(), reinterpret_cast<int64>(player), player->hasVideo(),
+ routing_id(), reinterpret_cast<int64_t>(player), player->hasVideo(),
player->hasAudio(), player->isRemote()));
}
void RendererWebMediaPlayerDelegate::DidPause(blink::WebMediaPlayer* player) {
Send(new FrameHostMsg_MediaPausedNotification(
- routing_id(), reinterpret_cast<int64>(player)));
+ routing_id(), reinterpret_cast<int64_t>(player)));
}
void RendererWebMediaPlayerDelegate::PlayerGone(blink::WebMediaPlayer* player) {
diff --git a/content/renderer/media/renderer_webmidiaccessor_impl.h b/content/renderer/media/renderer_webmidiaccessor_impl.h
index 2d4c3c04..07ea63d5 100644
--- a/content/renderer/media/renderer_webmidiaccessor_impl.h
+++ b/content/renderer/media/renderer_webmidiaccessor_impl.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_MEDIA_RENDERER_WEBMIDIACCESSOR_IMPL_H_
#define CONTENT_RENDERER_MEDIA_RENDERER_WEBMIDIACCESSOR_IMPL_H_
-#include "base/basictypes.h"
+#include <stddef.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "third_party/WebKit/public/platform/WebMIDIAccessor.h"
#include "third_party/WebKit/public/platform/WebMIDIAccessorClient.h"
diff --git a/content/renderer/media/rtc_certificate.h b/content/renderer/media/rtc_certificate.h
index 0181b96..e38e9ae 100644
--- a/content/renderer/media/rtc_certificate.h
+++ b/content/renderer/media/rtc_certificate.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_H_
#define CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_H_
+#include <stdint.h>
+
#include "base/macros.h"
#include "third_party/WebKit/public/platform/WebRTCCertificate.h"
#include "third_party/WebKit/public/platform/WebRTCKeyParams.h"
diff --git a/content/renderer/media/rtc_certificate_generator.cc b/content/renderer/media/rtc_certificate_generator.cc
index f7971814..83e17cb8 100644
--- a/content/renderer/media/rtc_certificate_generator.cc
+++ b/content/renderer/media/rtc_certificate_generator.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/macros.h"
#include "content/renderer/media/peer_connection_identity_store.h"
#include "content/renderer/media/rtc_certificate.h"
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
diff --git a/content/renderer/media/rtc_data_channel_handler.cc b/content/renderer/media/rtc_data_channel_handler.cc
index 51fe9e6..9dba433 100644
--- a/content/renderer/media/rtc_data_channel_handler.cc
+++ b/content/renderer/media/rtc_data_channel_handler.cc
@@ -84,7 +84,7 @@
}
void RtcDataChannelHandler::Observer::OnBufferedAmountChange(
- uint64 previous_amount) {
+ uint64_t previous_amount) {
// Optimization: Only post a task if the change is a decrease, because the web
// interface does not perform any action when there is an increase.
if (previous_amount > channel_->buffered_amount()) {
diff --git a/content/renderer/media/rtc_data_channel_handler.h b/content/renderer/media/rtc_data_channel_handler.h
index f93eeca5..1206d75 100644
--- a/content/renderer/media/rtc_data_channel_handler.h
+++ b/content/renderer/media/rtc_data_channel_handler.h
@@ -5,14 +5,17 @@
#ifndef CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_
#define CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
-#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
#include "third_party/WebKit/public/platform/WebRTCDataChannelHandler.h"
#include "third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h"
+#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
namespace content {
@@ -87,7 +90,7 @@
// webrtc::DataChannelObserver implementation.
void OnStateChange() override;
- void OnBufferedAmountChange(uint64 previous_amount) override;
+ void OnBufferedAmountChange(uint64_t previous_amount) override;
void OnMessage(const webrtc::DataBuffer& buffer) override;
void OnStateChangeImpl(webrtc::DataChannelInterface::DataState state);
diff --git a/content/renderer/media/rtc_data_channel_handler_unittest.cc b/content/renderer/media/rtc_data_channel_handler_unittest.cc
index 7087095..3a40317 100644
--- a/content/renderer/media/rtc_data_channel_handler_unittest.cc
+++ b/content/renderer/media/rtc_data_channel_handler_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/memory/scoped_ptr.h"
#include "base/test/test_simple_task_runner.h"
#include "content/renderer/media/mock_data_channel_impl.h"
diff --git a/content/renderer/media/rtc_dtmf_sender_handler.h b/content/renderer/media/rtc_dtmf_sender_handler.h
index 1a9c3c2..6967d48 100644
--- a/content/renderer/media/rtc_dtmf_sender_handler.h
+++ b/content/renderer/media/rtc_dtmf_sender_handler.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
diff --git a/content/renderer/media/rtc_media_constraints.cc b/content/renderer/media/rtc_media_constraints.cc
index 7f8b79d..22226ce 100644
--- a/content/renderer/media/rtc_media_constraints.cc
+++ b/content/renderer/media/rtc_media_constraints.cc
@@ -3,14 +3,16 @@
// found in the LICENSE file.
#include "content/renderer/media/rtc_media_constraints.h"
+#include <stddef.h>
+
#include <string>
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "content/common/media/media_stream_options.h"
#include "content/renderer/media/media_stream_video_source.h"
-#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/WebKit/public/platform/WebCString.h"
+#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/WebKit/public/platform/WebString.h"
namespace content {
diff --git a/content/renderer/media/rtc_peer_connection_handler.h b/content/renderer/media/rtc_peer_connection_handler.h
index fa45d6a..25e3031 100644
--- a/content/renderer/media/rtc_peer_connection_handler.h
+++ b/content/renderer/media/rtc_peer_connection_handler.h
@@ -5,11 +5,13 @@
#ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
#define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
+#include <stddef.h>
+
#include <map>
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index ceb20f95..3ae6bb2 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include <string>
#include <vector>
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
index 86ac8729..fff132c 100644
--- a/content/renderer/media/rtc_video_decoder.cc
+++ b/content/renderer/media/rtc_video_decoder.cc
@@ -23,9 +23,9 @@
namespace content {
-const int32 RTCVideoDecoder::ID_LAST = 0x3FFFFFFF;
-const int32 RTCVideoDecoder::ID_HALF = 0x20000000;
-const int32 RTCVideoDecoder::ID_INVALID = -1;
+const int32_t RTCVideoDecoder::ID_LAST = 0x3FFFFFFF;
+const int32_t RTCVideoDecoder::ID_HALF = 0x20000000;
+const int32_t RTCVideoDecoder::ID_INVALID = -1;
// Maximum number of concurrent VDA::Decode() operations RVD will maintain.
// Higher values allow better pipelining in the GPU, but also require more
@@ -38,7 +38,7 @@
// Maximum number of pending WebRTC buffers that are waiting for shared memory.
static const size_t kMaxNumOfPendingBuffers = 8;
-RTCVideoDecoder::BufferData::BufferData(int32 bitstream_buffer_id,
+RTCVideoDecoder::BufferData::BufferData(int32_t bitstream_buffer_id,
uint32_t timestamp,
size_t size,
const gfx::Rect& visible_rect)
@@ -285,16 +285,16 @@
return WEBRTC_VIDEO_CODEC_OK;
}
-void RTCVideoDecoder::ProvidePictureBuffers(uint32 count,
+void RTCVideoDecoder::ProvidePictureBuffers(uint32_t count,
const gfx::Size& size,
- uint32 texture_target) {
+ uint32_t texture_target) {
DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
DVLOG(3) << "ProvidePictureBuffers. texture_target=" << texture_target;
if (!vda_)
return;
- std::vector<uint32> texture_ids;
+ std::vector<uint32_t> texture_ids;
std::vector<gpu::Mailbox> texture_mailboxes;
decoder_texture_target_ = texture_target;
if (!factories_->CreateTextures(count,
@@ -319,11 +319,11 @@
vda_->AssignPictureBuffers(picture_buffers);
}
-void RTCVideoDecoder::DismissPictureBuffer(int32 id) {
+void RTCVideoDecoder::DismissPictureBuffer(int32_t id) {
DVLOG(3) << "DismissPictureBuffer. id=" << id;
DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
- std::map<int32, media::PictureBuffer>::iterator it =
+ std::map<int32_t, media::PictureBuffer>::iterator it =
assigned_picture_buffers_.find(id);
if (it == assigned_picture_buffers_.end()) {
NOTREACHED() << "Missing picture buffer: " << id;
@@ -346,7 +346,7 @@
DVLOG(3) << "PictureReady";
DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
- std::map<int32, media::PictureBuffer>::iterator it =
+ std::map<int32_t, media::PictureBuffer>::iterator it =
assigned_picture_buffers_.find(picture.picture_buffer_id());
if (it == assigned_picture_buffers_.end()) {
NOTREACHED() << "Missing picture buffer: " << picture.picture_buffer_id();
@@ -420,11 +420,11 @@
return frame;
}
-void RTCVideoDecoder::NotifyEndOfBitstreamBuffer(int32 id) {
+void RTCVideoDecoder::NotifyEndOfBitstreamBuffer(int32_t id) {
DVLOG(3) << "NotifyEndOfBitstreamBuffer. id=" << id;
DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
- std::map<int32, base::SharedMemory*>::iterator it =
+ std::map<int32_t, base::SharedMemory*>::iterator it =
bitstream_buffers_in_decoder_.find(id);
if (it == bitstream_buffers_in_decoder_.end()) {
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
@@ -522,16 +522,17 @@
return bitstream_buffers_in_decoder_.size() < kMaxInFlightDecodes;
}
-bool RTCVideoDecoder::IsBufferAfterReset(int32 id_buffer, int32 id_reset) {
+bool RTCVideoDecoder::IsBufferAfterReset(int32_t id_buffer, int32_t id_reset) {
if (id_reset == ID_INVALID)
return true;
- int32 diff = id_buffer - id_reset;
+ int32_t diff = id_buffer - id_reset;
if (diff <= 0)
diff += ID_LAST + 1;
return diff < ID_HALF;
}
-bool RTCVideoDecoder::IsFirstBufferAfterReset(int32 id_buffer, int32 id_reset) {
+bool RTCVideoDecoder::IsFirstBufferAfterReset(int32_t id_buffer,
+ int32_t id_reset) {
if (id_reset == ID_INVALID)
return id_buffer == 0;
return id_buffer == ((id_reset + 1) & ID_LAST);
@@ -613,8 +614,8 @@
void RTCVideoDecoder::ReleaseMailbox(
base::WeakPtr<RTCVideoDecoder> decoder,
media::GpuVideoAcceleratorFactories* factories,
- int64 picture_buffer_id,
- uint32 texture_id,
+ int64_t picture_buffer_id,
+ uint32_t texture_id,
const gpu::SyncToken& release_sync_token) {
DCHECK(factories->GetTaskRunner()->BelongsToCurrentThread());
factories->WaitSyncToken(release_sync_token);
@@ -628,14 +629,14 @@
factories->DeleteTexture(texture_id);
}
-void RTCVideoDecoder::ReusePictureBuffer(int64 picture_buffer_id) {
+void RTCVideoDecoder::ReusePictureBuffer(int64_t picture_buffer_id) {
DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
DVLOG(3) << "ReusePictureBuffer. id=" << picture_buffer_id;
DCHECK(!picture_buffers_at_display_.empty());
PictureBufferTextureMap::iterator display_iterator =
picture_buffers_at_display_.find(picture_buffer_id);
- uint32 texture_id = display_iterator->second;
+ uint32_t texture_id = display_iterator->second;
DCHECK(display_iterator != picture_buffers_at_display_.end());
picture_buffers_at_display_.erase(display_iterator);
@@ -778,7 +779,7 @@
input_buffer_data_.pop_back();
}
-void RTCVideoDecoder::GetBufferData(int32 bitstream_buffer_id,
+void RTCVideoDecoder::GetBufferData(int32_t bitstream_buffer_id,
uint32_t* timestamp,
gfx::Rect* visible_rect) {
for (const auto& buffer_data : input_buffer_data_) {
diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h
index db7668c..9728866 100644
--- a/content/renderer/media/rtc_video_decoder.h
+++ b/content/renderer/media/rtc_video_decoder.h
@@ -5,14 +5,17 @@
#ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <deque>
#include <list>
#include <map>
#include <set>
#include <utility>
-#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
@@ -81,12 +84,12 @@
int32_t Reset() override;
// VideoDecodeAccelerator::Client implementation.
- void ProvidePictureBuffers(uint32 count,
+ void ProvidePictureBuffers(uint32_t count,
const gfx::Size& size,
- uint32 texture_target) override;
- void DismissPictureBuffer(int32 id) override;
+ uint32_t texture_target) override;
+ void DismissPictureBuffer(int32_t id) override;
void PictureReady(const media::Picture& picture) override;
- void NotifyEndOfBitstreamBuffer(int32 id) override;
+ void NotifyEndOfBitstreamBuffer(int32_t id) override;
void NotifyFlushDone() override;
void NotifyResetDone() override;
void NotifyError(media::VideoDecodeAccelerator::Error error) override;
@@ -94,13 +97,13 @@
private:
// Metadata of a bitstream buffer.
struct BufferData {
- BufferData(int32 bitstream_buffer_id,
+ BufferData(int32_t bitstream_buffer_id,
uint32_t timestamp,
size_t size,
const gfx::Rect& visible_rect);
BufferData();
~BufferData();
- int32 bitstream_buffer_id;
+ int32_t bitstream_buffer_id;
uint32_t timestamp; // in 90KHz
size_t size; // buffer size
gfx::Rect visible_rect;
@@ -119,11 +122,11 @@
// Returns true if bitstream buffer id |id_buffer| comes after |id_reset|.
// This handles the wraparound.
- bool IsBufferAfterReset(int32 id_buffer, int32 id_reset);
+ bool IsBufferAfterReset(int32_t id_buffer, int32_t id_reset);
// Returns true if bitstream buffer |id_buffer| is the first buffer after
// |id_reset|.
- bool IsFirstBufferAfterReset(int32 id_buffer, int32 id_reset);
+ bool IsFirstBufferAfterReset(int32_t id_buffer, int32_t id_reset);
// Saves a WebRTC buffer in |decode_buffers_| for decode.
void SaveToDecodeBuffers_Locked(const webrtc::EncodedImage& input_image,
@@ -150,11 +153,11 @@
// Static method is to allow it to run even after RVD is deleted.
static void ReleaseMailbox(base::WeakPtr<RTCVideoDecoder> decoder,
media::GpuVideoAcceleratorFactories* factories,
- int64 picture_buffer_id,
- uint32 texture_id,
+ int64_t picture_buffer_id,
+ uint32_t texture_id,
const gpu::SyncToken& release_sync_token);
// Tells VDA that a picture buffer can be recycled.
- void ReusePictureBuffer(int64 picture_buffer_id);
+ void ReusePictureBuffer(int64_t picture_buffer_id);
// Create |vda_| on |vda_loop_proxy_|.
void CreateVDA(media::VideoCodecProfile profile, base::WaitableEvent* waiter);
@@ -176,7 +179,7 @@
// Stores the buffer metadata to |input_buffer_data_|.
void RecordBufferData(const BufferData& buffer_data);
// Gets the buffer metadata from |input_buffer_data_|.
- void GetBufferData(int32 bitstream_buffer_id,
+ void GetBufferData(int32_t bitstream_buffer_id,
uint32_t* timestamp,
gfx::Rect* visible_rect);
@@ -201,9 +204,9 @@
DECODE_ERROR, // Decoding error happened.
};
- static const int32 ID_LAST; // maximum bitstream buffer id
- static const int32 ID_HALF; // half of the maximum bitstream buffer id
- static const int32 ID_INVALID; // indicates Reset or Release never occurred
+ static const int32_t ID_LAST; // maximum bitstream buffer id
+ static const int32_t ID_HALF; // half of the maximum bitstream buffer id
+ static const int32_t ID_INVALID; // indicates Reset or Release never occurred
// The hardware video decoder.
scoped_ptr<media::VideoDecodeAccelerator> vda_;
@@ -217,27 +220,27 @@
media::GpuVideoAcceleratorFactories* const factories_;
// The texture target used for decoded pictures.
- uint32 decoder_texture_target_;
+ uint32_t decoder_texture_target_;
// Metadata of the buffers that have been sent for decode.
std::list<BufferData> input_buffer_data_;
// A map from bitstream buffer IDs to bitstream buffers that are being
// processed by VDA. The map owns SHM buffers.
- std::map<int32, base::SharedMemory*> bitstream_buffers_in_decoder_;
+ std::map<int32_t, base::SharedMemory*> bitstream_buffers_in_decoder_;
// A map from picture buffer IDs to texture-backed picture buffers.
- std::map<int32, media::PictureBuffer> assigned_picture_buffers_;
+ std::map<int32_t, media::PictureBuffer> assigned_picture_buffers_;
// PictureBuffers given to us by VDA via PictureReady, which we sent forward
// as VideoFrames to be rendered via read_cb_, and which will be returned
// to us via ReusePictureBuffer.
- typedef std::map<int32 /* picture_buffer_id */, uint32 /* texture_id */>
+ typedef std::map<int32_t /* picture_buffer_id */, uint32_t /* texture_id */>
PictureBufferTextureMap;
PictureBufferTextureMap picture_buffers_at_display_;
// The id that will be given to the next picture buffer.
- int32 next_picture_buffer_id_;
+ int32_t next_picture_buffer_id_;
// Protects |state_|, |decode_complete_callback_| , |num_shm_buffers_|,
// |available_shm_segments_|, |pending_buffers_|, |decode_buffers_|,
@@ -268,11 +271,11 @@
std::deque<std::pair<base::SharedMemory*, BufferData>> decode_buffers_;
// The id that will be given to the next bitstream buffer. Guarded by |lock_|.
- int32 next_bitstream_buffer_id_;
+ int32_t next_bitstream_buffer_id_;
// A buffer that has an id less than this should be dropped because Reset or
// Release has been called. Guarded by |lock_|.
- int32 reset_bitstream_buffer_id_;
+ int32_t reset_bitstream_buffer_id_;
// Minimum and maximum supported resolutions for the current profile/VDA.
gfx::Size min_resolution_;
diff --git a/content/renderer/media/rtc_video_decoder_factory.h b/content/renderer/media/rtc_video_decoder_factory.h
index ca797c1..c3475de 100644
--- a/content/renderer/media/rtc_video_decoder_factory.h
+++ b/content/renderer/media/rtc_video_decoder_factory.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_
#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_
+#include "base/macros.h"
#include "base/threading/thread.h"
#include "content/common/content_export.h"
#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideodecoderfactory.h"
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index 1ce30d8..2aeb1ea 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/single_thread_task_runner.h"
diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc
index c19270e..6b6a420 100644
--- a/content/renderer/media/rtc_video_encoder.cc
+++ b/content/renderer/media/rtc_video_encoder.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/metrics/histogram.h"
#include "base/numerics/safe_conversions.h"
@@ -109,7 +110,7 @@
// RTCVideoEncoder expects to be able to call this function synchronously from
// its own thread, hence the |async_waiter| and |async_retval| arguments.
void CreateAndInitializeVEA(const gfx::Size& input_visible_size,
- uint32 bitrate,
+ uint32_t bitrate,
media::VideoCodecProfile profile,
base::WaitableEvent* async_waiter,
int32_t* async_retval);
@@ -124,10 +125,10 @@
// RTCVideoEncoder is given a buffer to be passed to WebRTC through the
// RTCVideoEncoder::ReturnEncodedImage() function. When that is complete,
// the buffer is returned to Impl by its index using this function.
- void UseOutputBitstreamBufferId(int32 bitstream_buffer_id);
+ void UseOutputBitstreamBufferId(int32_t bitstream_buffer_id);
// Request encoding parameter change for the underlying encoder.
- void RequestEncodingParametersChange(uint32 bitrate, uint32 framerate);
+ void RequestEncodingParametersChange(uint32_t bitrate, uint32_t framerate);
// Destroy this Impl's encoder. The destructor is not explicitly called, as
// Impl is a base::RefCountedThreadSafe.
@@ -137,7 +138,7 @@
void RequireBitstreamBuffers(unsigned int input_count,
const gfx::Size& input_coded_size,
size_t output_buffer_size) override;
- void BitstreamBufferReady(int32 bitstream_buffer_id,
+ void BitstreamBufferReady(int32_t bitstream_buffer_id,
size_t payload_size,
bool key_frame) override;
void NotifyError(media::VideoEncodeAccelerator::Error error) override;
@@ -171,7 +172,7 @@
void SignalAsyncWaiter(int32_t retval);
// Checks if the bitrate would overflow when passing from kbps to bps.
- bool IsBitrateTooHigh(uint32 bitrate);
+ bool IsBitrateTooHigh(uint32_t bitrate);
base::ThreadChecker thread_checker_;
@@ -219,7 +220,7 @@
int output_buffers_free_count_;
// 15 bits running index of the VP8 frames. See VP8 RTP spec for details.
- uint16 picture_id_;
+ uint16_t picture_id_;
DISALLOW_COPY_AND_ASSIGN(Impl);
};
@@ -241,7 +242,7 @@
void RTCVideoEncoder::Impl::CreateAndInitializeVEA(
const gfx::Size& input_visible_size,
- uint32 bitrate,
+ uint32_t bitrate,
media::VideoCodecProfile profile,
base::WaitableEvent* async_waiter,
int32_t* async_retval) {
@@ -309,7 +310,7 @@
}
void RTCVideoEncoder::Impl::UseOutputBitstreamBufferId(
- int32 bitstream_buffer_id) {
+ int32_t bitstream_buffer_id) {
DVLOG(3) << "Impl::UseOutputBitstreamBufferIndex(): "
"bitstream_buffer_id=" << bitstream_buffer_id;
DCHECK(thread_checker_.CalledOnValidThread());
@@ -322,8 +323,9 @@
}
}
-void RTCVideoEncoder::Impl::RequestEncodingParametersChange(uint32 bitrate,
- uint32 framerate) {
+void RTCVideoEncoder::Impl::RequestEncodingParametersChange(
+ uint32_t bitrate,
+ uint32_t framerate) {
DVLOG(3) << "Impl::RequestEncodingParametersChange(): bitrate=" << bitrate
<< ", framerate=" << framerate;
DCHECK(thread_checker_.CalledOnValidThread());
@@ -389,7 +391,7 @@
SignalAsyncWaiter(WEBRTC_VIDEO_CODEC_OK);
}
-void RTCVideoEncoder::Impl::BitstreamBufferReady(int32 bitstream_buffer_id,
+void RTCVideoEncoder::Impl::BitstreamBufferReady(int32_t bitstream_buffer_id,
size_t payload_size,
bool key_frame) {
DVLOG(3) << "Impl::BitstreamBufferReady(): "
@@ -414,10 +416,10 @@
// Use webrtc timestamps to ensure correct RTP sender behavior.
// TODO(hshi): obtain timestamp from the capturer, see crbug.com/350106.
- const int64 capture_time_us = webrtc::TickTime::MicrosecondTimestamp();
+ const int64_t capture_time_us = webrtc::TickTime::MicrosecondTimestamp();
// Derive the capture time (in ms) and RTP timestamp (in 90KHz ticks).
- const int64 capture_time_ms = capture_time_us / 1000;
+ const int64_t capture_time_ms = capture_time_us / 1000;
const uint32_t rtp_timestamp =
static_cast<uint32_t>(capture_time_us * 90 / 1000);
@@ -508,7 +510,7 @@
frame = media::VideoFrame::WrapExternalSharedMemory(
media::PIXEL_FORMAT_I420, input_frame_coded_size_,
gfx::Rect(input_visible_size_), input_visible_size_,
- reinterpret_cast<uint8*>(input_buffer->memory()),
+ reinterpret_cast<uint8_t*>(input_buffer->memory()),
input_buffer->mapped_size(), input_buffer->handle(), 0,
base::TimeDelta());
if (!frame.get()) {
@@ -571,8 +573,8 @@
async_waiter_ = NULL;
}
-bool RTCVideoEncoder::Impl::IsBitrateTooHigh(uint32 bitrate) {
- if (base::IsValueInRangeForNumericType<uint32>(bitrate * UINT64_C(1000)))
+bool RTCVideoEncoder::Impl::IsBitrateTooHigh(uint32_t bitrate) {
+ if (base::IsValueInRangeForNumericType<uint32_t>(bitrate * UINT64_C(1000)))
return false;
LogAndNotifyError(FROM_HERE, "Overflow converting bitrate from kbps to bps",
media::VideoEncodeAccelerator::kInvalidArgumentError);
@@ -713,8 +715,8 @@
}
void RTCVideoEncoder::ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image,
- int32 bitstream_buffer_id,
- uint16 picture_id) {
+ int32_t bitstream_buffer_id,
+ uint16_t picture_id) {
DCHECK(thread_checker_.CalledOnValidThread());
DVLOG(3) << "ReturnEncodedImage(): "
<< "bitstream_buffer_id=" << bitstream_buffer_id
diff --git a/content/renderer/media/rtc_video_encoder.h b/content/renderer/media/rtc_video_encoder.h
index c916d54..4997ad29 100644
--- a/content/renderer/media/rtc_video_encoder.h
+++ b/content/renderer/media/rtc_video_encoder.h
@@ -5,8 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_
#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -62,8 +66,8 @@
// Return an encoded output buffer to WebRTC.
void ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image,
- int32 bitstream_buffer_id,
- uint16 picture_id);
+ int32_t bitstream_buffer_id,
+ uint16_t picture_id);
void NotifyError(int32_t error);
diff --git a/content/renderer/media/rtc_video_encoder_factory.h b/content/renderer/media/rtc_video_encoder_factory.h
index 95707ba1..a4abe6f 100644
--- a/content/renderer/media/rtc_video_encoder_factory.h
+++ b/content/renderer/media/rtc_video_encoder_factory.h
@@ -8,6 +8,7 @@
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoencoderfactory.h"
diff --git a/content/renderer/media/speech_recognition_audio_sink.cc b/content/renderer/media/speech_recognition_audio_sink.cc
index 6b80dd27..6370df2 100644
--- a/content/renderer/media/speech_recognition_audio_sink.cc
+++ b/content/renderer/media/speech_recognition_audio_sink.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/speech_recognition_audio_sink.h"
+#include <stddef.h>
+
#include "base/logging.h"
#include "base/memory/shared_memory.h"
#include "base/time/time.h"
diff --git a/content/renderer/media/speech_recognition_audio_sink.h b/content/renderer/media/speech_recognition_audio_sink.h
index d1200b2..c70420f 100644
--- a/content/renderer/media/speech_recognition_audio_sink.h
+++ b/content/renderer/media/speech_recognition_audio_sink.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_MEDIA_SPEECH_RECOGNITION_AUDIO_SINK_H_
#define CONTENT_RENDERER_MEDIA_SPEECH_RECOGNITION_AUDIO_SINK_H_
+#include <stdint.h>
+
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
@@ -103,7 +106,7 @@
bool track_stopped_;
// Local counter of audio buffers for synchronization.
- uint32 buffer_index_;
+ uint32_t buffer_index_;
// Callback for the renderer client. Called when the audio track was stopped.
const OnStoppedCB on_stopped_cb_;
diff --git a/content/renderer/media/speech_recognition_audio_sink_unittest.cc b/content/renderer/media/speech_recognition_audio_sink_unittest.cc
index 8a05fab..3ea81a8d 100644
--- a/content/renderer/media/speech_recognition_audio_sink_unittest.cc
+++ b/content/renderer/media/speech_recognition_audio_sink_unittest.cc
@@ -4,7 +4,11 @@
#include "content/renderer/media/speech_recognition_audio_sink.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/bind.h"
+#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/media_stream_audio_source.h"
#include "content/renderer/media/mock_media_constraint_factory.h"
@@ -49,7 +53,7 @@
struct SharedBuffer {
SharedBuffer() : data(), start(0), length(0) {}
- uint8 data[kSharedBufferSize];
+ uint8_t data[kSharedBufferSize];
size_t start;
size_t length;
};
@@ -87,7 +91,7 @@
if (in_failure_mode_)
return 0;
- const uint8* b = static_cast<const uint8*>(buffer);
+ const uint8_t* b = static_cast<const uint8_t*>(buffer);
for (size_t i = 0; i < length; ++i, ++buffer_->length)
buffer_->data[buffer_->start + buffer_->length] = b[i];
@@ -96,7 +100,7 @@
}
size_t MockSyncSocket::Receive(void* buffer, size_t length) {
- uint8* b = static_cast<uint8*>(buffer);
+ uint8_t* b = static_cast<uint8_t*>(buffer);
for (size_t i = buffer_->start; i < buffer_->length; ++i, ++buffer_->start)
b[i] = buffer_->data[buffer_->start];
@@ -117,7 +121,7 @@
const media::AudioParameters& sink_params,
base::SharedMemoryHandle* foreign_memory_handle) {
// Shared memory is allocated, mapped and shared.
- const uint32 kSharedMemorySize =
+ const uint32_t kSharedMemorySize =
sizeof(media::AudioInputBufferParameters) +
media::AudioBus::CalculateMemorySize(sink_params);
shared_memory_.reset(new base::SharedMemory());
@@ -211,10 +215,10 @@
// Initializes the producer and consumer with specified audio parameters.
// Returns the minimal number of input audio buffers which need to be captured
// before they get sent to the consumer.
- uint32 Initialize(int input_sample_rate,
- int input_frames_per_buffer,
- int output_sample_rate,
- int output_frames_per_buffer) {
+ uint32_t Initialize(int input_sample_rate,
+ int input_frames_per_buffer,
+ int output_sample_rate,
+ int output_frames_per_buffer) {
// Audio Environment setup.
source_params_.Reset(kInputFormat,
kInputChannelLayout,
@@ -255,7 +259,7 @@
base::Unretained(this))));
// Return number of buffers needed to trigger resampling and consumption.
- return static_cast<uint32>(std::ceil(
+ return static_cast<uint32_t>(std::ceil(
static_cast<double>(output_frames_per_buffer * input_sample_rate) /
(input_frames_per_buffer * output_sample_rate)));
}
@@ -295,8 +299,8 @@
}
// Emulates an audio capture device capturing data from the source.
- inline void CaptureAudio(const uint32 buffers) {
- for (uint32 i = 0; i < buffers; ++i) {
+ inline void CaptureAudio(const uint32_t buffers) {
+ for (uint32_t i = 0; i < buffers; ++i) {
const base::TimeTicks estimated_capture_time = first_frame_capture_time_ +
(sample_frames_captured_ * base::TimeDelta::FromSeconds(1) /
source_params_.sample_rate());
@@ -311,14 +315,15 @@
}
// Helper method for verifying captured audio data has been consumed.
- inline void AssertConsumedBuffers(const uint32 buffer_index) {
+ inline void AssertConsumedBuffers(const uint32_t buffer_index) {
ASSERT_EQ(buffer_index, recognizer()->GetAudioInputBuffer()->params.size);
}
// Helper method for providing audio data to producer and verifying it was
// consumed on the recognizer.
- inline void CaptureAudioAndAssertConsumedBuffers(const uint32 buffers,
- const uint32 buffer_index) {
+ inline void CaptureAudioAndAssertConsumedBuffers(
+ const uint32_t buffers,
+ const uint32_t buffer_index) {
CaptureAudio(buffers);
AssertConsumedBuffers(buffer_index);
}
@@ -330,15 +335,13 @@
const int input_frames_per_buffer,
const int output_sample_rate,
const int output_frames_per_buffer,
- const uint32 consumptions) {
- const uint32 buffers_per_notification =
- Initialize(input_sample_rate,
- input_frames_per_buffer,
- output_sample_rate,
- output_frames_per_buffer);
+ const uint32_t consumptions) {
+ const uint32_t buffers_per_notification =
+ Initialize(input_sample_rate, input_frames_per_buffer,
+ output_sample_rate, output_frames_per_buffer);
AssertConsumedBuffers(0U);
- for (uint32 i = 1U; i <= consumptions; ++i) {
+ for (uint32_t i = 1U; i <= consumptions; ++i) {
CaptureAudio(buffers_per_notification);
ASSERT_EQ(i, recognizer()->GetAudioInputBuffer()->params.size)
<< "Tested at rates: "
@@ -371,7 +374,7 @@
WebRtcLocalAudioTrack* native_track_;
base::TimeTicks first_frame_capture_time_;
- int64 sample_frames_captured_;
+ int64_t sample_frames_captured_;
DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionAudioSinkTest);
};
@@ -433,12 +436,12 @@
// Input audio is sampled at 44.1 KHz with data chunks of 10ms. Desired output
// is corresponding to the speech recognition engine requirements: 16 KHz with
// 100 ms chunks (1600 frames per buffer).
- const uint32 kSourceFrames = 441;
- const uint32 buffers_per_notification =
+ const uint32_t kSourceFrames = 441;
+ const uint32_t buffers_per_notification =
Initialize(44100, kSourceFrames, 16000, 1600);
// Fill audio input frames with 0, 1, 2, 3, ..., 440.
- int16 source_data[kSourceFrames * kInputChannels];
- for (uint32 i = 0; i < kSourceFrames; ++i) {
+ int16_t source_data[kSourceFrames * kInputChannels];
+ for (uint32_t i = 0; i < kSourceFrames; ++i) {
for (int c = 0; c < kInputChannels; ++c)
source_data[i * kInputChannels + c] = i;
}
@@ -447,18 +450,18 @@
// Prepare sink audio bus and data for rendering.
media::AudioBus* sink_bus = recognizer()->audio_bus();
- const uint32 kSinkDataLength = 1600 * kOutputChannels;
- int16 sink_data[kSinkDataLength] = {0};
+ const uint32_t kSinkDataLength = 1600 * kOutputChannels;
+ int16_t sink_data[kSinkDataLength] = {0};
// Render the audio data from the recognizer.
sink_bus->ToInterleaved(sink_bus->frames(),
sink_params().bits_per_sample() / 8, sink_data);
// Checking only a fraction of the sink frames.
- const uint32 kNumFramesToTest = 12;
+ const uint32_t kNumFramesToTest = 12;
// Check all channels are zeroed out before we trigger resampling.
- for (uint32 i = 0; i < kNumFramesToTest; ++i) {
+ for (uint32_t i = 0; i < kNumFramesToTest; ++i) {
for (int c = 0; c < kOutputChannels; ++c)
EXPECT_EQ(0, sink_data[i * kOutputChannels + c]);
}
@@ -472,11 +475,11 @@
sink_params().bits_per_sample() / 8, sink_data);
// Resampled data expected frames. Extracted based on |source_data|.
- const int16 kExpectedData[kNumFramesToTest] = {0, 2, 5, 8, 11, 13,
- 16, 19, 22, 24, 27, 30};
+ const int16_t kExpectedData[kNumFramesToTest] = {0, 2, 5, 8, 11, 13,
+ 16, 19, 22, 24, 27, 30};
// Check all channels have the same resampled data.
- for (uint32 i = 0; i < kNumFramesToTest; ++i) {
+ for (uint32_t i = 0; i < kNumFramesToTest; ++i) {
for (int c = 0; c < kOutputChannels; ++c)
EXPECT_EQ(kExpectedData[i], sink_data[i * kOutputChannels + c]);
}
@@ -484,7 +487,7 @@
// Checks that the producer does not misbehave when a socket failure occurs.
TEST_F(SpeechRecognitionAudioSinkTest, SyncSocketFailsSendingData) {
- const uint32 buffers_per_notification = Initialize(44100, 441, 16000, 1600);
+ const uint32_t buffers_per_notification = Initialize(44100, 441, 16000, 1600);
// Start with no problems on the socket.
AssertConsumedBuffers(0U);
CaptureAudioAndAssertConsumedBuffers(buffers_per_notification, 1U);
@@ -499,7 +502,7 @@
// We check that the FIFO overflow does not occur and that the producer is able
// to resume.
TEST_F(SpeechRecognitionAudioSinkTest, RepeatedSycnhronizationLag) {
- const uint32 buffers_per_notification = Initialize(44100, 441, 16000, 1600);
+ const uint32_t buffers_per_notification = Initialize(44100, 441, 16000, 1600);
// Start with no synchronization problems.
AssertConsumedBuffers(0U);
@@ -520,7 +523,7 @@
// Checks that an OnStoppedCallback is issued when the track is stopped.
TEST_F(SpeechRecognitionAudioSinkTest, OnReadyStateChangedOccured) {
- const uint32 buffers_per_notification = Initialize(44100, 441, 16000, 1600);
+ const uint32_t buffers_per_notification = Initialize(44100, 441, 16000, 1600);
AssertConsumedBuffers(0U);
CaptureAudioAndAssertConsumedBuffers(buffers_per_notification, 1U);
EXPECT_CALL(*this, StoppedCallback()).Times(1);
diff --git a/content/renderer/media/tagged_list.h b/content/renderer/media/tagged_list.h
index 450f9f6..b58772c 100644
--- a/content/renderer/media/tagged_list.h
+++ b/content/renderer/media/tagged_list.h
@@ -9,6 +9,7 @@
#include <list>
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
namespace content {
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
index 5d0afa5..d60046a4 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/user_media_client_impl.h"
+#include <stddef.h>
+
#include <utility>
#include "base/hash.h"
diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h
index 1200cae2..04cc2e0 100644
--- a/content/renderer/media/user_media_client_impl.h
+++ b/content/renderer/media/user_media_client_impl.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
index c2123214..624743c 100644
--- a/content/renderer/media/user_media_client_impl_unittest.cc
+++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index f9e13b6..67957d4 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -11,7 +11,10 @@
#include "content/renderer/media/video_capture_impl.h"
+#include <stddef.h>
+
#include "base/bind.h"
+#include "base/macros.h"
#include "base/stl_util.h"
#include "base/thread_task_runner_handle.h"
#include "content/child/child_process.h"
@@ -66,13 +69,13 @@
base::Unretained(this))));
bool rv = buffers_[i]->Map();
DCHECK(rv);
- data_[i] = reinterpret_cast<uint8*>(buffers_[i]->memory(0u));
+ data_[i] = reinterpret_cast<uint8_t*>(buffers_[i]->memory(0u));
strides_[i] = width;
}
}
- uint8* data(int plane) const { return data_[plane]; }
- int32 stride(int plane) const { return strides_[plane]; }
+ uint8_t* data(int plane) const { return data_[plane]; }
+ int32_t stride(int plane) const { return strides_[plane]; }
std::vector<gfx::GpuMemoryBufferHandle> gpu_memory_buffer_handles() {
return handles_;
}
@@ -90,8 +93,8 @@
const std::vector<gfx::GpuMemoryBufferHandle> handles_;
const gfx::Size size_;
ScopedVector<gfx::GpuMemoryBuffer> buffers_;
- uint8* data_[media::VideoFrame::kMaxPlanes];
- int32 strides_[media::VideoFrame::kMaxPlanes];
+ uint8_t* data_[media::VideoFrame::kMaxPlanes];
+ int32_t strides_[media::VideoFrame::kMaxPlanes];
DISALLOW_COPY_AND_ASSIGN(ClientBuffer2);
};
@@ -355,16 +358,11 @@
DCHECK(iter != client_buffers_.end());
const scoped_refptr<ClientBuffer> buffer = iter->second;
frame = media::VideoFrame::WrapExternalSharedMemory(
- pixel_format,
- coded_size,
- visible_rect,
- gfx::Size(visible_rect.width(),
- visible_rect.height()),
- reinterpret_cast<uint8*>(buffer->buffer()->memory()),
- buffer->buffer_size(),
- buffer->buffer()->handle(),
- 0 /* shared_memory_offset */,
- timestamp - first_frame_timestamp_);
+ pixel_format, coded_size, visible_rect,
+ gfx::Size(visible_rect.width(), visible_rect.height()),
+ reinterpret_cast<uint8_t*>(buffer->buffer()->memory()),
+ buffer->buffer_size(), buffer->buffer()->handle(),
+ 0 /* shared_memory_offset */, timestamp - first_frame_timestamp_);
buffer_finished_callback = media::BindToCurrentLoop(
base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
weak_factory_.GetWeakPtr(), buffer_id, buffer));
@@ -465,7 +463,7 @@
device_formats_in_use_cb_queue_.clear();
}
-void VideoCaptureImpl::OnDelegateAdded(int32 device_id) {
+void VideoCaptureImpl::OnDelegateAdded(int32_t device_id) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
DVLOG(1) << "OnDelegateAdded: device_id " << device_id;
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h
index 52c2eb3b..cd2a8090 100644
--- a/content/renderer/media/video_capture_impl.h
+++ b/content/renderer/media/video_capture_impl.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
#define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
+#include <stdint.h>
+
#include <list>
#include <map>
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
@@ -125,7 +128,7 @@
const media::VideoCaptureFormats& supported_formats) override;
void OnDeviceFormatsInUseReceived(
const media::VideoCaptureFormats& formats_in_use) override;
- void OnDelegateAdded(int32 device_id) override;
+ void OnDelegateAdded(int32_t device_id) override;
// Sends an IPC message to browser process when all clients are done with the
// buffer.
@@ -168,9 +171,9 @@
std::vector<VideoCaptureDeviceFormatsCB> device_formats_in_use_cb_queue_;
// Buffers available for sending to the client.
- typedef std::map<int32, scoped_refptr<ClientBuffer>> ClientBufferMap;
+ typedef std::map<int32_t, scoped_refptr<ClientBuffer>> ClientBufferMap;
ClientBufferMap client_buffers_;
- typedef std::map<int32, scoped_refptr<ClientBuffer2>> ClientBuffer2Map;
+ typedef std::map<int32_t, scoped_refptr<ClientBuffer2>> ClientBuffer2Map;
ClientBuffer2Map client_buffer2s_;
ClientInfoMap clients_;
diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h
index a28904db2..ef1a168 100644
--- a/content/renderer/media/video_capture_impl_manager.h
+++ b/content/renderer/media/video_capture_impl_manager.h
@@ -8,6 +8,7 @@
#include <map>
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/content/renderer/media/video_capture_impl_manager_unittest.cc b/content/renderer/media/video_capture_impl_manager_unittest.cc
index bec544a..3bb923e 100644
--- a/content/renderer/media/video_capture_impl_manager_unittest.cc
+++ b/content/renderer/media/video_capture_impl_manager_unittest.cc
@@ -4,6 +4,7 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index 80bca69..1f0ad49a 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/message_loop/message_loop.h"
#include "content/child/child_process.h"
diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h
index c8cb872..9088cd3 100644
--- a/content/renderer/media/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -10,8 +10,11 @@
#ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
+#include <stdint.h>
+
#include <map>
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/values.h"
#include "content/common/content_export.h"
@@ -68,7 +71,7 @@
// Called when the delegate has been added to filter's delegate list.
// |device_id| is the device id for the delegate.
- virtual void OnDelegateAdded(int32 device_id) = 0;
+ virtual void OnDelegateAdded(int32_t device_id) = 0;
protected:
virtual ~Delegate() {}
@@ -95,7 +98,7 @@
~VideoCaptureMessageFilter() override;
private:
- typedef std::map<int32, Delegate*> Delegates;
+ typedef std::map<int32_t, Delegate*> Delegates;
// Receive a newly created buffer from browser process.
void OnBufferCreated(int device_id,
@@ -136,7 +139,7 @@
// A map of device ids to delegates.
Delegates delegates_;
Delegates pending_delegates_;
- int32 last_device_id_;
+ int32_t last_device_id_;
IPC::Sender* sender_;
diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc
index a3d4e903..edf0e60 100644
--- a/content/renderer/media/video_capture_message_filter_unittest.cc
+++ b/content/renderer/media/video_capture_message_filter_unittest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/memory/shared_memory.h"
#include "base/process/process_handle.h"
+#include "build/build_config.h"
#include "content/common/media/video_capture_messages.h"
#include "content/renderer/media/video_capture_message_filter.h"
#include "ipc/ipc_test_sink.h"
@@ -52,7 +55,7 @@
MOCK_METHOD1(OnDeviceFormatsInUseReceived,
void(const media::VideoCaptureFormats& formats_in_use));
- void OnDelegateAdded(int32 device_id) override {
+ void OnDelegateAdded(int32_t device_id) override {
ASSERT_TRUE(device_id != 0);
ASSERT_TRUE(device_id_ == 0);
device_id_ = device_id;
diff --git a/content/renderer/media/video_track_adapter.cc b/content/renderer/media/video_track_adapter.cc
index 46cd40e45f..9f4e2ab 100644
--- a/content/renderer/media/video_track_adapter.cc
+++ b/content/renderer/media/video_track_adapter.cc
@@ -11,6 +11,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"
@@ -490,7 +491,7 @@
void VideoTrackAdapter::CheckFramesReceivedOnIO(
const OnMutedCallback& set_muted_state_callback,
- uint64 old_frame_counter_snapshot) {
+ uint64_t old_frame_counter_snapshot) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
if (!monitoring_frame_rate_)
diff --git a/content/renderer/media/video_track_adapter.h b/content/renderer/media/video_track_adapter.h
index a63b6e1..ddd73ef 100644
--- a/content/renderer/media/video_track_adapter.h
+++ b/content/renderer/media/video_track_adapter.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_
#define CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_
+#include <stdint.h>
+
#include <vector>
#include "base/macros.h"
@@ -84,7 +86,7 @@
// Compare |frame_counter_snapshot| with the current |frame_counter_|, and
// inform of the situation (muted, not muted) via |set_muted_state_callback|.
void CheckFramesReceivedOnIO(const OnMutedCallback& set_muted_state_callback,
- uint64 old_frame_counter_snapshot);
+ uint64_t old_frame_counter_snapshot);
// |thread_checker_| is bound to the main render thread.
base::ThreadChecker thread_checker_;
@@ -112,7 +114,7 @@
bool muted_state_;
// Running frame counter, accessed on the IO-thread.
- uint64 frame_counter_;
+ uint64_t frame_counter_;
// Frame rate configured on the video source, accessed on the IO-thread.
float source_frame_rate_;
diff --git a/content/renderer/media/video_track_recorder.cc b/content/renderer/media/video_track_recorder.cc
index a33d44d..21b563d 100644
--- a/content/renderer/media/video_track_recorder.cc
+++ b/content/renderer/media/video_track_recorder.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/sys_info.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
diff --git a/content/renderer/media/video_track_recorder_unittest.cc b/content/renderer/media/video_track_recorder_unittest.cc
index ddddf2bb..6605bb6 100644
--- a/content/renderer/media/video_track_recorder_unittest.cc
+++ b/content/renderer/media/video_track_recorder_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/macros.h"
diff --git a/content/renderer/media/video_track_to_pepper_adapter.cc b/content/renderer/media/video_track_to_pepper_adapter.cc
index 6a5947d..c59155f 100644
--- a/content/renderer/media/video_track_to_pepper_adapter.cc
+++ b/content/renderer/media/video_track_to_pepper_adapter.cc
@@ -7,6 +7,7 @@
#include <string>
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "base/trace_event/trace_event.h"
diff --git a/content/renderer/media/video_track_to_pepper_adapter.h b/content/renderer/media/video_track_to_pepper_adapter.h
index 424c901..fc78de97 100644
--- a/content/renderer/media/video_track_to_pepper_adapter.h
+++ b/content/renderer/media/video_track_to_pepper_adapter.h
@@ -8,6 +8,7 @@
#include <map>
#include <string>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webaudio_capturer_source.h b/content/renderer/media/webaudio_capturer_source.h
index 1e682576a..b0ee262 100644
--- a/content/renderer/media/webaudio_capturer_source.h
+++ b/content/renderer/media/webaudio_capturer_source.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_
#define CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_
+#include <stddef.h>
+
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index 6173f06..392d20e 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -4,11 +4,14 @@
#include "content/renderer/media/webmediaplayer_ms.h"
+#include <stddef.h>
+
#include <limits>
#include <string>
#include "base/bind.h"
#include "base/callback.h"
+#include "build/build_config.h"
#include "cc/blink/context_provider_web_context.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/video_frame_provider_client_impl.h"
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
index bfeaff4..24b2d6b 100644
--- a/content/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.cc b/content/renderer/media/webmediaplayer_ms_compositor.cc
index 095f548..ae58a3e 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.cc
+++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webmediaplayer_ms_compositor.h"
+#include <stdint.h>
+
#include "base/command_line.h"
#include "base/hash.h"
#include "base/single_thread_task_runner.h"
@@ -59,7 +61,7 @@
// GPU Process crashed.
bitmap.eraseColor(SK_ColorTRANSPARENT);
}
- libyuv::ARGBToI420(reinterpret_cast<uint8*>(bitmap.getPixels()),
+ libyuv::ARGBToI420(reinterpret_cast<uint8_t*>(bitmap.getPixels()),
bitmap.rowBytes(),
new_frame->data(media::VideoFrame::kYPlane),
new_frame->stride(media::VideoFrame::kYPlane),
@@ -124,7 +126,7 @@
}
// Just for logging purpose.
- const uint32 hash_value = base::Hash(url.string().utf8());
+ const uint32_t hash_value = base::Hash(url.string().utf8());
serial_ = (hash_value << 1) | (remote_video ? 1 : 0);
}
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.h b/content/renderer/media/webmediaplayer_ms_compositor.h
index 28adb03..884a003 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.h
+++ b/content/renderer/media/webmediaplayer_ms_compositor.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H
#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H
+#include <stddef.h>
+
#include <map>
#include <vector>
diff --git a/content/renderer/media/webmediaplayer_ms_unittest.cc b/content/renderer/media/webmediaplayer_ms_unittest.cc
index 5169505..af4cf20d 100644
--- a/content/renderer/media/webmediaplayer_ms_unittest.cc
+++ b/content/renderer/media/webmediaplayer_ms_unittest.cc
@@ -1,6 +1,9 @@
// Copyright 2015 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 <stddef.h>
+
#include "content/public/renderer/media_stream_renderer_factory.h"
#include "content/renderer/media/webmediaplayer_ms.h"
#include "content/renderer/media/webmediaplayer_ms_compositor.h"
diff --git a/content/renderer/media/webrtc/media_stream_remote_audio_track.cc b/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
index 7a0b52f..179a1fd 100644
--- a/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc/media_stream_remote_audio_track.h"
+#include <stddef.h>
+
#include <list>
#include "base/logging.h"
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
index b8013f3..05cc12a 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc/media_stream_remote_video_source.h"
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.h b/content/renderer/media/webrtc/media_stream_remote_video_source.h
index 0c4f44a..1f24c75b 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.h
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.cc b/content/renderer/media/webrtc/media_stream_track_metrics.cc
index 0ec4444..3353692 100644
--- a/content/renderer/media/webrtc/media_stream_track_metrics.cc
+++ b/content/renderer/media/webrtc/media_stream_track_metrics.cc
@@ -366,9 +366,9 @@
}
}
-uint64 MediaStreamTrackMetrics::MakeUniqueIdImpl(uint64 pc_id,
- const std::string& track_id,
- StreamType stream_type) {
+uint64_t MediaStreamTrackMetrics::MakeUniqueIdImpl(uint64_t pc_id,
+ const std::string& track_id,
+ StreamType stream_type) {
// We use a hash over the |track| pointer and the PeerConnection ID,
// plus a boolean flag indicating whether the track is remote (since
// you might conceivably have a remote track added back as a sent
@@ -389,15 +389,14 @@
base::MD5Digest digest;
base::MD5Final(&digest, &ctx);
- static_assert(sizeof(digest.a) > sizeof(uint64), "need a bigger digest");
- return *reinterpret_cast<uint64*>(digest.a);
+ static_assert(sizeof(digest.a) > sizeof(uint64_t), "need a bigger digest");
+ return *reinterpret_cast<uint64_t*>(digest.a);
}
-uint64 MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id,
- StreamType stream_type) {
+uint64_t MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id,
+ StreamType stream_type) {
return MakeUniqueIdImpl(
- reinterpret_cast<uint64>(reinterpret_cast<void*>(this)),
- track_id,
+ reinterpret_cast<uint64_t>(reinterpret_cast<void*>(this)), track_id,
stream_type);
}
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.h b/content/renderer/media/webrtc/media_stream_track_metrics.h
index aaf669d0..4f2cd0e 100644
--- a/content/renderer/media/webrtc/media_stream_track_metrics.h
+++ b/content/renderer/media/webrtc/media_stream_track_metrics.h
@@ -5,7 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/memory/scoped_vector.h"
#include "base/threading/non_thread_safe.h"
#include "content/common/content_export.h"
@@ -81,14 +82,14 @@
// |this| pointer to a 64-bit integer, which is usable as a unique
// ID for the PeerConnection this object is attached to (since there
// is a one-to-one relationship).
- uint64 MakeUniqueIdImpl(uint64 pc_id,
- const std::string& track,
- StreamType stream_type);
+ uint64_t MakeUniqueIdImpl(uint64_t pc_id,
+ const std::string& track,
+ StreamType stream_type);
private:
// Make a unique ID for the given track, that is valid while the
// track object and the PeerConnection it is attached to both exist.
- uint64 MakeUniqueId(const std::string& track, StreamType stream_type);
+ uint64_t MakeUniqueId(const std::string& track, StreamType stream_type);
typedef ScopedVector<MediaStreamTrackMetricsObserver> ObserverVector;
ObserverVector observers_;
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
index df840835..8f10d55 100644
--- a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
+++ b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
index 1f8f475..1e1d749c 100644
--- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
+#include <stddef.h>
+
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/mock_peer_connection_impl.h"
diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
index 0b015034..c3b7835 100644
--- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
#include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
#include "third_party/libjingle/source/talk/media/base/videorenderer.h"
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index 465bb4b..cfd82f5 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -4,16 +4,20 @@
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
+#include <stddef.h>
+
#include <utility>
#include <vector>
#include "base/command_line.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/metrics/field_trial.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
+#include "build/build_config.h"
#include "content/common/media/media_stream_messages.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
index def4738..a5bdb34 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/files/file.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/webrtc/track_observer.h b/content/renderer/media/webrtc/track_observer.h
index 0a39805b..c0a6ad42 100644
--- a/content/renderer/media/webrtc/track_observer.h
+++ b/content/renderer/media/webrtc/track_observer.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_WEBRTC_TRACK_OBSERVER_H_
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/single_thread_task_runner.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc
index 914f704..715309e7 100644
--- a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc
@@ -45,7 +45,7 @@
params_ = params;
const int num_pcm16_data_elements =
params_.frames_per_buffer() * params_.channels();
- interleaved_data_.reset(new int16[num_pcm16_data_elements]);
+ interleaved_data_.reset(new int16_t[num_pcm16_data_elements]);
}
} // namespace content
diff --git a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h
index 3b837a31..4e70d19 100644
--- a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h
+++ b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_AUDIO_SINK_ADAPTER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_AUDIO_SINK_ADAPTER_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "media/audio/audio_parameters.h"
@@ -37,7 +40,7 @@
webrtc::AudioTrackSinkInterface* const sink_;
media::AudioParameters params_;
- scoped_ptr<int16[]> interleaved_data_;
+ scoped_ptr<int16_t[]> interleaved_data_;
DISALLOW_COPY_AND_ASSIGN(WebRtcAudioSinkAdapter);
};
diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
index ea13f14..6a8f6db 100644
--- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "content/renderer/media/mock_media_constraint_factory.h"
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "content/renderer/media/webrtc_audio_capturer.h"
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
index 6e4ca3f..d23cfa9 100644
--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "content/child/child_process.h"
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index 4e5dd05f..c3b407b4 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -49,7 +49,7 @@
captured_frame_.rotation = webrtc::kVideoRotation_0;
captured_frame_.data = NULL;
captured_frame_.data_size = cricket::CapturedFrame::kUnknownDataSize;
- captured_frame_.fourcc = static_cast<uint32>(cricket::FOURCC_ANY);
+ captured_frame_.fourcc = static_cast<uint32_t>(cricket::FOURCC_ANY);
frame_ = frame;
}
@@ -183,7 +183,7 @@
}
bool WebRtcVideoCapturerAdapter::GetPreferredFourccs(
- std::vector<uint32>* fourccs) {
+ std::vector<uint32_t>* fourccs) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!fourccs || fourccs->empty());
if (fourccs)
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
index c16b5b0..92293540 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
+#include <stdint.h>
+
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "media/base/video_capture_types.h"
@@ -42,7 +45,7 @@
const cricket::VideoFormat& capture_format) override;
void Stop() override;
bool IsRunning() override;
- bool GetPreferredFourccs(std::vector<uint32>* fourccs) override;
+ bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) override;
bool GetBestCaptureFormat(const cricket::VideoFormat& desired,
cricket::VideoFormat* best_format) override;
bool IsScreencast() const override;
diff --git a/content/renderer/media/webrtc/webrtc_video_frame_adapter.h b/content/renderer/media/webrtc/webrtc_video_frame_adapter.h
index 79287949..61555d03 100644
--- a/content/renderer/media/webrtc/webrtc_video_frame_adapter.h
+++ b/content/renderer/media/webrtc/webrtc_video_frame_adapter.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
+#include <stdint.h>
+
#include "media/base/video_frame.h"
#include "third_party/webrtc/common_video/include/video_frame_buffer.h"
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc
index f6605eb..113233e 100644
--- a/content/renderer/media/webrtc_audio_capturer.cc
+++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -6,9 +6,11 @@
#include "base/bind.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "build/build_config.h"
#include "content/child/child_process.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/media_stream_audio_processor.h"
diff --git a/content/renderer/media/webrtc_audio_capturer.h b/content/renderer/media/webrtc_audio_capturer.h
index df566c0..afa5f9e 100644
--- a/content/renderer/media/webrtc_audio_capturer.h
+++ b/content/renderer/media/webrtc_audio_capturer.h
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/files/file.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webrtc_audio_capturer_unittest.cc b/content/renderer/media/webrtc_audio_capturer_unittest.cc
index 92d291f..306ca98 100644
--- a/content/renderer/media/webrtc_audio_capturer_unittest.cc
+++ b/content/renderer/media/webrtc_audio_capturer_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/logging.h"
+#include "build/build_config.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "content/renderer/media/mock_media_constraint_factory.h"
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index 8931f75..9ee3da7 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -90,7 +90,7 @@
// webrtc::AudioTransport source. Keep reading until our internal buffer
// is full.
int accumulated_audio_frames = 0;
- int16* audio_data = &render_buffer_[0];
+ int16_t* audio_data = &render_buffer_[0];
while (accumulated_audio_frames < audio_bus->frames()) {
// Get 10ms and append output to temporary byte buffer.
int64_t elapsed_time_ms = -1;
diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h
index e9e9d856..a3bbf6b 100644
--- a/content/renderer/media/webrtc_audio_device_impl.h
+++ b/content/renderer/media/webrtc_audio_device_impl.h
@@ -5,13 +5,15 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/files/file.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
@@ -402,7 +404,7 @@
// Buffer used for temporary storage during render callback.
// It is only accessed by the audio render thread.
- std::vector<int16> render_buffer_;
+ std::vector<int16_t> render_buffer_;
DISALLOW_COPY_AND_ASSIGN(WebRtcAudioDeviceImpl);
};
diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h
index 1ba1b078..e755b61 100644
--- a/content/renderer/media/webrtc_audio_device_not_impl.h
+++ b/content/renderer/media/webrtc_audio_device_not_impl.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_NOT_IMPL_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_NOT_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/time/time.h"
#include "content/common/content_export.h"
#include "third_party/webrtc/modules/audio_device/include/audio_device.h"
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc
index 9714b23..5b48a37 100644
--- a/content/renderer/media/webrtc_audio_renderer.cc
+++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -8,6 +8,7 @@
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "build/build_config.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/media_stream_audio_track.h"
#include "content/renderer/media/media_stream_dispatcher.h"
diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h
index 1502fb9..29d02fba 100644
--- a/content/renderer/media/webrtc_audio_renderer.h
+++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -5,10 +5,13 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_RENDERER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_RENDERER_H_
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "base/threading/non_thread_safe.h"
diff --git a/content/renderer/media/webrtc_audio_renderer_unittest.cc b/content/renderer/media/webrtc_audio_renderer_unittest.cc
index 14680883..8260874 100644
--- a/content/renderer/media/webrtc_audio_renderer_unittest.cc
+++ b/content/renderer/media/webrtc_audio_renderer_unittest.cc
@@ -7,6 +7,7 @@
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "build/build_config.h"
#include "content/public/renderer/media_stream_audio_renderer.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/audio_message_filter.h"
diff --git a/content/renderer/media/webrtc_identity_service.h b/content/renderer/media/webrtc_identity_service.h
index 33bbfb2..6092f8a 100644
--- a/content/renderer/media/webrtc_identity_service.h
+++ b/content/renderer/media/webrtc_identity_service.h
@@ -8,8 +8,8 @@
#include <deque>
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/common/media/webrtc_identity_messages.h"
#include "content/public/renderer/render_process_observer.h"
diff --git a/content/renderer/media/webrtc_local_audio_renderer.h b/content/renderer/media/webrtc_local_audio_renderer.h
index 6a06984..d33c384 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.h
+++ b/content/renderer/media/webrtc_local_audio_renderer.h
@@ -5,10 +5,13 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
diff --git a/content/renderer/media/webrtc_local_audio_source_provider.h b/content/renderer/media/webrtc_local_audio_source_provider.h
index 12c51d0..9a9cc8e 100644
--- a/content/renderer/media/webrtc_local_audio_source_provider.h
+++ b/content/renderer/media/webrtc_local_audio_source_provider.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_SOURCE_PROVIDER_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_SOURCE_PROVIDER_H_
+#include <stddef.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
index e921bc9..28acddd 100644
--- a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/mock_media_constraint_factory.h"
diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc
index 26a88bd..cb48668e 100644
--- a/content/renderer/media/webrtc_local_audio_track.cc
+++ b/content/renderer/media/webrtc_local_audio_track.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc_local_audio_track.h"
+#include <stdint.h>
+
#include <limits>
#include "content/public/renderer/media_stream_audio_sink.h"
@@ -60,13 +62,14 @@
// post-processed data that may be all zeros even though the signal contained
// energy before the processing. In this case, report nonzero energy even if
// the energy of the data in |audio_bus| is zero.
- const float minimum_signal_level = force_report_nonzero_energy ?
- 1.0f / std::numeric_limits<int16>::max() : 0.0f;
+ const float minimum_signal_level =
+ force_report_nonzero_energy ? 1.0f / std::numeric_limits<int16_t>::max()
+ : 0.0f;
const float signal_level = std::max(
minimum_signal_level,
std::min(1.0f, level_calculator_->Calculate(audio_bus)));
const int signal_level_as_pcm16 =
- static_cast<int>(signal_level * std::numeric_limits<int16>::max() +
+ static_cast<int>(signal_level * std::numeric_limits<int16_t>::max() +
0.5f /* rounding to nearest int */);
adapter_->SetSignalLevel(signal_level_as_pcm16);
diff --git a/content/renderer/media/webrtc_local_audio_track.h b/content/renderer/media/webrtc_local_audio_track.h
index a4dd9ed..2eafbd1 100644
--- a/content/renderer/media/webrtc_local_audio_track.h
+++ b/content/renderer/media/webrtc_local_audio_track.h
@@ -8,6 +8,7 @@
#include <list>
#include <string>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc
index f09ee8b..feb1dbc 100644
--- a/content/renderer/media/webrtc_local_audio_track_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/macros.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
+#include "build/build_config.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "content/renderer/media/media_stream_audio_source.h"
#include "content/renderer/media/mock_media_constraint_factory.h"
diff --git a/content/renderer/media/webrtc_uma_histograms.h b/content/renderer/media/webrtc_uma_histograms.h
index 74fd401..39e703c 100644
--- a/content/renderer/media/webrtc_uma_histograms.h
+++ b/content/renderer/media/webrtc_uma_histograms.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_UMA_HISTOGRAMS_H_
#define CONTENT_RENDERER_MEDIA_WEBRTC_UMA_HISTOGRAMS_H_
+#include "base/macros.h"
#include "base/memory/singleton.h"
#include "base/threading/non_thread_safe.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/memory_benchmarking_extension.cc b/content/renderer/memory_benchmarking_extension.cc
index 391dcf77..be554c3 100644
--- a/content/renderer/memory_benchmarking_extension.cc
+++ b/content/renderer/memory_benchmarking_extension.cc
@@ -4,6 +4,7 @@
#include "content/renderer/memory_benchmarking_extension.h"
+#include "build/build_config.h"
#include "content/common/memory_benchmark_messages.h"
#include "content/public/renderer/chrome_object_extensions_utils.h"
#include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/memory_benchmarking_extension.h b/content/renderer/memory_benchmarking_extension.h
index afbaf24b..af7f4f2 100644
--- a/content/renderer/memory_benchmarking_extension.h
+++ b/content/renderer/memory_benchmarking_extension.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_MEMORY_BENCHMARKING_EXTENSION_H_
#define CONTENT_RENDERER_MEMORY_BENCHMARKING_EXTENSION_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "gin/wrappable.h"
namespace blink {
diff --git a/content/renderer/menu_item_builder.cc b/content/renderer/menu_item_builder.cc
index 7db3592..d6507d86 100644
--- a/content/renderer/menu_item_builder.cc
+++ b/content/renderer/menu_item_builder.cc
@@ -4,6 +4,8 @@
#include "content/renderer/menu_item_builder.h"
+#include <stddef.h>
+
#include "content/public/common/menu_item.h"
namespace content {
diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h
index 2be7f95..73046862 100644
--- a/content/renderer/mojo/service_registry_js_wrapper.h
+++ b/content/renderer/mojo/service_registry_js_wrapper.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "gin/handle.h"
#include "gin/object_template_builder.h"
diff --git a/content/renderer/mojo_context_state.cc b/content/renderer/mojo_context_state.cc
index 27de0721..2d3bdea 100644
--- a/content/renderer/mojo_context_state.cc
+++ b/content/renderer/mojo_context_state.cc
@@ -4,6 +4,8 @@
#include "content/renderer/mojo_context_state.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/stl_util.h"
#include "content/public/renderer/render_frame.h"
diff --git a/content/renderer/mouse_lock_dispatcher.h b/content/renderer/mouse_lock_dispatcher.h
index 29b8e4f..546088e 100644
--- a/content/renderer/mouse_lock_dispatcher.h
+++ b/content/renderer/mouse_lock_dispatcher.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_MOUSE_LOCK_DISPATCHER_H_
#define CONTENT_RENDERER_MOUSE_LOCK_DISPATCHER_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
namespace blink {
diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc
index f2d1402..4bc5805 100644
--- a/content/renderer/mus/render_widget_window_tree_client_factory.cc
+++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc
@@ -4,6 +4,8 @@
#include "content/renderer/mus/render_widget_window_tree_client_factory.h"
+#include <stdint.h>
+
#include "base/logging.h"
#include "base/macros.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
diff --git a/content/renderer/navigation_state_impl.h b/content/renderer/navigation_state_impl.h
index 07b7688..0a7d772 100644
--- a/content/renderer/navigation_state_impl.h
+++ b/content/renderer/navigation_state_impl.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "content/common/navigation_params.h"
#include "content/public/renderer/navigation_state.h"
diff --git a/content/renderer/notification_permission_dispatcher.h b/content/renderer/notification_permission_dispatcher.h
index bb3430f..df23dee1 100644
--- a/content/renderer/notification_permission_dispatcher.h
+++ b/content/renderer/notification_permission_dispatcher.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_NOTIFICATION_PERMISSION_DISPATCHER_H_
#define CONTENT_RENDERER_NOTIFICATION_PERMISSION_DISPATCHER_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/permission_service.mojom.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/npapi/plugin_channel_host.cc b/content/renderer/npapi/plugin_channel_host.cc
index d552ff8..3f9eaf9 100644
--- a/content/renderer/npapi/plugin_channel_host.cc
+++ b/content/renderer/npapi/plugin_channel_host.cc
@@ -4,8 +4,11 @@
#include "content/renderer/npapi/plugin_channel_host.h"
+#include <stddef.h>
+
#include "base/metrics/histogram.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "content/child/child_process.h"
#include "content/child/npapi/npobject_base.h"
#include "content/child/plugin_messages.h"
diff --git a/content/renderer/npapi/plugin_channel_host.h b/content/renderer/npapi/plugin_channel_host.h
index 6c6f8e259..8494f640 100644
--- a/content/renderer/npapi/plugin_channel_host.h
+++ b/content/renderer/npapi/plugin_channel_host.h
@@ -6,6 +6,8 @@
#define CONTENT_RENDERER_NPAPI_PLUGIN_CHANNEL_HOST_H_
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
+#include "build/build_config.h"
#include "content/child/npapi/np_channel_base.h"
#include "ipc/ipc_channel_handle.h"
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc
index a77e844..8f43e6b 100644
--- a/content/renderer/npapi/webplugin_delegate_proxy.cc
+++ b/content/renderer/npapi/webplugin_delegate_proxy.cc
@@ -4,13 +4,15 @@
#include "content/renderer/npapi/webplugin_delegate_proxy.h"
+#include <stddef.h>
+
#include <algorithm>
#include "base/auto_reset.h"
-#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/process/process.h"
@@ -18,6 +20,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/version.h"
+#include "build/build_config.h"
#include "cc/resources/shared_bitmap.h"
#include "content/child/child_process.h"
#include "content/child/child_shared_bitmap_manager.h"
@@ -110,8 +113,8 @@
void DidReceiveResponse(const std::string& mime_type,
const std::string& headers,
- uint32 expected_length,
- uint32 last_modified,
+ uint32_t expected_length,
+ uint32_t last_modified,
bool request_is_seekable) override {
DCHECK(channel_.get() != NULL);
PluginMsg_DidReceiveResponseParams params;
@@ -493,11 +496,12 @@
// window_rect becomes either a window in native windowing system
// coords, or a backing buffer. In either case things will go bad
// if the rectangle is very large.
- if (window_rect.width() < 0 || window_rect.width() > kMaxPluginSideLength ||
+ if (window_rect.width() < 0 || window_rect.width() > kMaxPluginSideLength ||
window_rect.height() < 0 || window_rect.height() > kMaxPluginSideLength ||
// We know this won't overflow due to above checks.
- static_cast<uint32>(window_rect.width()) *
- static_cast<uint32>(window_rect.height()) > kMaxPluginSize) {
+ static_cast<uint32_t>(window_rect.width()) *
+ static_cast<uint32_t>(window_rect.height()) >
+ kMaxPluginSize) {
return;
}
@@ -552,7 +556,7 @@
}
bool WebPluginDelegateProxy::CreateLocalBitmap(
- std::vector<uint8>* memory,
+ std::vector<uint8_t>* memory,
scoped_ptr<skia::PlatformCanvas>* canvas) {
const size_t size = BitmapSizeForPluginRect(plugin_rect_);
memory->resize(size);
@@ -942,10 +946,10 @@
skia::PlatformCanvasStrideForWidth(plugin_rect_.width());
const size_t chunk_size = 4 * rect.width();
DCHECK(back_buffer_bitmap() != NULL);
- uint8* source_data =
+ uint8_t* source_data =
back_buffer_bitmap()->pixels() + rect.y() * stride + 4 * rect.x();
DCHECK(front_buffer_bitmap() != NULL);
- uint8* target_data =
+ uint8_t* target_data =
front_buffer_bitmap()->pixels() + rect.y() * stride + 4 * rect.x();
for (int row = 0; row < rect.height(); ++row) {
memcpy(target_data, source_data, chunk_size);
@@ -1037,9 +1041,9 @@
}
void WebPluginDelegateProxy::OnAcceleratedPluginAllocatedIOSurface(
- int32 width,
- int32 height,
- uint32 surface_id) {
+ int32_t width,
+ int32_t height,
+ uint32_t surface_id) {
if (plugin_)
plugin_->AcceleratedPluginAllocatedIOSurface(width, height, surface_id);
}
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h
index ad9a66b8..62fa840 100644
--- a/content/renderer/npapi/webplugin_delegate_proxy.h
+++ b/content/renderer/npapi/webplugin_delegate_proxy.h
@@ -5,13 +5,17 @@
#ifndef CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_
#define CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner_helpers.h"
+#include "build/build_config.h"
#include "content/child/npapi/webplugin_delegate.h"
#include "content/public/common/webplugininfo.h"
#include "ipc/ipc_listener.h"
@@ -153,9 +157,9 @@
void OnStartIme();
// Accelerated (Core Animation) plugin implementation.
void OnAcceleratedPluginEnabledRendering();
- void OnAcceleratedPluginAllocatedIOSurface(int32 width,
- int32 height,
- uint32 surface_id);
+ void OnAcceleratedPluginAllocatedIOSurface(int32_t width,
+ int32_t height,
+ uint32_t surface_id);
void OnAcceleratedPluginSwappedIOSurface();
#endif
#if defined(OS_WIN)
@@ -204,7 +208,7 @@
#if !defined(OS_WIN)
// Creates a process-local memory section and canvas. PlatformCanvas on
// Windows only works with a DIB, not arbitrary memory.
- bool CreateLocalBitmap(std::vector<uint8>* memory,
+ bool CreateLocalBitmap(std::vector<uint8_t>* memory,
scoped_ptr<SkCanvas>* canvas);
#endif
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
index 1c9c7981..f5b0273 100644
--- a/content/renderer/npapi/webplugin_impl.cc
+++ b/content/renderer/npapi/webplugin_impl.cc
@@ -16,6 +16,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/io_surface_layer.h"
#include "content/child/appcache/web_application_cache_host_impl.h"
@@ -113,7 +114,7 @@
// response.
void didReceiveResponse(WebURLLoader*,
const WebURLResponse& response) override {
- int64 byte_range_upper_bound, instance_size;
+ int64_t byte_range_upper_bound, instance_size;
if (!MultipartResponseDelegate::ReadContentRanges(
response,
&byte_range_lower_bound_,
@@ -143,7 +144,7 @@
private:
// The lower bound of the byte range.
- int64 byte_range_lower_bound_;
+ int64_t byte_range_lower_bound_;
// The handler for the data.
WebPluginResourceClient* resource_client_;
};
@@ -189,8 +190,8 @@
struct ResponseInfo {
GURL url;
std::string mime_type;
- uint32 last_modified;
- uint32 expected_length;
+ uint32_t last_modified;
+ uint32_t expected_length;
};
void GetResponseInfo(const WebURLResponse& response,
@@ -200,13 +201,13 @@
// Measured in seconds since 12:00 midnight GMT, January 1, 1970.
response_info->last_modified =
- static_cast<uint32>(response.lastModifiedDate());
+ static_cast<uint32_t>(response.lastModifiedDate());
// If the length comes in as -1, then it indicates that it was not
// read off the HTTP headers. We replicate Safari webkit behavior here,
// which is to set it to 0.
response_info->expected_length =
- static_cast<uint32>(std::max(response.expectedContentLength(), 0LL));
+ static_cast<uint32_t>(std::max(response.expectedContentLength(), 0LL));
WebString content_encoding =
response.httpHeaderField(WebString::fromUTF8("Content-Encoding"));
@@ -230,7 +231,7 @@
linked_ptr<blink::WebURLLoader> loader;
bool notify_redirects;
bool is_plugin_src_load;
- int64 data_offset;
+ int64_t data_offset;
};
bool WebPluginImpl::initialize(WebPluginContainer* container) {
@@ -568,8 +569,8 @@
}
bool WebPluginImpl::SetPostData(WebURLRequest* request,
- const char *buf,
- uint32 length) {
+ const char* buf,
+ uint32_t length) {
std::vector<std::string> names;
std::vector<std::string> values;
std::vector<char> body;
@@ -778,9 +779,9 @@
void WebPluginImpl::AcceleratedPluginEnabledRendering() {
}
-void WebPluginImpl::AcceleratedPluginAllocatedIOSurface(int32 width,
- int32 height,
- uint32 surface_id) {
+void WebPluginImpl::AcceleratedPluginAllocatedIOSurface(int32_t width,
+ int32_t height,
+ uint32_t surface_id) {
next_io_surface_allocated_ = true;
next_io_surface_width_ = width;
next_io_surface_height_ = height;
diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h
index 39e3226..a7408cb6 100644
--- a/content/renderer/npapi/webplugin_impl.h
+++ b/content/renderer/npapi/webplugin_impl.h
@@ -5,14 +5,18 @@
#ifndef CONTENT_RENDERER_NPAPI_WEBPLUGIN_IMPL_H_
#define CONTENT_RENDERER_NPAPI_WEBPLUGIN_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "build/build_config.h"
#include "content/child/npapi/webplugin.h"
#include "content/common/content_export.h"
#include "content/common/webplugin_geometry.h"
@@ -62,7 +66,7 @@
// Helper function for sorting post data.
CONTENT_EXPORT static bool SetPostData(blink::WebURLRequest* request,
const char* buf,
- uint32 length);
+ uint32_t length);
blink::WebFrame* webframe() { return webframe_; }
@@ -124,9 +128,9 @@
WebPluginAcceleratedSurface* GetAcceleratedSurface(
gfx::GpuPreference gpu_preference) override;
void AcceleratedPluginEnabledRendering() override;
- void AcceleratedPluginAllocatedIOSurface(int32 width,
- int32 height,
- uint32 surface_id) override;
+ void AcceleratedPluginAllocatedIOSurface(int32_t width,
+ int32_t height,
+ uint32_t surface_id) override;
void AcceleratedPluginSwappedIOSurface() override;
#endif
@@ -231,9 +235,9 @@
gfx::PluginWindowHandle window_;
#if defined(OS_MACOSX)
bool next_io_surface_allocated_;
- int32 next_io_surface_width_;
- int32 next_io_surface_height_;
- uint32 next_io_surface_id_;
+ int32_t next_io_surface_width_;
+ int32_t next_io_surface_height_;
+ uint32_t next_io_surface_id_;
scoped_refptr<cc::IOSurfaceLayer> io_surface_layer_;
scoped_ptr<blink::WebLayer> web_layer_;
#endif
diff --git a/content/renderer/npapi/webplugin_impl_unittest.cc b/content/renderer/npapi/webplugin_impl_unittest.cc
index 760c874..2cec6b82 100644
--- a/content/renderer/npapi/webplugin_impl_unittest.cc
+++ b/content/renderer/npapi/webplugin_impl_unittest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/strings/string_util.h"
#include "content/renderer/npapi/webplugin_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -56,7 +59,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ("bar", GetHeader(request, "foo"));
EXPECT_EQ(0U, GetHeader(request, "bar").length());
@@ -70,7 +73,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ(100U, GetHeader(request, "foo").length());
}
@@ -81,7 +84,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ("h1", GetHeader(request, "h1"));
EXPECT_EQ("h2", GetHeader(request, "h2"));
@@ -104,7 +107,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
}
@@ -114,7 +117,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ(0U, GetHeader(request, "foo").length());
EXPECT_EQ(0U, GetHeader(request, "bar").length());
@@ -128,7 +131,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ("bar", GetHeader(request, "foo"));
EXPECT_EQ(0U, GetHeader(request, "bar").length());
@@ -142,7 +145,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ(GetBodyText(request), "\n\nabcdefg\n\nabcdefg");
}
@@ -153,7 +156,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
}
@@ -163,7 +166,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
}
@@ -173,7 +176,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ("bar", GetHeader(request, "foo"));
EXPECT_EQ("body", GetBodyText(request));
@@ -185,7 +188,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ("bar", GetHeader(request, "foo"));
EXPECT_EQ(0U, GetHeader(request, "bar").length());
@@ -198,7 +201,7 @@
WebURLRequest request;
request.initialize();
bool rv = WebPluginImpl::SetPostData(&request, ex1,
- static_cast<uint32>(strlen(ex1)));
+ static_cast<uint32_t>(strlen(ex1)));
EXPECT_TRUE(rv);
EXPECT_EQ("bar", GetHeader(request, "foo"));
EXPECT_EQ(0U, GetHeader(request, "bar").length());
diff --git a/content/renderer/p2p/empty_network_manager.h b/content/renderer/p2p/empty_network_manager.h
index d53cc734..a256cb9 100644
--- a/content/renderer/p2p/empty_network_manager.h
+++ b/content/renderer/p2p/empty_network_manager.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_P2P_EMPTY_NETWORK_MANAGER_H_
#define CONTENT_RENDERER_P2P_EMPTY_NETWORK_MANAGER_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/p2p/filtering_network_manager.h b/content/renderer/p2p/filtering_network_manager.h
index 8eb7bba5d..c7c68bf 100644
--- a/content/renderer/p2p/filtering_network_manager.h
+++ b/content/renderer/p2p/filtering_network_manager.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_P2P_FILTERING_NETWORK_MANAGER_H_
#define CONTENT_RENDERER_P2P_FILTERING_NETWORK_MANAGER_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
diff --git a/content/renderer/p2p/filtering_network_manager_unittest.cc b/content/renderer/p2p/filtering_network_manager_unittest.cc
index 37a13f92..c5bb5e9b 100644
--- a/content/renderer/p2p/filtering_network_manager_unittest.cc
+++ b/content/renderer/p2p/filtering_network_manager_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/p2p/filtering_network_manager.h"
+#include <stddef.h>
+
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
diff --git a/content/renderer/p2p/host_address_request.h b/content/renderer/p2p/host_address_request.h
index 1fb0b7d9..1734d2a1 100644
--- a/content/renderer/p2p/host_address_request.h
+++ b/content/renderer/p2p/host_address_request.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_P2P_HOST_ADDRESS_REQUEST_H_
#define CONTENT_RENDERER_P2P_HOST_ADDRESS_REQUEST_H_
+#include <stdint.h>
+
#include <string>
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "net/base/ip_address_number.h"
@@ -63,7 +66,7 @@
State state_;
// Accessed on the IPC thread only.
- int32 request_id_;
+ int32_t request_id_;
bool registered_;
std::vector<rtc::IPAddress> addresses_;
DoneCallback done_callback_;
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 97de7d7..779bb216 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -4,10 +4,13 @@
#include "content/renderer/p2p/ipc_socket_factory.h"
+#include <stddef.h>
+
#include <algorithm>
#include <list>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
@@ -736,7 +739,9 @@
}
rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateUdpSocket(
- const rtc::SocketAddress& local_address, uint16 min_port, uint16 max_port) {
+ const rtc::SocketAddress& local_address,
+ uint16_t min_port,
+ uint16_t max_port) {
rtc::SocketAddress crome_address;
P2PSocketClientImpl* socket_client =
new P2PSocketClientImpl(socket_dispatcher_);
@@ -751,7 +756,9 @@
}
rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateServerTcpSocket(
- const rtc::SocketAddress& local_address, uint16 min_port, uint16 max_port,
+ const rtc::SocketAddress& local_address,
+ uint16_t min_port,
+ uint16_t max_port,
int opts) {
// TODO(sergeyu): Implement SSL support.
if (opts & rtc::PacketSocketFactory::OPT_SSLTCP)
diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h
index 1570322..7ca81d61 100644
--- a/content/renderer/p2p/ipc_socket_factory.h
+++ b/content/renderer/p2p/ipc_socket_factory.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
#define CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
@@ -28,12 +30,12 @@
rtc::AsyncPacketSocket* CreateUdpSocket(
const rtc::SocketAddress& local_address,
- uint16 min_port,
- uint16 max_port) override;
+ uint16_t min_port,
+ uint16_t max_port) override;
rtc::AsyncPacketSocket* CreateServerTcpSocket(
const rtc::SocketAddress& local_address,
- uint16 min_port,
- uint16 max_port,
+ uint16_t min_port,
+ uint16_t max_port,
int opts) override;
rtc::AsyncPacketSocket* CreateClientTcpSocket(
const rtc::SocketAddress& local_address,
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 1f2d1e3..c4ba18bb 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -4,6 +4,8 @@
#include "content/renderer/p2p/port_allocator.h"
+#include <stdint.h>
+
#include "base/command_line.h"
#include "base/logging.h"
#include "content/public/common/content_switches.h"
@@ -24,7 +26,7 @@
config_(config),
origin_(origin),
network_manager_task_runner_(task_runner) {
- uint32 flags = 0;
+ uint32_t flags = 0;
if (!config_.enable_multiple_routes) {
flags |= cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION;
}
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index e8436765..480ad5c 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
#define CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/single_thread_task_runner.h"
#include "third_party/webrtc/p2p/client/basicportallocator.h"
diff --git a/content/renderer/p2p/socket_client.h b/content/renderer/p2p/socket_client.h
index a2cefdc..8ce5c752 100644
--- a/content/renderer/p2p/socket_client.h
+++ b/content/renderer/p2p/socket_client.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
#define CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
+#include <stdint.h>
+
#include <vector>
#include "base/memory/ref_counted.h"
diff --git a/content/renderer/p2p/socket_client_impl.cc b/content/renderer/p2p/socket_client_impl.cc
index dc7fb15..56fefb0 100644
--- a/content/renderer/p2p/socket_client_impl.cc
+++ b/content/renderer/p2p/socket_client_impl.cc
@@ -17,7 +17,7 @@
namespace {
-uint64_t GetUniqueId(uint32 random_socket_id, uint32 packet_id) {
+uint64_t GetUniqueId(uint32_t random_socket_id, uint32_t packet_id) {
uint64_t uid = random_socket_id;
uid <<= 32;
uid |= packet_id;
diff --git a/content/renderer/p2p/socket_client_impl.h b/content/renderer/p2p/socket_client_impl.h
index 4db0148..fd1099a 100644
--- a/content/renderer/p2p/socket_client_impl.h
+++ b/content/renderer/p2p/socket_client_impl.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_
#define CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_
+#include <stdint.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/p2p_socket_type.h"
#include "content/renderer/p2p/socket_client.h"
@@ -117,8 +120,8 @@
State state_;
// These two fields are used to identify packets for tracing.
- uint32 random_socket_id_;
- uint32 next_packet_id_;
+ uint32_t random_socket_id_;
+ uint32_t next_packet_id_;
DISALLOW_COPY_AND_ASSIGN(P2PSocketClientImpl);
};
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index ca235c2..fce70e2 100644
--- a/content/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -80,7 +80,7 @@
sender_ = NULL;
}
-void P2PSocketDispatcher::OnChannelConnected(int32 peer_id) {
+void P2PSocketDispatcher::OnChannelConnected(int32_t peer_id) {
connected_ = true;
}
@@ -133,7 +133,7 @@
}
void P2PSocketDispatcher::OnGetHostAddressResult(
- int32 request_id,
+ int32_t request_id,
const net::IPAddressList& addresses) {
P2PAsyncAddressResolver* request = host_address_requests_.Lookup(request_id);
if (!request) {
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 6dacc27..527921b3 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -21,11 +21,14 @@
#ifndef CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_
#define CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_
+#include <stdint.h>
+
#include <vector>
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/observer_list_threadsafe.h"
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
@@ -79,7 +82,7 @@
void OnFilterAdded(IPC::Sender* sender) override;
void OnFilterRemoved() override;
void OnChannelClosing() override;
- void OnChannelConnected(int32 peer_pid) override;
+ void OnChannelConnected(int32_t peer_pid) override;
base::SingleThreadTaskRunner* task_runner();
@@ -97,7 +100,7 @@
const net::NetworkInterfaceList& networks,
const net::IPAddressNumber& default_ipv4_local_address,
const net::IPAddressNumber& default_ipv6_local_address);
- void OnGetHostAddressResult(int32 request_id,
+ void OnGetHostAddressResult(int32_t request_id,
const net::IPAddressList& addresses);
void OnSocketCreated(int socket_id,
const net::IPEndPoint& local_address,
diff --git a/content/renderer/pepper/audio_helper.h b/content/renderer/pepper/audio_helper.h
index 4b0dfc2..b0c33e5 100644
--- a/content/renderer/pepper/audio_helper.h
+++ b/content/renderer/pepper/audio_helper.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_
#define CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index 2c94fe94..439e1d9 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -7,6 +7,7 @@
#include <vector>
#include "base/callback_helpers.h"
+#include "base/macros.h"
#include "base/metrics/sparse_histogram.h"
#include "base/numerics/safe_conversions.h"
#include "base/trace_event/trace_event.h"
@@ -420,7 +421,7 @@
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
PP_Var certificate_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
- base::checked_cast<uint32>(certificate.size()), certificate.data());
+ base::checked_cast<uint32_t>(certificate.size()), certificate.data());
plugin_decryption_interface_->SetServerCertificate(
pp_instance_, promise_id, certificate_array);
}
@@ -433,7 +434,7 @@
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
PP_Var init_data_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
- base::checked_cast<uint32>(init_data.size()), init_data.data());
+ base::checked_cast<uint32_t>(init_data.size()), init_data.data());
plugin_decryption_interface_->CreateSessionAndGenerateRequest(
pp_instance_, promise_id, MediaSessionTypeToPpSessionType(session_type),
MediaInitDataTypeToPpInitDataType(init_data_type), init_data_array);
@@ -456,7 +457,7 @@
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
PP_Var response_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
- base::checked_cast<uint32>(response.size()), response.data());
+ base::checked_cast<uint32_t>(response.size()), response.data());
plugin_decryption_interface_->UpdateSession(
pp_instance_, promise_id, StringVar::StringToPPVar(session_id),
response_array);
@@ -1214,8 +1215,8 @@
// Allocate space for the channel pointers given to AudioBuffer.
std::vector<const uint8_t*> channel_ptrs(audio_channel_count_, nullptr);
do {
- int64 timestamp = 0;
- int64 frame_size = -1;
+ int64_t timestamp = 0;
+ int64_t frame_size = -1;
const size_t kHeaderSize = sizeof(timestamp) + sizeof(frame_size);
if (bytes_left < kHeaderSize)
diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h
index 09b0917..7c1a7a66 100644
--- a/content/renderer/pepper/content_decryptor_delegate.h
+++ b/content/renderer/pepper/content_decryptor_delegate.h
@@ -5,14 +5,17 @@
#ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
#define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
#include <queue>
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "media/base/cdm_promise.h"
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
index c01ae4d..3b181436 100644
--- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
+++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "build/build_config.h"
#include "content/common/content_switches_internal.h"
#include "content/public/common/content_client.h"
#include "content/public/renderer/content_renderer_client.h"
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.h b/content/renderer/pepper/content_renderer_pepper_host_factory.h
index e6feec9..41ff02a 100644
--- a/content/renderer/pepper/content_renderer_pepper_host_factory.h
+++ b/content/renderer/pepper/content_renderer_pepper_host_factory.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_PEPPER_CONTENT_RENDERER_PEPPER_HOST_FACTORY_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "ppapi/host/host_factory.h"
#include "ppapi/shared_impl/ppapi_permissions.h"
diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc
index b02e0e6..036f213 100644
--- a/content/renderer/pepper/event_conversion.cc
+++ b/content/renderer/pepper/event_conversion.cc
@@ -4,7 +4,9 @@
#include "content/renderer/pepper/event_conversion.h"
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/i18n/char_iterator.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
@@ -13,6 +15,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversion_utils.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "content/common/input/web_touch_event_traits.h"
#include "ppapi/c/pp_input_event.h"
#include "ppapi/shared_impl/ppb_input_event_shared.h"
diff --git a/content/renderer/pepper/event_conversion_unittest.cc b/content/renderer/pepper/event_conversion_unittest.cc
index 8a22a93..93fe113 100644
--- a/content/renderer/pepper/event_conversion_unittest.cc
+++ b/content/renderer/pepper/event_conversion_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/input/synthetic_web_input_event_builders.h"
diff --git a/content/renderer/pepper/fake_pepper_plugin_instance.h b/content/renderer/pepper/fake_pepper_plugin_instance.h
index b5dcbe6..784e0ba 100644
--- a/content/renderer/pepper/fake_pepper_plugin_instance.h
+++ b/content/renderer/pepper/fake_pepper_plugin_instance.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_PEPPER_FAKE_PEPPER_PLUGIN_INSTANCE_H_
#define CONTENT_RENDERER_PEPPER_FAKE_PEPPER_PLUGIN_INSTANCE_H_
+#include <stdint.h>
+
#include "content/public/renderer/pepper_plugin_instance.h"
#include "url/gurl.h"
diff --git a/content/renderer/pepper/host_array_buffer_var.cc b/content/renderer/pepper/host_array_buffer_var.cc
index 67f5f81..eaff2e7e 100644
--- a/content/renderer/pepper/host_array_buffer_var.cc
+++ b/content/renderer/pepper/host_array_buffer_var.cc
@@ -24,14 +24,14 @@
namespace content {
-HostArrayBufferVar::HostArrayBufferVar(uint32 size_in_bytes)
+HostArrayBufferVar::HostArrayBufferVar(uint32_t size_in_bytes)
: buffer_(WebArrayBuffer::create(size_in_bytes, 1 /* element_size */)),
valid_(true) {}
HostArrayBufferVar::HostArrayBufferVar(const WebArrayBuffer& buffer)
: buffer_(buffer), valid_(true) {}
-HostArrayBufferVar::HostArrayBufferVar(uint32 size_in_bytes,
+HostArrayBufferVar::HostArrayBufferVar(uint32_t size_in_bytes,
base::SharedMemoryHandle handle)
: buffer_(WebArrayBuffer::create(size_in_bytes, 1 /* element_size */)) {
base::SharedMemory s(handle, true);
@@ -54,7 +54,9 @@
// We do not used shared memory on the host side. Nothing to do.
}
-uint32 HostArrayBufferVar::ByteLength() { return buffer_.byteLength(); }
+uint32_t HostArrayBufferVar::ByteLength() {
+ return buffer_.byteLength();
+}
bool HostArrayBufferVar::CopyToNewShmem(
PP_Instance instance,
diff --git a/content/renderer/pepper/host_array_buffer_var.h b/content/renderer/pepper/host_array_buffer_var.h
index 3f917d46..f26360d 100644
--- a/content/renderer/pepper/host_array_buffer_var.h
+++ b/content/renderer/pepper/host_array_buffer_var.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_HOST_ARRAY_BUFFER_VAR_H_
#define CONTENT_RENDERER_PEPPER_HOST_ARRAY_BUFFER_VAR_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/shared_impl/host_resource.h"
@@ -16,15 +19,15 @@
// Represents a host-side ArrayBufferVar.
class HostArrayBufferVar : public ppapi::ArrayBufferVar {
public:
- explicit HostArrayBufferVar(uint32 size_in_bytes);
+ explicit HostArrayBufferVar(uint32_t size_in_bytes);
explicit HostArrayBufferVar(const blink::WebArrayBuffer& buffer);
- explicit HostArrayBufferVar(uint32 size_in_bytes,
+ explicit HostArrayBufferVar(uint32_t size_in_bytes,
base::SharedMemoryHandle handle);
// ArrayBufferVar implementation.
void* Map() override;
void Unmap() override;
- uint32 ByteLength() override;
+ uint32_t ByteLength() override;
bool CopyToNewShmem(PP_Instance instance,
int* host_shm_handle_id,
base::SharedMemoryHandle* plugin_shm_handle) override;
diff --git a/content/renderer/pepper/host_dispatcher_wrapper.cc b/content/renderer/pepper/host_dispatcher_wrapper.cc
index ba709fe..29041b8c 100644
--- a/content/renderer/pepper/host_dispatcher_wrapper.cc
+++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
@@ -4,6 +4,7 @@
#include "content/renderer/pepper/host_dispatcher_wrapper.h"
+#include "build/build_config.h"
#include "content/common/frame_messages.h"
#include "content/public/common/origin_util.h"
#include "content/renderer/pepper/pepper_hung_plugin_filter.h"
diff --git a/content/renderer/pepper/host_globals.h b/content/renderer/pepper/host_globals.h
index 9ce071cc..0e554cbe 100644
--- a/content/renderer/pepper/host_globals.h
+++ b/content/renderer/pepper/host_globals.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/renderer/pepper/host_var_tracker.h"
#include "ppapi/shared_impl/callback_tracker.h"
#include "ppapi/shared_impl/ppapi_globals.h"
diff --git a/content/renderer/pepper/host_resource_var.h b/content/renderer/pepper/host_resource_var.h
index 9897a46..607525e 100644
--- a/content/renderer/pepper/host_resource_var.h
+++ b/content/renderer/pepper/host_resource_var.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_PEPPER_HOST_RESOURCE_VAR_H_
#define CONTENT_RENDERER_PEPPER_HOST_RESOURCE_VAR_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "ipc/ipc_message.h"
#include "ppapi/c/pp_resource.h"
diff --git a/content/renderer/pepper/host_var_tracker.cc b/content/renderer/pepper/host_var_tracker.cc
index 1b78ddc..b058576d 100644
--- a/content/renderer/pepper/host_var_tracker.cc
+++ b/content/renderer/pepper/host_var_tracker.cc
@@ -42,12 +42,12 @@
HostVarTracker::~HostVarTracker() {}
-ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32 size_in_bytes) {
+ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32_t size_in_bytes) {
return new HostArrayBufferVar(size_in_bytes);
}
ArrayBufferVar* HostVarTracker::CreateShmArrayBuffer(
- uint32 size_in_bytes,
+ uint32_t size_in_bytes,
base::SharedMemoryHandle handle) {
return new HostArrayBufferVar(size_in_bytes, handle);
}
@@ -154,7 +154,7 @@
int HostVarTracker::TrackSharedMemoryHandle(PP_Instance instance,
base::SharedMemoryHandle handle,
- uint32 size_in_bytes) {
+ uint32_t size_in_bytes) {
SharedMemoryMapEntry entry;
entry.instance = instance;
entry.handle = handle;
@@ -173,7 +173,7 @@
int id,
PP_Instance instance,
base::SharedMemoryHandle* handle,
- uint32* size_in_bytes) {
+ uint32_t* size_in_bytes) {
SharedMemoryMap::iterator it = shared_memory_map_.find(id);
if (it == shared_memory_map_.end())
return false;
diff --git a/content/renderer/pepper/host_var_tracker.h b/content/renderer/pepper/host_var_tracker.h
index 9fdca65..05755195 100644
--- a/content/renderer/pepper/host_var_tracker.h
+++ b/content/renderer/pepper/host_var_tracker.h
@@ -5,11 +5,13 @@
#ifndef CONTENT_RENDERER_PEPPER_HOST_VAR_TRACKER_H_
#define CONTENT_RENDERER_PEPPER_HOST_VAR_TRACKER_H_
+#include <stdint.h>
+
#include <map>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "ppapi/c/pp_instance.h"
@@ -53,17 +55,17 @@
int TrackSharedMemoryHandle(PP_Instance instance,
base::SharedMemoryHandle file,
- uint32 size_in_bytes) override;
+ uint32_t size_in_bytes) override;
bool StopTrackingSharedMemoryHandle(int id,
PP_Instance instance,
base::SharedMemoryHandle* handle,
- uint32* size_in_bytes) override;
+ uint32_t* size_in_bytes) override;
private:
// VarTracker private implementation.
- ppapi::ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) override;
+ ppapi::ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) override;
ppapi::ArrayBufferVar* CreateShmArrayBuffer(
- uint32 size_in_bytes,
+ uint32_t size_in_bytes,
base::SharedMemoryHandle handle) override;
// Clear the reference count of the given object and remove it from
@@ -97,7 +99,7 @@
struct SharedMemoryMapEntry {
PP_Instance instance;
base::SharedMemoryHandle handle;
- uint32 size_in_bytes;
+ uint32_t size_in_bytes;
};
typedef std::map<int, SharedMemoryMapEntry> SharedMemoryMap;
SharedMemoryMap shared_memory_map_;
diff --git a/content/renderer/pepper/host_var_tracker_unittest.cc b/content/renderer/pepper/host_var_tracker_unittest.cc
index 55b6b86..7ee9bc72 100644
--- a/content/renderer/pepper/host_var_tracker_unittest.cc
+++ b/content/renderer/pepper/host_var_tracker_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/pepper/host_globals.h"
#include "content/renderer/pepper/host_var_tracker.h"
diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h
index 6e3741f..ea35d20 100644
--- a/content/renderer/pepper/message_channel.h
+++ b/content/renderer/pepper/message_channel.h
@@ -9,7 +9,7 @@
#include <list>
#include <map>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/renderer/pepper/v8_var_converter.h"
#include "gin/handle.h"
diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.h b/content/renderer/pepper/mock_renderer_ppapi_host.h
index 259bf5d..aa0b59eac 100644
--- a/content/renderer/pepper/mock_renderer_ppapi_host.h
+++ b/content/renderer/pepper/mock_renderer_ppapi_host.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_PEPPER_MOCK_RENDERER_PPAPI_HOST_H_
#define CONTENT_RENDERER_PEPPER_MOCK_RENDERER_PPAPI_HOST_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.cc b/content/renderer/pepper/pepper_audio_encoder_host.cc
index b3e59fd3..e6b69c6 100644
--- a/content/renderer/pepper/pepper_audio_encoder_host.cc
+++ b/content/renderer/pepper/pepper_audio_encoder_host.cc
@@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/bind.h"
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/host_globals.h"
@@ -67,7 +70,7 @@
void RequestBitrateChange(uint32_t bitrate);
private:
- scoped_ptr<uint8[]> encoder_memory_;
+ scoped_ptr<uint8_t[]> encoder_memory_;
OpusEncoder* opus_encoder_;
// Initialization parameters, only valid if |encoder_memory_| is not
@@ -111,7 +114,7 @@
if (encoder_size < 1)
return false;
- scoped_ptr<uint8[]> encoder_memory(new uint8[encoder_size]);
+ scoped_ptr<uint8_t[]> encoder_memory(new uint8_t[encoder_size]);
opus_encoder_ = reinterpret_cast<OpusEncoder*>(encoder_memory.get());
if (opus_encoder_init(opus_encoder_, parameters.input_sample_rate,
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.h b/content/renderer/pepper/pepper_audio_encoder_host.h
index 3ad9a0c..8edd67a 100644
--- a/content/renderer/pepper/pepper_audio_encoder_host.h
+++ b/content/renderer/pepper/pepper_audio_encoder_host.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_ENCODER_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_ENCODER_HOST_H_
+#include <stdint.h>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h
index 91a4b1f..40edffd 100644
--- a/content/renderer/pepper/pepper_audio_input_host.h
+++ b/content/renderer/pepper/pepper_audio_input_host.h
@@ -5,10 +5,13 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_INPUT_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_INPUT_HOST_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
diff --git a/content/renderer/pepper/pepper_broker.h b/content/renderer/pepper/pepper_broker.h
index 0703597..1140d4e 100644
--- a/content/renderer/pepper/pepper_broker.h
+++ b/content/renderer/pepper/pepper_broker.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_BROKER_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_BROKER_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/process/process.h"
#include "base/sync_socket.h"
diff --git a/content/renderer/pepper/pepper_broker_unittest.cc b/content/renderer/pepper/pepper_broker_unittest.cc
index 5267beb..d7949d8 100644
--- a/content/renderer/pepper/pepper_broker_unittest.cc
+++ b/content/renderer/pepper/pepper_broker_unittest.cc
@@ -9,6 +9,7 @@
#include <sys/socket.h>
#endif // defined(OS_POSIX)
+#include "build/build_config.h"
#include "content/test/mock_render_process.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/pepper/pepper_browser_connection.h b/content/renderer/pepper/pepper_browser_connection.h
index 241d612..6e5a3d6 100644
--- a/content/renderer/pepper/pepper_browser_connection.h
+++ b/content/renderer/pepper/pepper_browser_connection.h
@@ -5,12 +5,15 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_BROWSER_CONNECTION_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_BROWSER_CONNECTION_H_
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_frame_observer_tracker.h"
#include "ppapi/c/pp_file_info.h"
diff --git a/content/renderer/pepper/pepper_camera_device_host.h b/content/renderer/pepper/pepper_camera_device_host.h
index 3a13cac..4cce0a16 100644
--- a/content/renderer/pepper/pepper_camera_device_host.h
+++ b/content/renderer/pepper/pepper_camera_device_host.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_CAMERA_DEVICE_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_CAMERA_DEVICE_HOST_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/ppb_buffer_impl.h"
diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc
index 31d9b6d..3f8b34c 100644
--- a/content/renderer/pepper/pepper_compositor_host.cc
+++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/pepper_compositor_host.h"
+#include <stddef.h>
+
#include <limits>
#include "base/logging.h"
diff --git a/content/renderer/pepper/pepper_compositor_host.h b/content/renderer/pepper/pepper_compositor_host.h
index a954ffb..fab64176 100644
--- a/content/renderer/pepper/pepper_compositor_host.h
+++ b/content/renderer/pepper/pepper_compositor_host.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_HOST_H_
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ppapi/host/host_message_context.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
index 8429d8834..3ca97be 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.h b/content/renderer/pepper/pepper_device_enumeration_host_helper.h
index ea1a7fc..b93acf7 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper.h
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_
+#include <stdint.h>
+
#include <vector>
-#include "base/basictypes.h"
#include "base/callback_forward.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
index c51502e..1711fbb 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
@@ -2,11 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/renderer/pepper/pepper_device_enumeration_host_helper.h"
#include "ppapi/c/pp_errors.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc
index 7c19403..ea107682 100644
--- a/content/renderer/pepper/pepper_file_chooser_host.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -4,7 +4,10 @@
#include "content/renderer/pepper/pepper_file_chooser_host.h"
+#include <stddef.h>
+
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host.h b/content/renderer/pepper/pepper_file_chooser_host.h
index 4ae861a..9af556f 100644
--- a/content/renderer/pepper/pepper_file_chooser_host.h
+++ b/content/renderer/pepper/pepper_file_chooser_host.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_CHOOSER_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_FILE_CHOOSER_HOST_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
#include "ppapi/host/host_message_context.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
index 6d4a4d2..66b4dbd 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/files/file_path.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "content/common/view_messages.h"
#include "content/public/common/file_chooser_file_info.h"
#include "content/public/common/file_chooser_params.h"
@@ -82,7 +85,7 @@
ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
ppapi::host::HostMessageContext context(call_params);
- int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
+ int32_t result = chooser.OnResourceMessageReceived(show_msg, &context);
EXPECT_EQ(PP_OK_COMPLETIONPENDING, result);
// The render view should have sent a chooser request to the browser
@@ -145,7 +148,7 @@
ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
ppapi::host::HostMessageContext context(call_params);
- int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
+ int32_t result = chooser.OnResourceMessageReceived(show_msg, &context);
EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result);
}
diff --git a/content/renderer/pepper/pepper_file_ref_renderer_host.h b/content/renderer/pepper/pepper_file_ref_renderer_host.h
index cfa36b2..2435271c 100644
--- a/content/renderer/pepper/pepper_file_ref_renderer_host.h
+++ b/content/renderer/pepper/pepper_file_ref_renderer_host.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_REF_RENDERER_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_FILE_REF_RENDERER_HOST_H_
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/pepper_file_system_host.h"
diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc
index bce63a2..a3884e8 100644
--- a/content/renderer/pepper/pepper_file_system_host.cc
+++ b/content/renderer/pepper/pepper_file_system_host.cc
@@ -9,9 +9,9 @@
#include "content/child/child_thread_impl.h"
#include "content/child/fileapi/file_system_dispatcher.h"
#include "content/common/pepper_file_util.h"
-#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/public/renderer/render_view.h"
#include "content/public/renderer/renderer_ppapi_host.h"
+#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/host/dispatch_host_message.h"
#include "ppapi/host/ppapi_host.h"
@@ -77,7 +77,7 @@
}
void PepperFileSystemHost::DidFailOpenFileSystem(base::File::Error error) {
- int32 pp_error = ppapi::FileErrorToPepperError(error);
+ int32_t pp_error = ppapi::FileErrorToPepperError(error);
opened_ = (pp_error == PP_OK);
reply_context_.params.set_result(pp_error);
host()->SendReply(reply_context_, PpapiPluginMsg_FileSystem_OpenReply());
diff --git a/content/renderer/pepper/pepper_file_system_host.h b/content/renderer/pepper/pepper_file_system_host.h
index 23d7c49..cadd860 100644
--- a/content/renderer/pepper/pepper_file_system_host.h
+++ b/content/renderer/pepper/pepper_file_system_host.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_SYSTEM_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_FILE_SYSTEM_HOST_H_
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/files/file.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "ppapi/c/pp_file_info.h"
#include "ppapi/c/private/ppb_isolated_file_system_private.h"
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc
index efa3bc1..f33792d 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -4,12 +4,15 @@
#include "content/renderer/pepper/pepper_graphics_2d_host.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
#include "cc/resources/shared_bitmap.h"
#include "cc/resources/texture_mailbox.h"
#include "content/child/child_shared_bitmap_manager.h"
@@ -51,7 +54,7 @@
namespace {
-const int64 kOffscreenCallbackDelayMs = 1000 / 30; // 30 fps
+const int64_t kOffscreenCallbackDelayMs = 1000 / 30; // 30 fps
// Converts a rect inside an image of the given dimensions. The rect may be
// NULL to indicate it should be the entire image. If the rect is outside of
@@ -70,13 +73,13 @@
return false;
// Check the max bounds, being careful of overflow.
- if (static_cast<int64>(rect->point.x) +
- static_cast<int64>(rect->size.width) >
- static_cast<int64>(image_width))
+ if (static_cast<int64_t>(rect->point.x) +
+ static_cast<int64_t>(rect->size.width) >
+ static_cast<int64_t>(image_width))
return false;
- if (static_cast<int64>(rect->point.y) +
- static_cast<int64>(rect->size.height) >
- static_cast<int64>(image_height))
+ if (static_cast<int64_t>(rect->point.y) +
+ static_cast<int64_t>(rect->size.height) >
+ static_cast<int64_t>(image_height))
return false;
*dest = gfx::Rect(
@@ -255,12 +258,12 @@
// Validate the bitmap position.
int x = top_left->x;
if (x < 0 ||
- static_cast<int64>(x) + static_cast<int64>(image_resource->width()) >
+ static_cast<int64_t>(x) + static_cast<int64_t>(image_resource->width()) >
image_data_->width())
return false;
int y = top_left->y;
if (y < 0 ||
- static_cast<int64>(y) + static_cast<int64>(image_resource->height()) >
+ static_cast<int64_t>(y) + static_cast<int64_t>(image_resource->height()) >
image_data_->height())
return false;
@@ -430,14 +433,14 @@
// Validate the bitmap position using the previously-validated rect, there
// should be no painted area outside of the image.
- int64 x64 = static_cast<int64>(top_left.x);
- int64 y64 = static_cast<int64>(top_left.y);
- if (x64 + static_cast<int64>(operation.paint_src_rect.x()) < 0 ||
- x64 + static_cast<int64>(operation.paint_src_rect.right()) >
+ int64_t x64 = static_cast<int64_t>(top_left.x);
+ int64_t y64 = static_cast<int64_t>(top_left.y);
+ if (x64 + static_cast<int64_t>(operation.paint_src_rect.x()) < 0 ||
+ x64 + static_cast<int64_t>(operation.paint_src_rect.right()) >
image_data_->width())
return PP_ERROR_BADARGUMENT;
- if (y64 + static_cast<int64>(operation.paint_src_rect.y()) < 0 ||
- y64 + static_cast<int64>(operation.paint_src_rect.bottom()) >
+ if (y64 + static_cast<int64_t>(operation.paint_src_rect.y()) < 0 ||
+ y64 + static_cast<int64_t>(operation.paint_src_rect.bottom()) >
image_data_->height())
return PP_ERROR_BADARGUMENT;
operation.paint_x = top_left.x;
@@ -461,8 +464,8 @@
// If we're being asked to scroll by more than the clip rect size, just
// ignore this scroll command and say it worked.
- int32 dx = amount.x;
- int32 dy = amount.y;
+ int32_t dx = amount.x;
+ int32_t dy = amount.y;
if (dx <= -image_data_->width() || dx >= image_data_->width() ||
dy <= -image_data_->height() || dy >= image_data_->height())
return PP_ERROR_BADARGUMENT;
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h
index 35b632b..29e55e94 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host.h
+++ b/content/renderer/pepper/pepper_graphics_2d_host.h
@@ -5,10 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_
+#include <stdint.h>
+
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
#include "ppapi/c/ppb_graphics_2d.h"
diff --git a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
index d817bab..75cefbeb 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
@@ -4,7 +4,9 @@
#include "content/renderer/pepper/pepper_graphics_2d_host.h"
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "content/renderer/pepper/gfx_conversion.h"
#include "content/renderer/pepper/mock_renderer_ppapi_host.h"
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h
index 34c9bf73e..81b14df 100644
--- a/content/renderer/pepper/pepper_hung_plugin_filter.h
+++ b/content/renderer/pepper/pepper_hung_plugin_filter.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_PEPPER_PEPPER_HUNG_PLUGIN_FILTER_H_
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "ipc/ipc_channel_proxy.h"
diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.h b/content/renderer/pepper/pepper_in_process_resource_creation.h
index 9f80757..520345c 100644
--- a/content/renderer/pepper/pepper_in_process_resource_creation.h
+++ b/content/renderer/pepper/pepper_in_process_resource_creation.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_IN_PROCESS_RESOURCE_CREATION_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_IN_PROCESS_RESOURCE_CREATION_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/pepper/resource_creation_impl.h"
#include "ppapi/proxy/connection.h"
diff --git a/content/renderer/pepper/pepper_in_process_router.h b/content/renderer/pepper/pepper_in_process_router.h
index 73865fc3..20e5b9a1 100644
--- a/content/renderer/pepper/pepper_in_process_router.h
+++ b/content/renderer/pepper/pepper_in_process_router.h
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/callback.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ppapi/c/pp_instance.h"
diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h
index 6fd8ded..c2ee4b9 100644
--- a/content/renderer/pepper/pepper_media_device_manager.h
+++ b/content/renderer/pepper/pepper_media_device_manager.h
@@ -7,6 +7,7 @@
#include <map>
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_frame_observer_tracker.h"
diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.h b/content/renderer/pepper/pepper_media_stream_audio_track_host.h
index 2e69c91..c14cd3b 100644
--- a/content/renderer/pepper/pepper_media_stream_audio_track_host.h
+++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.h
@@ -5,9 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_AUDIO_TRACK_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_AUDIO_TRACK_HOST_H_
+#include <stdint.h>
+
#include <deque>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.h b/content/renderer/pepper/pepper_media_stream_track_host_base.h
index ddfac9c..7e7714b 100644
--- a/content/renderer/pepper/pepper_media_stream_track_host_base.h
+++ b/content/renderer/pepper/pepper_media_stream_track_host_base.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_TRACK_HOST_BASE_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_TRACK_HOST_BASE_H_
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "ppapi/host/resource_host.h"
#include "ppapi/shared_impl/media_stream_buffer_manager.h"
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
index 2e7e2c2..7e237b87 100644
--- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc
+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -4,8 +4,11 @@
#include "content/renderer/pepper/pepper_media_stream_video_track_host.h"
+#include <stddef.h>
+
#include "base/base64.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/media_stream_video_track.h"
@@ -328,21 +331,21 @@
ppapi::MediaStreamBuffer::Video* pp_frame =
&(buffer_manager()->GetBufferPointer(index)->video);
- int32 y_stride = plugin_frame_size_.width();
- int32 uv_stride = (plugin_frame_size_.width() + 1) / 2;
- uint8* y_data = static_cast<uint8*>(pp_frame->data);
+ int32_t y_stride = plugin_frame_size_.width();
+ int32_t uv_stride = (plugin_frame_size_.width() + 1) / 2;
+ uint8_t* y_data = static_cast<uint8_t*>(pp_frame->data);
// Default to I420
- uint8* u_data = y_data + plugin_frame_size_.GetArea();
- uint8* v_data = y_data + (plugin_frame_size_.GetArea() * 5 / 4);
+ uint8_t* u_data = y_data + plugin_frame_size_.GetArea();
+ uint8_t* v_data = y_data + (plugin_frame_size_.GetArea() * 5 / 4);
if (plugin_frame_format_ == PP_VIDEOFRAME_FORMAT_YV12) {
// Swap u and v for YV12.
- uint8* tmp = u_data;
+ uint8_t* tmp = u_data;
u_data = v_data;
v_data = tmp;
}
- int64 ts_ms = static_cast<int64>(pp_frame->timestamp *
- base::Time::kMillisecondsPerSecond);
+ int64_t ts_ms = static_cast<int64_t>(pp_frame->timestamp *
+ base::Time::kMillisecondsPerSecond);
scoped_refptr<VideoFrame> frame = media::VideoFrame::WrapExternalYuvData(
FromPpapiFormat(plugin_frame_format_),
plugin_frame_size_,
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.h b/content/renderer/pepper/pepper_media_stream_video_track_host.h
index 4bb88db..81422146 100644
--- a/content/renderer/pepper/pepper_media_stream_video_track_host.h
+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/public/renderer/media_stream_video_sink.h"
#include "content/renderer/media/media_stream_video_source.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_input.h b/content/renderer/pepper/pepper_platform_audio_input.h
index 3b9f8bb..33eb7fc9 100644
--- a/content/renderer/pepper/pepper_platform_audio_input.h
+++ b/content/renderer/pepper/pepper_platform_audio_input.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output.h b/content/renderer/pepper/pepper_platform_audio_output.h
index f4da8b4..a5bd3d9 100644
--- a/content/renderer/pepper/pepper_platform_audio_output.h
+++ b/content/renderer/pepper/pepper_platform_audio_output.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_output_ipc.h"
diff --git a/content/renderer/pepper/pepper_platform_camera_device.h b/content/renderer/pepper/pepper_platform_camera_device.h
index bccfdb3..649fa2f7 100644
--- a/content/renderer/pepper/pepper_platform_camera_device.h
+++ b/content/renderer/pepper/pepper_platform_camera_device.h
@@ -7,9 +7,9 @@
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/pepper/pepper_platform_video_capture.h b/content/renderer/pepper/pepper_platform_video_capture.h
index ccf91d0..b2e58ea 100644
--- a/content/renderer/pepper/pepper_platform_video_capture.h
+++ b/content/renderer/pepper/pepper_platform_video_capture.h
@@ -7,9 +7,9 @@
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index d23f9f96..58660764 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -18,6 +18,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/texture_layer.h"
#include "content/common/content_constants_internal.h"
@@ -767,7 +768,7 @@
if (!texture_layer_.get())
return;
gpu::Mailbox mailbox;
- uint32 sync_point = 0;
+ uint32_t sync_point = 0;
bound_graphics_3d_->GetBackingMailbox(&mailbox, &sync_point);
DCHECK(!mailbox.IsZero());
DCHECK_NE(sync_point, 0u);
@@ -1958,7 +1959,7 @@
return;
gpu::Mailbox mailbox;
- uint32 sync_point = 0;
+ uint32_t sync_point = 0;
if (bound_graphics_3d_.get()) {
bound_graphics_3d_->GetBackingMailbox(&mailbox, &sync_point);
DCHECK_EQ(mailbox.IsZero(), sync_point == 0);
@@ -2391,13 +2392,13 @@
// Therefore, |content_decryptor_delegate_| must have been initialized when
// the following methods are called.
void PepperPluginInstanceImpl::PromiseResolved(PP_Instance instance,
- uint32 promise_id) {
+ uint32_t promise_id) {
content_decryptor_delegate_->OnPromiseResolved(promise_id);
}
void PepperPluginInstanceImpl::PromiseResolvedWithSession(
PP_Instance instance,
- uint32 promise_id,
+ uint32_t promise_id,
PP_Var session_id_var) {
content_decryptor_delegate_->OnPromiseResolvedWithSession(promise_id,
session_id_var);
@@ -2405,9 +2406,9 @@
void PepperPluginInstanceImpl::PromiseRejected(
PP_Instance instance,
- uint32 promise_id,
+ uint32_t promise_id,
PP_CdmExceptionCode exception_code,
- uint32 system_code,
+ uint32_t system_code,
PP_Var error_description_var) {
content_decryptor_delegate_->OnPromiseRejected(
promise_id, exception_code, system_code, error_description_var);
@@ -2449,7 +2450,7 @@
PP_Instance instance,
PP_Var session_id_var,
PP_CdmExceptionCode exception_code,
- uint32 system_code,
+ uint32_t system_code,
PP_Var error_description_var) {
content_decryptor_delegate_->OnLegacySessionError(
session_id_var, exception_code, system_code, error_description_var);
@@ -2540,7 +2541,7 @@
blink::WebVector<blink::WebRect> tickmarks_converted(
static_cast<size_t>(count));
- for (uint32 i = 0; i < count; ++i) {
+ for (uint32_t i = 0; i < count; ++i) {
tickmarks_converted[i] = blink::WebRect(tickmarks[i].point.x,
tickmarks[i].point.y,
tickmarks[i].size.width,
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h
index 381e5b8..54d29a0 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.h
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <list>
#include <set>
#include <string>
@@ -12,10 +15,12 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
+#include "build/build_config.h"
#include "cc/layers/content_layer_client.h"
#include "cc/layers/layer.h"
#include "cc/layers/texture_layer_client.h"
@@ -458,14 +463,14 @@
PP_URLComponents_Dev* components) override;
// PPB_ContentDecryptor_Private implementation.
- void PromiseResolved(PP_Instance instance, uint32 promise_id) override;
+ void PromiseResolved(PP_Instance instance, uint32_t promise_id) override;
void PromiseResolvedWithSession(PP_Instance instance,
- uint32 promise_id,
+ uint32_t promise_id,
PP_Var session_id_var) override;
void PromiseRejected(PP_Instance instance,
- uint32 promise_id,
+ uint32_t promise_id,
PP_CdmExceptionCode exception_code,
- uint32 system_code,
+ uint32_t system_code,
PP_Var error_description_var) override;
void SessionMessage(PP_Instance instance,
PP_Var session_id_var,
@@ -485,7 +490,7 @@
void LegacySessionError(PP_Instance instance,
PP_Var session_id_var,
PP_CdmExceptionCode exception_code,
- uint32 system_code,
+ uint32_t system_code,
PP_Var error_description_var) override;
void DeliverBlock(PP_Instance instance,
PP_Resource decrypted_block,
diff --git a/content/renderer/pepper/pepper_plugin_instance_metrics.cc b/content/renderer/pepper/pepper_plugin_instance_metrics.cc
index 1c8a0e2..548f64a8 100644
--- a/content/renderer/pepper/pepper_plugin_instance_metrics.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_metrics.cc
@@ -4,8 +4,11 @@
#include "content/renderer/pepper/pepper_plugin_instance_metrics.h"
+#include <stddef.h>
+
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
+#include "build/build_config.h"
#include "ppapi/shared_impl/ppapi_preferences.h"
#if defined(OS_WIN)
diff --git a/content/renderer/pepper/pepper_plugin_registry.cc b/content/renderer/pepper/pepper_plugin_registry.cc
index 38a4aa3..51c49ac 100644
--- a/content/renderer/pepper/pepper_plugin_registry.cc
+++ b/content/renderer/pepper/pepper_plugin_registry.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/pepper_plugin_registry.h"
+#include <stddef.h>
+
#include "base/logging.h"
#include "content/common/pepper_plugin_list.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
diff --git a/content/renderer/pepper/pepper_plugin_registry.h b/content/renderer/pepper/pepper_plugin_registry.h
index 83319a9b..ca534078 100644
--- a/content/renderer/pepper/pepper_plugin_registry.h
+++ b/content/renderer/pepper/pepper_plugin_registry.h
@@ -8,6 +8,7 @@
#include <list>
#include <map>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/public/common/pepper_plugin_info.h"
diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
index 7a5a0c1..8b294ab1 100644
--- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
@@ -4,6 +4,7 @@
#include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
+#include "build/build_config.h"
#include "content/child/child_process.h"
#include "content/common/sandbox_util.h"
diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h
index 8dbbb9b..7a8ce1a 100644
--- a/content/renderer/pepper/pepper_try_catch.h
+++ b/content/renderer/pepper/pepper_try_catch.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_TRY_CATCH_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_TRY_CATCH_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "ppapi/c/pp_var.h"
diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc
index 5b08f0a..6f63a639 100644
--- a/content/renderer/pepper/pepper_url_loader_host.cc
+++ b/content/renderer/pepper/pepper_url_loader_host.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/pepper_url_loader_host.h"
+#include <stddef.h>
+
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
#include "content/renderer/pepper/url_request_info_util.h"
diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h
index 8ea3c2e..8f820e10 100644
--- a/content/renderer/pepper/pepper_url_loader_host.h
+++ b/content/renderer/pepper/pepper_url_loader_host.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_URL_LOADER_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_URL_LOADER_HOST_H_
+#include <stdint.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc
index 22b0389..4e08661 100644
--- a/content/renderer/pepper/pepper_video_capture_host.cc
+++ b/content/renderer/pepper/pepper_video_capture_host.cc
@@ -144,13 +144,13 @@
// TODO(ihf): handle size mismatches gracefully here.
return;
}
- uint8* dst = reinterpret_cast<uint8*>(buffers_[i].data);
+ uint8_t* dst = reinterpret_cast<uint8_t*>(buffers_[i].data);
static_assert(media::VideoFrame::kYPlane == 0, "y plane should be 0");
static_assert(media::VideoFrame::kUPlane == 1, "u plane should be 1");
static_assert(media::VideoFrame::kVPlane == 2, "v plane should be 2");
for (size_t j = 0; j < media::VideoFrame::NumPlanes(frame->format());
++j) {
- const uint8* src = frame->visible_data(j);
+ const uint8_t* src = frame->visible_data(j);
const size_t row_bytes = frame->row_bytes(j);
const size_t src_stride = frame->stride(j);
for (int k = 0; k < frame->rows(j); ++k) {
diff --git a/content/renderer/pepper/pepper_video_capture_host.h b/content/renderer/pepper/pepper_video_capture_host.h
index 24061b5e7..01d678b 100644
--- a/content/renderer/pepper/pepper_video_capture_host.h
+++ b/content/renderer/pepper/pepper_video_capture_host.h
@@ -5,7 +5,11 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/media/video_capture.h"
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc
index 2b5f584..50403a69 100644
--- a/content/renderer/pepper/pepper_video_decoder_host.cc
+++ b/content/renderer/pepper/pepper_video_decoder_host.cc
@@ -4,8 +4,11 @@
#include "content/renderer/pepper/pepper_video_decoder_host.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/memory/shared_memory.h"
+#include "build/build_config.h"
#include "content/common/gpu/client/command_buffer_proxy_impl.h"
#include "content/common/pepper_file_util.h"
#include "content/public/common/content_client.h"
@@ -342,9 +345,9 @@
}
void PepperVideoDecoderHost::ProvidePictureBuffers(
- uint32 requested_num_of_buffers,
+ uint32_t requested_num_of_buffers,
const gfx::Size& dimensions,
- uint32 texture_target) {
+ uint32_t texture_target) {
RequestTextures(std::max(min_picture_count_, requested_num_of_buffers),
dimensions,
texture_target,
@@ -367,7 +370,7 @@
picture.picture_buffer_id(), visible_rect));
}
-void PepperVideoDecoderHost::DismissPictureBuffer(int32 picture_buffer_id) {
+void PepperVideoDecoderHost::DismissPictureBuffer(int32_t picture_buffer_id) {
PictureBufferMap::iterator it = picture_buffer_map_.find(picture_buffer_id);
DCHECK(it != picture_buffer_map_.end());
@@ -386,7 +389,7 @@
}
void PepperVideoDecoderHost::NotifyEndOfBitstreamBuffer(
- int32 bitstream_buffer_id) {
+ int32_t bitstream_buffer_id) {
PendingDecodeList::iterator it = GetPendingDecodeById(bitstream_buffer_id);
if (it == pending_decodes_.end()) {
NOTREACHED();
@@ -448,9 +451,9 @@
}
void PepperVideoDecoderHost::RequestTextures(
- uint32 requested_num_of_buffers,
+ uint32_t requested_num_of_buffers,
const gfx::Size& dimensions,
- uint32 texture_target,
+ uint32_t texture_target,
const std::vector<gpu::Mailbox>& mailboxes) {
host()->SendUnsolicitedReply(
pp_resource(),
diff --git a/content/renderer/pepper/pepper_video_decoder_host.h b/content/renderer/pepper/pepper_video_decoder_host.h
index b82a0cc4..7a63d4f5 100644
--- a/content/renderer/pepper/pepper_video_decoder_host.h
+++ b/content/renderer/pepper/pepper_video_decoder_host.h
@@ -5,13 +5,15 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
+#include <stdint.h>
+
#include <list>
#include <map>
#include <set>
#include <vector>
-#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "content/common/content_export.h"
@@ -70,12 +72,12 @@
ppapi::host::HostMessageContext* context) override;
// media::VideoDecodeAccelerator::Client implementation.
- void ProvidePictureBuffers(uint32 requested_num_of_buffers,
+ void ProvidePictureBuffers(uint32_t requested_num_of_buffers,
const gfx::Size& dimensions,
- uint32 texture_target) override;
- void DismissPictureBuffer(int32 picture_buffer_id) override;
+ uint32_t texture_target) override;
+ void DismissPictureBuffer(int32_t picture_buffer_id) override;
void PictureReady(const media::Picture& picture) override;
- void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override;
+ void NotifyEndOfBitstreamBuffer(int32_t bitstream_buffer_id) override;
void NotifyFlushDone() override;
void NotifyResetDone() override;
void NotifyError(media::VideoDecodeAccelerator::Error error) override;
@@ -103,9 +105,9 @@
// These methods are needed by VideoDecodeShim, to look like a
// VideoDecodeAccelerator.
const uint8_t* DecodeIdToAddress(uint32_t decode_id);
- void RequestTextures(uint32 requested_num_of_buffers,
+ void RequestTextures(uint32_t requested_num_of_buffers,
const gfx::Size& dimensions,
- uint32 texture_target,
+ uint32_t texture_target,
const std::vector<gpu::Mailbox>& mailboxes);
// Tries to initialize software decoder. Returns true on success.
diff --git a/content/renderer/pepper/pepper_video_destination_host.cc b/content/renderer/pepper/pepper_video_destination_host.cc
index 0978653..3f682db 100644
--- a/content/renderer/pepper/pepper_video_destination_host.cc
+++ b/content/renderer/pepper/pepper_video_destination_host.cc
@@ -82,7 +82,7 @@
if (!frame_writer_.get())
return PP_ERROR_FAILED;
- // Convert PP_TimeTicks (a double, in seconds) to a video timestamp (int64,
+ // Convert PP_TimeTicks (a double, in seconds) to a video timestamp (int64_t,
// nanoseconds).
const int64_t timestamp_ns =
static_cast<int64_t>(timestamp * base::Time::kNanosecondsPerSecond);
diff --git a/content/renderer/pepper/pepper_video_destination_host.h b/content/renderer/pepper/pepper_video_destination_host.h
index 3b2485a..75208a7f 100644
--- a/content/renderer/pepper/pepper_video_destination_host.h
+++ b/content/renderer/pepper/pepper_video_destination_host.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DESTINATION_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DESTINATION_HOST_H_
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index 0e1a199..1bb34a2 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/memory/shared_memory.h"
#include "base/numerics/safe_math.h"
+#include "build/build_config.h"
#include "content/common/gpu/client/command_buffer_proxy_impl.h"
#include "content/common/gpu/media/gpu_video_accelerator_util.h"
#include "content/common/pepper_file_util.h"
@@ -421,7 +422,7 @@
AllocateVideoFrames();
}
-void PepperVideoEncoderHost::BitstreamBufferReady(int32 buffer_id,
+void PepperVideoEncoderHost::BitstreamBufferReady(int32_t buffer_id,
size_t payload_size,
bool key_frame) {
DCHECK(RenderThreadImpl::current());
@@ -499,7 +500,7 @@
if (!channel_)
return false;
- std::vector<int32> attribs(1, PP_GRAPHICS3DATTRIB_NONE);
+ std::vector<int32_t> attribs(1, PP_GRAPHICS3DATTRIB_NONE);
command_buffer_ = channel_->CreateOffscreenCommandBuffer(
gfx::Size(), nullptr, GpuChannelHost::kDefaultStreamId,
GpuChannelHost::kDefaultStreamPriority, attribs, GURL::EmptyGURL(),
@@ -623,13 +624,13 @@
ppapi::MediaStreamBuffer* buffer = buffer_manager_.GetBufferPointer(frame_id);
DCHECK(buffer);
- uint32_t shm_offset = static_cast<uint8*>(buffer->video.data) -
- static_cast<uint8*>(buffer_manager_.shm()->memory());
+ uint32_t shm_offset = static_cast<uint8_t*>(buffer->video.data) -
+ static_cast<uint8_t*>(buffer_manager_.shm()->memory());
scoped_refptr<media::VideoFrame> frame =
media::VideoFrame::WrapExternalSharedMemory(
media_input_format_, input_coded_size_, gfx::Rect(input_coded_size_),
- input_coded_size_, static_cast<uint8*>(buffer->video.data),
+ input_coded_size_, static_cast<uint8_t*>(buffer->video.data),
buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset,
base::TimeDelta());
frame->AddDestructionObserver(
@@ -658,10 +659,10 @@
PpapiPluginMsg_VideoEncoder_NotifyError(encoder_last_error_));
}
-uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32 buffer_id) {
+uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32_t buffer_id) {
DCHECK(RenderThreadImpl::current());
DCHECK_GE(buffer_id, 0);
- DCHECK_LT(buffer_id, static_cast<int32>(shm_buffers_.size()));
+ DCHECK_LT(buffer_id, static_cast<int32_t>(shm_buffers_.size()));
return static_cast<uint8_t*>(shm_buffers_[buffer_id]->shm->memory());
}
diff --git a/content/renderer/pepper/pepper_video_encoder_host.h b/content/renderer/pepper/pepper_video_encoder_host.h
index 39f98ef..5bc8d70 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.h
+++ b/content/renderer/pepper/pepper_video_encoder_host.h
@@ -5,6 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
@@ -59,7 +63,7 @@
void RequireBitstreamBuffers(unsigned int input_count,
const gfx::Size& input_coded_size,
size_t output_buffer_size) override;
- void BitstreamBufferReady(int32 bitstream_buffer_id,
+ void BitstreamBufferReady(int32_t bitstream_buffer_id,
size_t payload_size,
bool key_frame) override;
void NotifyError(media::VideoEncodeAccelerator::Error error) override;
@@ -112,7 +116,7 @@
void NotifyPepperError(int32_t error);
// Helper method for VideoEncoderShim.
- uint8_t* ShmHandleToAddress(int32 buffer_id);
+ uint8_t* ShmHandleToAddress(int32_t buffer_id);
// Non-owning pointer.
RendererPpapiHost* renderer_ppapi_host_;
diff --git a/content/renderer/pepper/pepper_video_source_host.h b/content/renderer/pepper/pepper_video_source_host.h
index 8469fc9..0b5b0a1 100644
--- a/content/renderer/pepper/pepper_video_source_host.h
+++ b/content/renderer/pepper/pepper_video_source_host.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_SOURCE_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_SOURCE_HOST_H_
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/content/renderer/pepper/pepper_webplugin_impl.cc b/content/renderer/pepper/pepper_webplugin_impl.cc
index 38e25e5..9a846d0 100644
--- a/content/renderer/pepper/pepper_webplugin_impl.cc
+++ b/content/renderer/pepper/pepper_webplugin_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/pepper_webplugin_impl.h"
+#include <stddef.h>
+
#include <cmath>
#include "base/debug/crash_logging.h"
diff --git a/content/renderer/pepper/pepper_webplugin_impl.h b/content/renderer/pepper/pepper_webplugin_impl.h
index 5bfa988..d8ee01d 100644
--- a/content/renderer/pepper/pepper_webplugin_impl.h
+++ b/content/renderer/pepper/pepper_webplugin_impl.h
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner_helpers.h"
diff --git a/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc b/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc
index 6dd2e0a..42839b56 100644
--- a/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc
+++ b/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/command_line.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_constants.h"
diff --git a/content/renderer/pepper/pepper_websocket_host.h b/content/renderer/pepper/pepper_websocket_host.h
index ee99667..c0106ad 100644
--- a/content/renderer/pepper/pepper_websocket_host.h
+++ b/content/renderer/pepper/pepper_websocket_host.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_PEPPER_PEPPER_WEBSOCKET_HOST_H_
#define CONTENT_RENDERER_PEPPER_PEPPER_WEBSOCKET_HOST_H_
+#include <stdint.h>
+
#include <queue>
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
index 223b8481..629d99f3 100644
--- a/content/renderer/pepper/plugin_module.cc
+++ b/content/renderer/pepper/plugin_module.cc
@@ -4,6 +4,9 @@
#include "content/renderer/pepper/plugin_module.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <set>
#include "base/bind.h"
diff --git a/content/renderer/pepper/plugin_module.h b/content/renderer/pepper/plugin_module.h
index 535ee257..807a93a 100644
--- a/content/renderer/pepper/plugin_module.h
+++ b/content/renderer/pepper/plugin_module.h
@@ -9,8 +9,8 @@
#include <set>
#include <string>
-#include "base/basictypes.h"
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/content/renderer/pepper/plugin_object.cc b/content/renderer/pepper/plugin_object.cc
index 1943b10..c8c6d0f 100644
--- a/content/renderer/pepper/plugin_object.cc
+++ b/content/renderer/pepper/plugin_object.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/plugin_object.h"
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
diff --git a/content/renderer/pepper/plugin_object.h b/content/renderer/pepper/plugin_object.h
index d5502d8..118e1cbe 100644
--- a/content/renderer/pepper/plugin_object.h
+++ b/content/renderer/pepper/plugin_object.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "gin/interceptor.h"
#include "gin/wrappable.h"
diff --git a/content/renderer/pepper/plugin_power_saver_helper.h b/content/renderer/pepper/plugin_power_saver_helper.h
index 1b97006..95fbc88 100644
--- a/content/renderer/pepper/plugin_power_saver_helper.h
+++ b/content/renderer/pepper/plugin_power_saver_helper.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/callback.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc b/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc
index 9e42241..d701c31b 100644
--- a/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc
+++ b/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/macros.h"
#include "base/run_loop.h"
#include "content/common/frame_messages.h"
#include "content/common/view_message_enums.h"
diff --git a/content/renderer/pepper/ppb_audio_impl.h b/content/renderer/pepper/ppb_audio_impl.h
index 130a6f3c..311dfb93 100644
--- a/content/renderer/pepper/ppb_audio_impl.h
+++ b/content/renderer/pepper/ppb_audio_impl.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
diff --git a/content/renderer/pepper/ppb_broker_impl.h b/content/renderer/pepper/ppb_broker_impl.h
index b43d3a6..54a1680a 100644
--- a/content/renderer/pepper/ppb_broker_impl.h
+++ b/content/renderer/pepper/ppb_broker_impl.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/process/process.h"
#include "ipc/ipc_listener.h"
diff --git a/content/renderer/pepper/ppb_buffer_impl.h b/content/renderer/pepper/ppb_buffer_impl.h
index 19fbcb39..a98deb7 100644
--- a/content/renderer/pepper/ppb_buffer_impl.h
+++ b/content/renderer/pepper/ppb_buffer_impl.h
@@ -5,7 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
diff --git a/content/renderer/pepper/ppb_flash_message_loop_impl.h b/content/renderer/pepper/ppb_flash_message_loop_impl.h
index 29c4e1b1..dc458d4 100644
--- a/content/renderer/pepper/ppb_flash_message_loop_impl.h
+++ b/content/renderer/pepper/ppb_flash_message_loop_impl.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_FLASH_MESSAGE_LOOP_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_FLASH_MESSAGE_LOOP_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_flash_message_loop_api.h"
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc
index 783f800..3fc3a846 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -41,8 +41,8 @@
namespace {
-const int32 kCommandBufferSize = 1024 * 1024;
-const int32 kTransferBufferSize = 1024 * 1024;
+const int32_t kCommandBufferSize = 1024 * 1024;
+const int32_t kTransferBufferSize = 1024 * 1024;
} // namespace
@@ -171,7 +171,7 @@
return command_buffer_.get();
}
-int32 PPB_Graphics3D_Impl::DoSwapBuffers() {
+int32_t PPB_Graphics3D_Impl::DoSwapBuffers() {
DCHECK(command_buffer_);
// We do not have a GLES2 implementation when using an OOP proxy.
// The plugin-side proxy is responsible for adding the SwapBuffers command
@@ -254,7 +254,7 @@
return false;
gfx::Size surface_size;
- std::vector<int32> attribs;
+ std::vector<int32_t> attribs;
gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
// TODO(alokp): Change GpuChannelHost::CreateOffscreenCommandBuffer()
// interface to accept width and height in the attrib_list so that
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.h b/content/renderer/pepper/ppb_graphics_3d_impl.h
index 8fbde07..3d103f2 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.h
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/memory/weak_ptr.h"
#include "gpu/command_buffer/common/mailbox.h"
@@ -35,7 +38,7 @@
// PPB_Graphics3D_API trusted implementation.
PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override;
scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size,
- int32* id) override;
+ int32_t* id) override;
PP_Bool DestroyTransferBuffer(int32_t id) override;
PP_Bool Flush(int32_t put_offset) override;
gpu::CommandBuffer::State WaitForTokenInRange(int32_t start,
@@ -57,7 +60,7 @@
// These messages are used to send Flush callbacks to the plugin.
void ViewInitiatedPaint();
- void GetBackingMailbox(gpu::Mailbox* mailbox, uint32* sync_point) {
+ void GetBackingMailbox(gpu::Mailbox* mailbox, uint32_t* sync_point) {
*mailbox = mailbox_;
*sync_point = sync_point_;
}
@@ -71,7 +74,7 @@
// ppapi::PPB_Graphics3D_Shared overrides.
gpu::CommandBuffer* GetCommandBuffer() override;
gpu::GpuControl* GetGpuControl() override;
- int32 DoSwapBuffers() override;
+ int32_t DoSwapBuffers() override;
private:
explicit PPB_Graphics3D_Impl(PP_Instance instance);
@@ -96,7 +99,7 @@
bool commit_pending_;
gpu::Mailbox mailbox_;
- uint32 sync_point_;
+ uint32_t sync_point_;
bool has_alpha_;
scoped_refptr<GpuChannelHost> channel_;
scoped_ptr<CommandBufferProxyImpl> command_buffer_;
diff --git a/content/renderer/pepper/ppb_image_data_impl.cc b/content/renderer/pepper/ppb_image_data_impl.cc
index a7c5f0a..56cc3731 100644
--- a/content/renderer/pepper/ppb_image_data_impl.cc
+++ b/content/renderer/pepper/ppb_image_data_impl.cc
@@ -64,8 +64,8 @@
return false; // Only support this one format for now.
if (width <= 0 || height <= 0)
return false;
- if (static_cast<int64>(width) * static_cast<int64>(height) >=
- std::numeric_limits<int32>::max() / 4)
+ if (static_cast<int64_t>(width) * static_cast<int64_t>(height) >=
+ std::numeric_limits<int32_t>::max() / 4)
return false; // Prevent overflow of signed 32-bit ints.
format_ = format;
@@ -142,7 +142,7 @@
// TODO(brettw) use init_to_zero when we implement caching.
width_ = width;
height_ = height;
- uint32 buffer_size = width_ * height_ * 4;
+ uint32_t buffer_size = width_ * height_ * 4;
scoped_ptr<base::SharedMemory> shared_memory =
RenderThread::Get()->HostAllocateSharedMemoryBuffer(buffer_size);
if (!shared_memory)
diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h
index b7a4540..3168f0d 100644
--- a/content/renderer/pepper/ppb_image_data_impl.h
+++ b/content/renderer/pepper/ppb_image_data_impl.h
@@ -5,7 +5,9 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "content/common/content_export.h"
@@ -173,7 +175,7 @@
// skia_bitmap_ is backed by shared_memory_.
SkBitmap skia_bitmap_;
scoped_ptr<SkCanvas> skia_canvas_;
- uint32 map_count_;
+ uint32_t map_count_;
DISALLOW_COPY_AND_ASSIGN(ImageDataSimpleBackend);
};
diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc
index dd2c80b..7426ca4 100644
--- a/content/renderer/pepper/ppb_var_deprecated_impl.cc
+++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc
@@ -4,6 +4,9 @@
#include "content/renderer/pepper/ppb_var_deprecated_impl.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <limits>
#include "content/renderer/pepper/host_globals.h"
diff --git a/content/renderer/pepper/ppb_video_decoder_impl.cc b/content/renderer/pepper/ppb_video_decoder_impl.cc
index 8be5e80a..d4c067fe 100644
--- a/content/renderer/pepper/ppb_video_decoder_impl.cc
+++ b/content/renderer/pepper/ppb_video_decoder_impl.cc
@@ -176,7 +176,7 @@
no_of_buffers);
std::vector<media::PictureBuffer> wrapped_buffers;
- for (uint32 i = 0; i < no_of_buffers; i++) {
+ for (uint32_t i = 0; i < no_of_buffers; i++) {
PP_PictureBuffer_Dev in_buf = buffers[i];
DCHECK_GE(in_buf.id, 0);
media::PictureBuffer buffer(
@@ -234,9 +234,9 @@
}
void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
- uint32 requested_num_of_buffers,
+ uint32_t requested_num_of_buffers,
const gfx::Size& dimensions,
- uint32 texture_target) {
+ uint32_t texture_target) {
DCHECK(RenderThreadImpl::current());
if (!GetPPP())
return;
@@ -260,7 +260,7 @@
GetPPP()->PictureReady(pp_instance(), pp_resource(), &output);
}
-void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32 picture_buffer_id) {
+void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32_t picture_buffer_id) {
DCHECK(RenderThreadImpl::current());
if (!GetPPP())
return;
@@ -287,7 +287,7 @@
}
void PPB_VideoDecoder_Impl::NotifyEndOfBitstreamBuffer(
- int32 bitstream_buffer_id) {
+ int32_t bitstream_buffer_id) {
DCHECK(RenderThreadImpl::current());
RunBitstreamBufferCallback(bitstream_buffer_id, PP_OK);
}
diff --git a/content/renderer/pepper/ppb_video_decoder_impl.h b/content/renderer/pepper/ppb_video_decoder_impl.h
index 094bcff..b9f4d6a 100644
--- a/content/renderer/pepper/ppb_video_decoder_impl.h
+++ b/content/renderer/pepper/ppb_video_decoder_impl.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_
#define CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "media/video/video_decode_accelerator.h"
#include "ppapi/c/dev/pp_video_dev.h"
@@ -42,14 +44,14 @@
void Destroy() override;
// media::VideoDecodeAccelerator::Client implementation.
- void ProvidePictureBuffers(uint32 requested_num_of_buffers,
+ void ProvidePictureBuffers(uint32_t requested_num_of_buffers,
const gfx::Size& dimensions,
- uint32 texture_target) override;
- void DismissPictureBuffer(int32 picture_buffer_id) override;
+ uint32_t texture_target) override;
+ void DismissPictureBuffer(int32_t picture_buffer_id) override;
void PictureReady(const media::Picture& picture) override;
void NotifyError(media::VideoDecodeAccelerator::Error error) override;
void NotifyFlushDone() override;
- void NotifyEndOfBitstreamBuffer(int32 buffer_id) override;
+ void NotifyEndOfBitstreamBuffer(int32_t buffer_id) override;
void NotifyResetDone() override;
private:
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.h b/content/renderer/pepper/renderer_ppapi_host_impl.h
index fdadd08..f73100b 100644
--- a/content/renderer/pepper/renderer_ppapi_host_impl.h
+++ b/content/renderer/pepper/renderer_ppapi_host_impl.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_PEPPER_RENDERER_PPAPI_HOST_IMPL_H_
#define CONTENT_RENDERER_PEPPER_RENDERER_PPAPI_HOST_IMPL_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
diff --git a/content/renderer/pepper/resource_converter.cc b/content/renderer/pepper/resource_converter.cc
index c4d4cf0..7e66b71 100644
--- a/content/renderer/pepper/resource_converter.cc
+++ b/content/renderer/pepper/resource_converter.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/resource_converter.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "content/public/renderer/renderer_ppapi_host.h"
diff --git a/content/renderer/pepper/resource_converter.h b/content/renderer/pepper/resource_converter.h
index 2c20d7e..ee820de4 100644
--- a/content/renderer/pepper/resource_converter.h
+++ b/content/renderer/pepper/resource_converter.h
@@ -7,9 +7,9 @@
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "content/renderer/pepper/host_resource_var.h"
diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc
index 929f8ad7..c76d0b1 100644
--- a/content/renderer/pepper/resource_creation_impl.cc
+++ b/content/renderer/pepper/resource_creation_impl.cc
@@ -4,6 +4,7 @@
#include "content/renderer/pepper/resource_creation_impl.h"
+#include "build/build_config.h"
#include "content/common/content_switches_internal.h"
#include "content/renderer/pepper/ppb_audio_impl.h"
#include "content/renderer/pepper/ppb_broker_impl.h"
diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h
index 5f7cc43..3e44cee 100644
--- a/content/renderer/pepper/resource_creation_impl.h
+++ b/content/renderer/pepper/resource_creation_impl.h
@@ -5,8 +5,10 @@
#ifndef CONTENT_RENDERER_PEPPER_RESOURCE_CREATION_IMPL_H_
#define CONTENT_RENDERER_PEPPER_RESOURCE_CREATION_IMPL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "ppapi/thunk/resource_creation_api.h"
namespace content {
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc
index 4b70190b..157fc9c 100644
--- a/content/renderer/pepper/url_request_info_util.cc
+++ b/content/renderer/pepper/url_request_info_util.cc
@@ -4,6 +4,9 @@
#include "content/renderer/pepper/url_request_info_util.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "content/child/request_extra_data.h"
diff --git a/content/renderer/pepper/url_response_info_util.cc b/content/renderer/pepper/url_response_info_util.cc
index b2bd40b7..d657800 100644
--- a/content/renderer/pepper/url_response_info_util.cc
+++ b/content/renderer/pepper/url_response_info_util.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/url_response_info_util.h"
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/location.h"
diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc
index 536827b..eff2cabe 100644
--- a/content/renderer/pepper/v8_var_converter.cc
+++ b/content/renderer/pepper/v8_var_converter.cc
@@ -4,6 +4,9 @@
#include "content/renderer/pepper/v8_var_converter.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
#include <stack>
#include <string>
@@ -377,7 +380,7 @@
if (did_create && CanHaveChildren(child_var))
stack.push(child_var);
v8::TryCatch try_catch(isolate);
- v8_array->Set(static_cast<uint32>(i), child_v8);
+ v8_array->Set(static_cast<uint32_t>(i), child_v8);
if (try_catch.HasCaught()) {
LOG(ERROR) << "Setter for index " << i << " threw an exception.";
return false;
@@ -516,7 +519,7 @@
return false;
}
- for (uint32 i = 0; i < v8_array->Length(); ++i) {
+ for (uint32_t i = 0; i < v8_array->Length(); ++i) {
v8::TryCatch try_catch(context->GetIsolate());
v8::Local<v8::Value> child_v8 = v8_array->Get(i);
if (try_catch.HasCaught())
@@ -554,7 +557,7 @@
}
v8::Local<v8::Array> property_names(v8_object->GetOwnPropertyNames());
- for (uint32 i = 0; i < property_names->Length(); ++i) {
+ for (uint32_t i = 0; i < property_names->Length(); ++i) {
v8::Local<v8::Value> key(property_names->Get(i));
// Extend this test to cover more types as necessary and if sensible.
diff --git a/content/renderer/pepper/v8_var_converter.h b/content/renderer/pepper/v8_var_converter.h
index 6e537268..4a65bea6 100644
--- a/content/renderer/pepper/v8_var_converter.h
+++ b/content/renderer/pepper/v8_var_converter.h
@@ -5,14 +5,14 @@
#ifndef CONTENT_RENDERER_PEPPER_V8_VAR_CONVERTER_H_
#define CONTENT_RENDERER_PEPPER_V8_VAR_CONVERTER_H_
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "content/common/content_export.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/shared_impl/scoped_pp_var.h"
#include "v8/include/v8.h"
-#include "content/common/content_export.h"
namespace content {
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc
index 6742060..cb68d6c 100644
--- a/content/renderer/pepper/v8_var_converter_unittest.cc
+++ b/content/renderer/pepper/v8_var_converter_unittest.cc
@@ -4,6 +4,9 @@
#include "content/renderer/pepper/v8_var_converter.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <cmath>
#include "base/logging.h"
@@ -113,7 +116,7 @@
v8::Local<v8::Array> v8_array = val.As<v8::Array>();
if (v8_array->Length() != array_var->elements().size())
return false;
- for (uint32 i = 0; i < v8_array->Length(); ++i) {
+ for (uint32_t i = 0; i < v8_array->Length(); ++i) {
v8::Local<v8::Value> child_v8 = v8_array->Get(i);
if (!Equals(array_var->elements()[i].get(), child_v8, visited_ids))
return false;
@@ -133,7 +136,7 @@
v8::Local<v8::Array> property_names(v8_object->GetOwnPropertyNames());
if (property_names->Length() != dict_var->key_value_map().size())
return false;
- for (uint32 i = 0; i < property_names->Length(); ++i) {
+ for (uint32_t i = 0; i < property_names->Length(); ++i) {
v8::Local<v8::Value> key(property_names->Get(i));
if (!key->IsString() && !key->IsNumber())
diff --git a/content/renderer/pepper/v8object_var.h b/content/renderer/pepper/v8object_var.h
index 4a4feb1f..2527d5f 100644
--- a/content/renderer/pepper/v8object_var.h
+++ b/content/renderer/pepper/v8object_var.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/shared_impl/var.h"
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
index 9dab8b9..265eb2f 100644
--- a/content/renderer/pepper/video_decoder_shim.cc
+++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/thread_task_runner_handle.h"
#ifndef NDEBUG
#include "base/logging.h"
@@ -955,7 +956,7 @@
SendPictures();
}
-void VideoDecoderShim::ReusePictureBuffer(int32 picture_buffer_id) {
+void VideoDecoderShim::ReusePictureBuffer(int32_t picture_buffer_id) {
DCHECK(RenderThreadImpl::current());
uint32_t texture_id = static_cast<uint32_t>(picture_buffer_id);
if (textures_to_dismiss_.find(texture_id) != textures_to_dismiss_.end()) {
diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h
index 566a0de..0eac81e 100644
--- a/content/renderer/pepper/video_decoder_shim.h
+++ b/content/renderer/pepper/video_decoder_shim.h
@@ -5,11 +5,13 @@
#ifndef CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_
#define CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_
+#include <stdint.h>
+
#include <queue>
#include <vector>
-#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "gpu/command_buffer/common/mailbox.h"
@@ -54,7 +56,7 @@
void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
void AssignPictureBuffers(
const std::vector<media::PictureBuffer>& buffers) override;
- void ReusePictureBuffer(int32 picture_buffer_id) override;
+ void ReusePictureBuffer(int32_t picture_buffer_id) override;
void Flush() override;
void Reset() override;
void Destroy() override;
diff --git a/content/renderer/pepper/video_encoder_shim.cc b/content/renderer/pepper/video_encoder_shim.cc
index 0789ee3..55d640a 100644
--- a/content/renderer/pepper/video_encoder_shim.cc
+++ b/content/renderer/pepper/video_encoder_shim.cc
@@ -99,12 +99,12 @@
void Initialize(media::VideoPixelFormat input_format,
const gfx::Size& input_visible_size,
media::VideoCodecProfile output_profile,
- uint32 initial_bitrate);
+ uint32_t initial_bitrate);
void Encode(const scoped_refptr<media::VideoFrame>& frame,
bool force_keyframe);
void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer,
uint8_t* mem);
- void RequestEncodingParametersChange(uint32 bitrate, uint32 framerate);
+ void RequestEncodingParametersChange(uint32_t bitrate, uint32_t framerate);
void Stop();
private:
@@ -139,7 +139,7 @@
vpx_codec_enc_cfg_t config_;
vpx_codec_ctx_t encoder_;
- uint32 framerate_;
+ uint32_t framerate_;
std::deque<PendingEncode> frames_;
std::deque<BitstreamBuffer> buffers_;
@@ -161,7 +161,7 @@
media::VideoPixelFormat input_format,
const gfx::Size& input_visible_size,
media::VideoCodecProfile output_profile,
- uint32 initial_bitrate) {
+ uint32_t initial_bitrate) {
gfx::Size coded_size =
media::VideoFrame::PlaneSize(input_format, 0, input_visible_size);
@@ -252,11 +252,11 @@
}
void VideoEncoderShim::EncoderImpl::RequestEncodingParametersChange(
- uint32 bitrate,
- uint32 framerate) {
+ uint32_t bitrate,
+ uint32_t framerate) {
framerate_ = framerate;
- uint32 bitrate_kbit = bitrate / 1000;
+ uint32_t bitrate_kbit = bitrate / 1000;
if (config_.rc_target_bitrate == bitrate_kbit)
return;
@@ -403,7 +403,7 @@
media::VideoPixelFormat input_format,
const gfx::Size& input_visible_size,
media::VideoCodecProfile output_profile,
- uint32 initial_bitrate,
+ uint32_t initial_bitrate,
media::VideoEncodeAccelerator::Client* client) {
DCHECK(RenderThreadImpl::current());
DCHECK_EQ(client, host_);
@@ -445,8 +445,8 @@
host_->ShmHandleToAddress(buffer.id())));
}
-void VideoEncoderShim::RequestEncodingParametersChange(uint32 bitrate,
- uint32 framerate) {
+void VideoEncoderShim::RequestEncodingParametersChange(uint32_t bitrate,
+ uint32_t framerate) {
DCHECK(RenderThreadImpl::current());
media_task_runner_->PostTask(
@@ -474,7 +474,7 @@
void VideoEncoderShim::OnBitstreamBufferReady(
scoped_refptr<media::VideoFrame> frame,
- int32 bitstream_buffer_id,
+ int32_t bitstream_buffer_id,
size_t payload_size,
bool key_frame) {
DCHECK(RenderThreadImpl::current());
diff --git a/content/renderer/pepper/video_encoder_shim.h b/content/renderer/pepper/video_encoder_shim.h
index 44049ef..59b648a 100644
--- a/content/renderer/pepper/video_encoder_shim.h
+++ b/content/renderer/pepper/video_encoder_shim.h
@@ -5,8 +5,12 @@
#ifndef CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_
#define CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/video/video_encode_accelerator.h"
@@ -38,13 +42,13 @@
bool Initialize(media::VideoPixelFormat input_format,
const gfx::Size& input_visible_size,
media::VideoCodecProfile output_profile,
- uint32 initial_bitrate,
+ uint32_t initial_bitrate,
media::VideoEncodeAccelerator::Client* client) override;
void Encode(const scoped_refptr<media::VideoFrame>& frame,
bool force_keyframe) override;
void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) override;
- void RequestEncodingParametersChange(uint32 bitrate,
- uint32 framerate) override;
+ void RequestEncodingParametersChange(uint32_t bitrate,
+ uint32_t framerate) override;
void Destroy() override;
private:
@@ -54,7 +58,7 @@
const gfx::Size& input_coded_size,
size_t output_buffer_size);
void OnBitstreamBufferReady(scoped_refptr<media::VideoFrame> frame,
- int32 bitstream_buffer_id,
+ int32_t bitstream_buffer_id,
size_t payload_size,
bool key_frame);
void OnNotifyError(media::VideoEncodeAccelerator::Error error);
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index 268f169..db1c94a 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -135,7 +135,7 @@
void PresentationDispatcher::sendArrayBuffer(
const blink::WebString& presentationUrl,
const blink::WebString& presentationId,
- const uint8* data,
+ const uint8_t* data,
size_t length) {
DCHECK(data);
if (length > kMaxPresentationSessionMessageSize) {
@@ -157,7 +157,7 @@
void PresentationDispatcher::sendBlobData(
const blink::WebString& presentationUrl,
const blink::WebString& presentationId,
- const uint8* data,
+ const uint8_t* data,
size_t length) {
DCHECK(data);
if (length > kMaxPresentationSessionMessageSize) {
@@ -480,7 +480,7 @@
const blink::WebString& presentationUrl,
const blink::WebString& presentationId,
presentation::PresentationMessageType type,
- const uint8* data,
+ const uint8_t* data,
size_t length) {
presentation::PresentationSessionInfoPtr session_info =
presentation::PresentationSessionInfo::New();
@@ -490,7 +490,7 @@
presentation::SessionMessagePtr session_message =
presentation::SessionMessage::New();
session_message->type = type;
- std::vector<uint8> tmp_data_vector(data, data + length);
+ std::vector<uint8_t> tmp_data_vector(data, data + length);
session_message->data.Swap(&tmp_data_vector);
return new SendMessageRequest(session_info.Pass(), session_message.Pass());
}
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index 2b78b75..ad09549 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -5,11 +5,15 @@
#ifndef CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
#define CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
#include <queue>
#include "base/compiler_specific.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/common/presentation/presentation_service.mojom.h"
@@ -52,7 +56,7 @@
const blink::WebString& presentationUrl,
const blink::WebString& presentationId,
presentation::PresentationMessageType type,
- const uint8* data,
+ const uint8_t* data,
size_t length);
// WebPresentationClient implementation.
@@ -69,11 +73,11 @@
const blink::WebString& message) override;
void sendArrayBuffer(const blink::WebString& presentationUrl,
const blink::WebString& presentationId,
- const uint8* data,
+ const uint8_t* data,
size_t length) override;
void sendBlobData(const blink::WebString& presentationUrl,
const blink::WebString& presentationId,
- const uint8* data,
+ const uint8_t* data,
size_t length) override;
void closeSession(const blink::WebString& presentationUrl,
const blink::WebString& presentationId) override;
diff --git a/content/renderer/push_messaging/push_messaging_dispatcher.h b/content/renderer/push_messaging/push_messaging_dispatcher.h
index 13f3b72..ca6610b 100644
--- a/content/renderer/push_messaging/push_messaging_dispatcher.h
+++ b/content/renderer/push_messaging/push_messaging_dispatcher.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/id_map.h"
+#include "base/macros.h"
#include "content/public/common/push_messaging_status.h"
#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/platform/modules/push_messaging/WebPushClient.h"
diff --git a/content/renderer/raster_worker_pool.cc b/content/renderer/raster_worker_pool.cc
index ddeb57d..20b56ae00 100644
--- a/content/renderer/raster_worker_pool.cc
+++ b/content/renderer/raster_worker_pool.cc
@@ -4,6 +4,9 @@
#include "content/renderer/raster_worker_pool.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <utility>
#include "base/strings/stringprintf.h"
diff --git a/content/renderer/raster_worker_pool.h b/content/renderer/raster_worker_pool.h
index e7473a9..1b7cfb1 100644
--- a/content/renderer/raster_worker_pool.h
+++ b/content/renderer/raster_worker_pool.h
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/sequenced_task_runner.h"
#include "base/synchronization/condition_variable.h"
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e82c518..30a9f25 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -24,6 +24,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "cc/base/switches.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
#include "content/child/appcache/appcache_dispatcher.h"
@@ -288,7 +289,7 @@
typedef std::map<blink::WebFrame*, RenderFrameImpl*> FrameMap;
base::LazyInstance<FrameMap> g_frame_map = LAZY_INSTANCE_INITIALIZER;
-int64 ExtractPostId(const WebHistoryItem& item) {
+int64_t ExtractPostId(const WebHistoryItem& item) {
if (item.isNull() || item.httpBody().isNull())
return -1;
@@ -614,7 +615,7 @@
// static
RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view,
- int32 routing_id) {
+ int32_t routing_id) {
DCHECK(routing_id != MSG_ROUTING_NONE);
CreateParams params(render_view, routing_id);
@@ -1119,7 +1120,7 @@
if (!IsPepperAcceptingCompositionEvents()) {
base::i18n::UTF16CharIterator iterator(&last_text);
- int32 i = 0;
+ int32_t i = 0;
while (iterator.Advance()) {
blink::WebKeyboardEvent char_event;
char_event.type = blink::WebInputEvent::Char;
@@ -1128,7 +1129,7 @@
char_event.windowsKeyCode = last_text[i];
char_event.nativeKeyCode = last_text[i];
- const int32 char_start = i;
+ const int32_t char_start = i;
for (; i < iterator.array_pos(); ++i) {
char_event.text[i - char_start] = last_text[i];
char_event.unmodifiedText[i - char_start] = last_text[i];
@@ -1769,7 +1770,7 @@
}
}
-void RenderFrameImpl::OnVisualStateRequest(uint64 id) {
+void RenderFrameImpl::OnVisualStateRequest(uint64_t id) {
GetRenderWidget()->QueueMessage(
new FrameHostMsg_VisualStateResponse(routing_id_, id),
MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE);
@@ -2637,20 +2638,15 @@
}
if (shouldReportDetailedMessageForSource(source_name)) {
- FOR_EACH_OBSERVER(
- RenderFrameObserver, observers_,
- DetailedConsoleMessageAdded(message.text,
- source_name,
- stack_trace,
- source_line,
- static_cast<int32>(log_severity)));
+ FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
+ DetailedConsoleMessageAdded(
+ message.text, source_name, stack_trace, source_line,
+ static_cast<int32_t>(log_severity)));
}
- Send(new FrameHostMsg_AddMessageToConsole(routing_id_,
- static_cast<int32>(log_severity),
- message.text,
- static_cast<int32>(source_line),
- source_name));
+ Send(new FrameHostMsg_AddMessageToConsole(
+ routing_id_, static_cast<int32_t>(log_severity), message.text,
+ static_cast<int32_t>(source_line), source_name));
}
void RenderFrameImpl::loadURLExternally(const blink::WebURLRequest& request,
@@ -4307,7 +4303,7 @@
// Make navigation state a part of the DidCommitProvisionalLoad message so
// that committed entry has it at all times.
- int64 post_id = -1;
+ int64_t post_id = -1;
if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) {
HistoryEntry* entry = render_view_->history_controller()->GetCurrentEntry();
if (entry) {
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 907367be..76e29252 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -5,18 +5,22 @@
#ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
#define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/process/process_handle.h"
+#include "build/build_config.h"
#include "content/common/accessibility_mode_enums.h"
#include "content/common/frame_message_enums.h"
#include "content/common/mojo/service_registry_impl.h"
@@ -189,12 +193,12 @@
// Used by content_layouttest_support to hook into the creation of
// RenderFrameImpls.
struct CreateParams {
- CreateParams(RenderViewImpl* render_view, int32 routing_id)
+ CreateParams(RenderViewImpl* render_view, int32_t routing_id)
: render_view(render_view), routing_id(routing_id) {}
~CreateParams() {}
RenderViewImpl* render_view;
- int32 routing_id;
+ int32_t routing_id;
};
using CreateRenderFrameImplFunction =
@@ -688,7 +692,8 @@
// Creates a new RenderFrame. |render_view| is the RenderView object that this
// frame belongs to.
// Callers *must* call |SetWebFrame| immediately after creation.
- static RenderFrameImpl* Create(RenderViewImpl* render_view, int32 routing_id);
+ static RenderFrameImpl* Create(RenderViewImpl* render_view,
+ int32_t routing_id);
// Functions to add and remove observers for this object.
void AddObserver(RenderFrameObserver* observer);
@@ -746,7 +751,7 @@
int id,
bool notify_result,
int world_id);
- void OnVisualStateRequest(uint64 key);
+ void OnVisualStateRequest(uint64_t key);
void OnSetEditableSelectionOffsets(int start, int end);
void OnSetCompositionFromExistingText(
int start, int end,
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc
index 9ee851c..3e26089 100644
--- a/content/renderer/render_frame_impl_browsertest.cc
+++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/command_line.h"
#include "base/debug/leak_annotations.h"
+#include "build/build_config.h"
#include "content/common/frame_messages.h"
#include "content/common/view_messages.h"
#include "content/public/test/frame_load_waiter.h"
@@ -18,9 +21,9 @@
#include "third_party/WebKit/public/web/WebLocalFrame.h"
namespace {
-const int32 kSubframeRouteId = 20;
-const int32 kSubframeWidgetRouteId = 21;
-const int32 kFrameProxyRouteId = 22;
+const int32_t kSubframeRouteId = 20;
+const int32_t kSubframeWidgetRouteId = 21;
+const int32_t kFrameProxyRouteId = 22;
} // namespace
namespace content {
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 4c272612..3e17627e 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -4,6 +4,8 @@
#include "content/renderer/render_frame_proxy.h"
+#include <stdint.h>
+
#include <map>
#include "base/command_line.h"
@@ -116,7 +118,7 @@
}
// static
-RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) {
+RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32_t routing_id) {
RoutingIDProxyMap* proxies = g_routing_id_proxy_map.Pointer();
RoutingIDProxyMap::iterator it = proxies->find(routing_id);
return it == proxies->end() ? NULL : it->second;
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h
index 0c35670..405c881 100644
--- a/content/renderer/render_frame_proxy.h
+++ b/content/renderer/render_frame_proxy.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
#define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "ipc/ipc_listener.h"
diff --git a/content/renderer/render_process.h b/content/renderer/render_process.h
index 07c53e13..289da706 100644
--- a/content/renderer/render_process.h
+++ b/content/renderer/render_process.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_RENDER_PROCESS_H_
#define CONTENT_RENDERER_RENDER_PROCESS_H_
+#include "base/macros.h"
#include "content/child/child_process.h"
namespace content {
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
index 188f3fa..16737ea 100644
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -12,7 +12,6 @@
#include <mlang.h>
#endif
-#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/sys_info.h"
diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h
index 7b441e2..768ef7d 100644
--- a/content/renderer/render_process_impl.h
+++ b/content/renderer/render_process_impl.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_
#define CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_
+#include "base/macros.h"
#include "content/renderer/render_process.h"
namespace content {
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 003e02b4..83c6420 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -14,6 +14,7 @@
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/discardable_memory_allocator.h"
#include "base/memory/shared_memory.h"
#include "base/metrics/field_trial.h"
@@ -33,6 +34,7 @@
#include "base/trace_event/memory_dump_manager.h"
#include "base/trace_event/trace_event.h"
#include "base/values.h"
+#include "build/build_config.h"
#include "cc/base/histograms.h"
#include "cc/base/switches.h"
#include "cc/blink/web_external_bitmap_impl.h"
@@ -222,8 +224,8 @@
namespace {
-const int64 kInitialIdleHandlerDelayMs = 1000;
-const int64 kLongIdleHandlerDelayMs = 30*1000;
+const int64_t kInitialIdleHandlerDelayMs = 1000;
+const int64_t kLongIdleHandlerDelayMs = 30 * 1000;
#if defined(OS_ANDROID)
// On Android, resource messages can each take ~1.5ms to dispatch on the browser
@@ -1034,7 +1036,7 @@
return ChildProcess::current()->io_task_runner();
}
-void RenderThreadImpl::AddRoute(int32 routing_id, IPC::Listener* listener) {
+void RenderThreadImpl::AddRoute(int32_t routing_id, IPC::Listener* listener) {
ChildThreadImpl::GetRouter()->AddRoute(routing_id, listener);
PendingRenderFrameConnectMap::iterator it =
pending_render_frame_connects_.find(routing_id);
@@ -1056,11 +1058,11 @@
frame->BindServiceRegistry(services.Pass(), exposed_services.Pass());
}
-void RenderThreadImpl::RemoveRoute(int32 routing_id) {
+void RenderThreadImpl::RemoveRoute(int32_t routing_id) {
ChildThreadImpl::GetRouter()->RemoveRoute(routing_id);
}
-void RenderThreadImpl::AddEmbeddedWorkerRoute(int32 routing_id,
+void RenderThreadImpl::AddEmbeddedWorkerRoute(int32_t routing_id,
IPC::Listener* listener) {
AddRoute(routing_id, listener);
if (devtools_agent_message_filter_.get()) {
@@ -1069,7 +1071,7 @@
}
}
-void RenderThreadImpl::RemoveEmbeddedWorkerRoute(int32 routing_id) {
+void RenderThreadImpl::RemoveEmbeddedWorkerRoute(int32_t routing_id) {
RemoveRoute(routing_id);
if (devtools_agent_message_filter_.get()) {
devtools_agent_message_filter_->RemoveEmbeddedWorkerRouteOnMainThread(
@@ -1333,7 +1335,7 @@
WebScriptController::registerExtension(extension);
}
-void RenderThreadImpl::ScheduleIdleHandler(int64 initial_delay_ms) {
+void RenderThreadImpl::ScheduleIdleHandler(int64_t initial_delay_ms) {
idle_notification_delay_in_ms_ = initial_delay_ms;
idle_timer_.Stop();
idle_timer_.Start(FROM_HERE,
@@ -1387,12 +1389,12 @@
FOR_EACH_OBSERVER(RenderProcessObserver, observers_, IdleNotification());
}
-int64 RenderThreadImpl::GetIdleNotificationDelayInMs() const {
+int64_t RenderThreadImpl::GetIdleNotificationDelayInMs() const {
return idle_notification_delay_in_ms_;
}
void RenderThreadImpl::SetIdleNotificationDelayInMs(
- int64 idle_notification_delay_in_ms) {
+ int64_t idle_notification_delay_in_ms) {
idle_notification_delay_in_ms_ = idle_notification_delay_in_ms;
}
@@ -1660,9 +1662,9 @@
}
CreateCommandBufferResult RenderThreadImpl::CreateViewCommandBuffer(
- int32 surface_id,
- const GPUCreateCommandBufferConfig& init_params,
- int32 route_id) {
+ int32_t surface_id,
+ const GPUCreateCommandBufferConfig& init_params,
+ int32_t route_id) {
NOTREACHED();
return CREATE_COMMAND_BUFFER_FAILED;
}
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index af7b75c..3aa7378 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -5,11 +5,15 @@
#ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
#define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <set>
#include <string>
#include <vector>
#include "base/cancelable_callback.h"
+#include "base/macros.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/user_metrics_action.h"
@@ -165,8 +169,8 @@
std::string GetLocale() override;
IPC::SyncMessageFilter* GetSyncMessageFilter() override;
scoped_refptr<base::SingleThreadTaskRunner> GetIOMessageLoopProxy() override;
- void AddRoute(int32 routing_id, IPC::Listener* listener) override;
- void RemoveRoute(int32 routing_id) override;
+ void AddRoute(int32_t routing_id, IPC::Listener* listener) override;
+ void RemoveRoute(int32_t routing_id) override;
int GenerateRoutingID() override;
void AddFilter(IPC::MessageFilter* filter) override;
void RemoveFilter(IPC::MessageFilter* filter) override;
@@ -181,11 +185,11 @@
size_t buffer_size) override;
cc::SharedBitmapManager* GetSharedBitmapManager() override;
void RegisterExtension(v8::Extension* extension) override;
- void ScheduleIdleHandler(int64 initial_delay_ms) override;
+ void ScheduleIdleHandler(int64_t initial_delay_ms) override;
void IdleHandler() override;
- int64 GetIdleNotificationDelayInMs() const override;
+ int64_t GetIdleNotificationDelayInMs() const override;
void SetIdleNotificationDelayInMs(
- int64 idle_notification_delay_in_ms) override;
+ int64_t idle_notification_delay_in_ms) override;
void UpdateHistograms(int sequence_number) override;
int PostTaskToAllWebWorkers(const base::Closure& closure) override;
bool ResolveProxy(const GURL& url, std::string* proxy_list) override;
@@ -438,8 +442,8 @@
void WidgetHidden();
void WidgetRestored();
- void AddEmbeddedWorkerRoute(int32 routing_id, IPC::Listener* listener);
- void RemoveEmbeddedWorkerRoute(int32 routing_id);
+ void AddEmbeddedWorkerRoute(int32_t routing_id, IPC::Listener* listener);
+ void RemoveEmbeddedWorkerRoute(int32_t routing_id);
void RegisterPendingRenderFrameConnect(
int routing_id,
@@ -464,9 +468,9 @@
scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override;
scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override;
CreateCommandBufferResult CreateViewCommandBuffer(
- int32 surface_id,
+ int32_t surface_id,
const GPUCreateCommandBufferConfig& init_params,
- int32 route_id) override;
+ int32_t route_id) override;
void Init();
@@ -566,7 +570,7 @@
int hidden_widget_count_;
// The current value of the idle notification timer delay.
- int64 idle_notification_delay_in_ms_;
+ int64_t idle_notification_delay_in_ms_;
// The number of idle handler calls that skip sending idle notifications.
int idle_notifications_to_skip_;
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index a7151aaa..b926299 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/callback.h"
#include "base/command_line.h"
#include "base/location.h"
@@ -132,7 +135,7 @@
}
bool GetSupportedMessageClasses(
- std::vector<uint32>* supported_message_classes) const override {
+ std::vector<uint32_t>* supported_message_classes) const override {
supported_message_classes->push_back(TestMsgStart);
return true;
}
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 484409f..050d05fa 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -2,17 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/command_line.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "base/win/windows_version.h"
+#include "build/build_config.h"
#include "content/child/request_extra_data.h"
#include "content/child/service_worker/service_worker_network_provider.h"
#include "content/common/frame_messages.h"
@@ -2131,7 +2135,7 @@
size_t last_selection = 0;
for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) {
- const uint32 type = render_thread_->sink().GetMessageAt(i)->type();
+ const uint32_t type = render_thread_->sink().GetMessageAt(i)->type();
if (type == ViewHostMsg_TextInputStateChanged::ID) {
is_input_type_called = true;
last_input_type = i;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 5553995..efdeb26 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -30,6 +30,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
#include "content/child/appcache/appcache_dispatcher.h"
#include "content/child/appcache/web_application_cache_host_impl.h"
#include "content/child/child_shared_bitmap_manager.h"
@@ -286,7 +287,7 @@
typedef std::map<blink::WebView*, RenderViewImpl*> ViewMap;
static base::LazyInstance<ViewMap> g_view_map = LAZY_INSTANCE_INITIALIZER;
-typedef std::map<int32, RenderViewImpl*> RoutingIDViewMap;
+typedef std::map<int32_t, RenderViewImpl*> RoutingIDViewMap;
static base::LazyInstance<RoutingIDViewMap> g_routing_id_view_map =
LAZY_INSTANCE_INITIALIZER;
@@ -577,7 +578,7 @@
WebSettings* settings) {
for (ScriptFontFamilyMap::const_iterator it = map.begin(); it != map.end();
++it) {
- int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str());
+ int32_t script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str());
if (script >= 0 && script < USCRIPT_CODE_LIMIT) {
UScriptCode code = static_cast<UScriptCode>(script);
(*setter)(settings, it->second, GetScriptForWebSettings(code));
@@ -860,7 +861,7 @@
}
/*static*/
-RenderViewImpl* RenderViewImpl::FromRoutingID(int32 routing_id) {
+RenderViewImpl* RenderViewImpl::FromRoutingID(int32_t routing_id) {
RoutingIDViewMap* views = g_routing_id_view_map.Pointer();
RoutingIDViewMap::iterator it = views->find(routing_id);
return it == views->end() ? NULL : it->second;
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 64d39ecf..2baacd69 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -5,15 +5,18 @@
#ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
#define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <deque>
#include <map>
#include <set>
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
@@ -615,7 +618,7 @@
void OnSetEditCommandsForNextKeyEvent(const EditCommands& edit_commands);
void OnAllowBindings(int enabled_bindings_flags);
void OnAllowScriptToClose(bool script_can_close);
- void OnCancelDownload(int32 download_id);
+ void OnCancelDownload(int32_t download_id);
void OnClearFocusedElement();
void OnClosePage();
void OnClose();
@@ -846,11 +849,11 @@
// Page IDs ------------------------------------------------------------------
// See documentation in RenderView.
- int32 page_id_;
+ int32_t page_id_;
// The next available page ID to use for this RenderView. These IDs are
// specific to a given RenderView and the frames within it.
- int32 next_page_id_;
+ int32_t next_page_id_;
// The offset of the current item in the history list.
int history_list_offset_;
@@ -1009,7 +1012,7 @@
// The SessionStorage namespace that we're assigned to has an ID, and that ID
// is passed to us upon creation. WebKit asks for this ID upon first use and
// uses it whenever asking the browser process to allocate new storage areas.
- int64 session_storage_namespace_id_;
+ int64_t session_storage_namespace_id_;
// Stores edit commands associated to the next key event.
// Shall be cleared as soon as the next key event is processed.
diff --git a/content/renderer/render_view_mouse_lock_dispatcher.h b/content/renderer/render_view_mouse_lock_dispatcher.h
index a2ee5b56..984a40e 100644
--- a/content/renderer/render_view_mouse_lock_dispatcher.h
+++ b/content/renderer/render_view_mouse_lock_dispatcher.h
@@ -5,8 +5,8 @@
#ifndef CONTENT_RENDERER_RENDER_VIEW_MOUSE_LOCK_DISPATCHER_H_
#define CONTENT_RENDERER_RENDER_VIEW_MOUSE_LOCK_DISPATCHER_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/renderer/mouse_lock_dispatcher.h"
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index ec4d4da..405b64e 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/message_loop/message_loop.h"
@@ -483,7 +484,7 @@
}
// static
-RenderWidget* RenderWidget::Create(int32 opener_id,
+RenderWidget* RenderWidget::Create(int32_t opener_id,
CompositorDependencies* compositor_deps,
blink::WebPopupType popup_type,
const blink::WebScreenInfo& screen_info) {
@@ -556,13 +557,13 @@
OnClose();
}
-bool RenderWidget::Init(int32 opener_id) {
+bool RenderWidget::Init(int32_t opener_id) {
return DoInit(
opener_id, RenderWidget::CreateWebWidget(this),
new ViewHostMsg_CreateWidget(opener_id, popup_type_, &routing_id_));
}
-bool RenderWidget::DoInit(int32 opener_id,
+bool RenderWidget::DoInit(int32_t opener_id,
WebWidget* web_widget,
IPC::SyncMessage* create_widget_message) {
DCHECK(!webwidget_);
@@ -981,7 +982,7 @@
#endif
}
- uint32 output_surface_id = next_output_surface_id_++;
+ uint32_t output_surface_id = next_output_surface_id_++;
// Composite-to-mailbox is currently used for layout tests in order to cause
// them to draw inside in the renderer to do the readback there. This should
// no longer be the case when crbug.com/311404 is fixed.
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index b438a1b1..00454d4 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -5,16 +5,20 @@
#ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
#define CONTENT_RENDERER_RENDER_WIDGET_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <deque>
#include <map>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "content/common/content_export.h"
#include "content/common/cursors/webcursor.h"
#include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ -104,7 +108,7 @@
public:
// Creates a new RenderWidget. The opener_id is the routing ID of the
// RenderView that this widget lives inside.
- static RenderWidget* Create(int32 opener_id,
+ static RenderWidget* Create(int32_t opener_id,
CompositorDependencies* compositor_deps,
blink::WebPopupType popup_type,
const blink::WebScreenInfo& screen_info);
@@ -121,7 +125,7 @@
// https://crbug.com/545684
virtual void CloseForFrame();
- int32 routing_id() const { return routing_id_; }
+ int32_t routing_id() const { return routing_id_; }
CompositorDependencies* compositor_deps() const { return compositor_deps_; }
blink::WebWidget* webwidget() const { return webwidget_; }
gfx::Size size() const { return size_; }
@@ -363,10 +367,10 @@
static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget);
// Initializes this view with the given opener.
- bool Init(int32 opener_id);
+ bool Init(int32_t opener_id);
// Called by Init and subclasses to perform initialization.
- bool DoInit(int32 opener_id,
+ bool DoInit(int32_t opener_id,
blink::WebWidget* web_widget,
IPC::SyncMessage* create_widget_message);
@@ -422,8 +426,8 @@
virtual void OnWasHidden();
virtual void OnWasShown(bool needs_repainting,
const ui::LatencyInfo& latency_info);
- void OnCreateVideoAck(int32 video_id);
- void OnUpdateVideoAck(int32 video_id);
+ void OnCreateVideoAck(int32_t video_id);
+ void OnUpdateVideoAck(int32_t video_id);
void OnRequestMoveAck();
virtual void OnImeSetComposition(
const base::string16& text,
@@ -546,7 +550,7 @@
// Routing ID that allows us to communicate to the parent browser process
// RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent.
- int32 routing_id_;
+ int32_t routing_id_;
// Dependencies for initializing a compositor, including flags for optional
// features.
@@ -566,7 +570,7 @@
//
// This ID may refer to an invalid view if that view is closed before this
// view is.
- int32 opener_id_;
+ int32_t opener_id_;
// The rect where this view should be initially shown.
gfx::Rect initial_rect_;
@@ -704,7 +708,7 @@
std::queue<SyntheticGestureCompletionCallback>
pending_synthetic_gesture_callbacks_;
- uint32 next_output_surface_id_;
+ uint32_t next_output_surface_id_;
#if defined(OS_ANDROID)
// Indicates value in the focused text field is in dirty state, i.e. modified
diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc
index 4317324..3aa227a 100644
--- a/content/renderer/render_widget_fullscreen.cc
+++ b/content/renderer/render_widget_fullscreen.cc
@@ -40,7 +40,7 @@
return RenderWidget::CreateWebWidget(this);
}
-bool RenderWidgetFullscreen::Init(int32 opener_id) {
+bool RenderWidgetFullscreen::Init(int32_t opener_id) {
DCHECK(!webwidget_);
return RenderWidget::DoInit(
diff --git a/content/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h
index ff853a73..113a412 100644
--- a/content/renderer/render_widget_fullscreen.h
+++ b/content/renderer/render_widget_fullscreen.h
@@ -7,6 +7,8 @@
#include "content/renderer/render_widget.h"
+#include <stdint.h>
+
#include "third_party/WebKit/public/web/WebWidget.h"
namespace content {
@@ -24,7 +26,7 @@
virtual blink::WebWidget* CreateWebWidget();
- bool Init(int32 opener_id);
+ bool Init(int32_t opener_id);
};
} // namespace content
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index 8f2091d0..5f052fa 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -8,7 +8,9 @@
#include "base/bind.h"
#include "base/command_line.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
+#include "build/build_config.h"
#include "content/common/gpu/client/gpu_channel_host.h"
#include "content/common/view_messages.h"
#include "content/public/common/content_switches.h"
@@ -260,7 +262,7 @@
// static
RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create(
- int32 opener_id,
+ int32_t opener_id,
CompositorDependencies* compositor_deps,
PepperPluginInstanceImpl* plugin,
const GURL& active_url,
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index b914117..4c144c8 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
#define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/mouse_lock_dispatcher.h"
#include "content/renderer/pepper/fullscreen_container.h"
@@ -25,7 +28,7 @@
public FullscreenContainer {
public:
static RenderWidgetFullscreenPepper* Create(
- int32 opener_id,
+ int32_t opener_id,
CompositorDependencies* compositor_deps,
PepperPluginInstanceImpl* plugin,
const GURL& active_url,
diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc
index e4319f5..8d8f9e6 100644
--- a/content/renderer/render_widget_unittest.cc
+++ b/content/renderer/render_widget_unittest.cc
@@ -6,6 +6,7 @@
#include <vector>
+#include "base/macros.h"
#include "content/common/input/synthetic_web_input_event_builders.h"
#include "content/common/input_messages.h"
#include "content/public/test/mock_render_thread.h"
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index a47eec73..80a8135 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -211,7 +211,7 @@
#if defined(OS_MACOSX)
bool loadFont(NSFont* src_font,
CGFontRef* container,
- uint32* font_id) override;
+ uint32_t* font_id) override;
#elif defined(OS_POSIX)
void getFallbackFontForCharacter(
blink::WebUChar32 character,
@@ -387,7 +387,7 @@
}
void RendererBlinkPlatformImpl::cacheMetadata(const blink::WebURL& url,
- int64 response_time,
+ int64_t response_time,
const char* data,
size_t size) {
// Let the browser know we generated cacheable metadata for this resource. The
@@ -544,8 +544,8 @@
bool RendererBlinkPlatformImpl::SandboxSupport::loadFont(NSFont* src_font,
CGFontRef* out,
- uint32* font_id) {
- uint32 font_data_size;
+ uint32_t* font_id) {
+ uint32_t font_data_size;
FontDescriptor src_font_descriptor(src_font);
base::SharedMemoryHandle font_data;
if (!RenderThread::Get()->Send(new RenderProcessHostMsg_LoadFont(
@@ -823,9 +823,7 @@
const blink::WebURL& url) {
std::string signed_public_key;
RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen(
- static_cast<uint32>(key_size_index),
- challenge.utf8(),
- GURL(url),
+ static_cast<uint32_t>(key_size_index), challenge.utf8(), GURL(url),
&signed_public_key));
return WebString::fromUTF8(signed_public_key);
}
@@ -1118,7 +1116,7 @@
void RendererBlinkPlatformImpl::vibrate(unsigned int milliseconds) {
GetConnectedVibrationManagerService()->Vibrate(
- base::checked_cast<int64>(milliseconds));
+ base::checked_cast<int64_t>(milliseconds));
vibration_manager_.reset();
}
@@ -1203,7 +1201,7 @@
observer = CreatePlatformEventObserverFromType(type);
if (!observer)
return;
- platform_event_observers_.AddWithID(observer, static_cast<int32>(type));
+ platform_event_observers_.AddWithID(observer, static_cast<int32_t>(type));
}
observer->Start(listener);
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index 226137a..72fda4f9 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -5,9 +5,14 @@
#ifndef CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
#define CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/compiler_specific.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
#include "cc/blink/web_compositor_support_impl.h"
#include "content/child/blink_platform_impl.h"
#include "content/common/content_export.h"
@@ -83,7 +88,10 @@
void createMessageChannel(blink::WebMessagePortChannel** channel1,
blink::WebMessagePortChannel** channel2) override;
blink::WebPrescientNetworking* prescientNetworking() override;
- void cacheMetadata(const blink::WebURL&, int64, const char*, size_t) override;
+ void cacheMetadata(const blink::WebURL&,
+ int64_t,
+ const char*,
+ size_t) override;
blink::WebString defaultLocale() override;
void suddenTerminationChanged(bool enabled) override;
blink::WebStorageNamespace* createLocalStorageNamespace() override;
diff --git a/content/renderer/renderer_clipboard_delegate.cc b/content/renderer/renderer_clipboard_delegate.cc
index e1285d2..6ce0203 100644
--- a/content/renderer/renderer_clipboard_delegate.cc
+++ b/content/renderer/renderer_clipboard_delegate.cc
@@ -20,8 +20,8 @@
RendererClipboardDelegate::RendererClipboardDelegate() {
}
-uint64 RendererClipboardDelegate::GetSequenceNumber(ui::ClipboardType type) {
- uint64 sequence_number = 0;
+uint64_t RendererClipboardDelegate::GetSequenceNumber(ui::ClipboardType type) {
+ uint64_t sequence_number = 0;
RenderThreadImpl::current()->Send(
new ClipboardHostMsg_GetSequenceNumber(type, &sequence_number));
return sequence_number;
@@ -57,8 +57,8 @@
void RendererClipboardDelegate::ReadHTML(ui::ClipboardType type,
base::string16* markup,
GURL* url,
- uint32* fragment_start,
- uint32* fragment_end) {
+ uint32_t* fragment_start,
+ uint32_t* fragment_end) {
RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadHTML(
type, markup, url, fragment_start, fragment_end));
}
@@ -71,7 +71,7 @@
void RendererClipboardDelegate::ReadImage(ui::ClipboardType type,
std::string* data) {
base::SharedMemoryHandle image_handle;
- uint32 image_size = 0;
+ uint32_t image_size = 0;
RenderThreadImpl::current()->Send(
new ClipboardHostMsg_ReadImage(type, &image_handle, &image_size));
if (base::SharedMemory::IsHandleValid(image_handle)) {
@@ -135,14 +135,14 @@
if (!pixels)
return false;
- base::CheckedNumeric<uint32> checked_buf_size = 4;
+ base::CheckedNumeric<uint32_t> checked_buf_size = 4;
checked_buf_size *= size.width();
checked_buf_size *= size.height();
if (!checked_buf_size.IsValid())
return false;
// Allocate a shared memory buffer to hold the bitmap bits.
- uint32 buf_size = checked_buf_size.ValueOrDie();
+ uint32_t buf_size = checked_buf_size.ValueOrDie();
shared_buf = ChildThreadImpl::current()->AllocateSharedMemory(buf_size);
if (!shared_buf)
return false;
diff --git a/content/renderer/renderer_clipboard_delegate.h b/content/renderer/renderer_clipboard_delegate.h
index ef8e034..28d509b 100644
--- a/content/renderer/renderer_clipboard_delegate.h
+++ b/content/renderer/renderer_clipboard_delegate.h
@@ -26,7 +26,7 @@
public:
RendererClipboardDelegate();
- uint64 GetSequenceNumber(ui::ClipboardType type);
+ uint64_t GetSequenceNumber(ui::ClipboardType type);
bool IsFormatAvailable(ClipboardFormat format, ui::ClipboardType type);
void Clear(ui::ClipboardType type);
void ReadAvailableTypes(ui::ClipboardType type,
@@ -36,8 +36,8 @@
void ReadHTML(ui::ClipboardType type,
base::string16* markup,
GURL* url,
- uint32* fragment_start,
- uint32* fragment_end);
+ uint32_t* fragment_start,
+ uint32_t* fragment_end);
void ReadRTF(ui::ClipboardType type, std::string* result);
void ReadImage(ui::ClipboardType type, std::string* data);
void ReadCustomData(ui::ClipboardType clipboard_type,
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 13368c9..c7ac7f0 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/debug/debugger.h"
@@ -19,6 +21,7 @@
#include "base/time/time.h"
#include "base/timer/hi_res_timer_manager.h"
#include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
#include "components/startup_metric_utils/common/startup_metric_messages.h"
#include "content/child/child_process.h"
diff --git a/content/renderer/renderer_main_platform_delegate.h b/content/renderer/renderer_main_platform_delegate.h
index f51644a7..ed00bbe7 100644
--- a/content/renderer/renderer_main_platform_delegate.h
+++ b/content/renderer/renderer_main_platform_delegate.h
@@ -11,7 +11,7 @@
#include <windows.h>
#endif
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/public/common/main_function_params.h"
diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc
index c00ed03..92ac08f 100644
--- a/content/renderer/renderer_main_platform_delegate_android.cc
+++ b/content/renderer/renderer_main_platform_delegate_android.cc
@@ -7,6 +7,7 @@
#include "base/android/build_info.h"
#include "base/feature_list.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#ifdef USE_SECCOMP_BPF
diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm
index 6c7ecd8..ca61a07 100644
--- a/content/renderer/renderer_main_platform_delegate_mac.mm
+++ b/content/renderer/renderer_main_platform_delegate_mac.mm
@@ -7,6 +7,7 @@
#include <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#include <objc/runtime.h>
+#include <stdint.h>
#include "base/command_line.h"
#include "base/logging.h"
@@ -71,11 +72,11 @@
std::string port_address_std_string =
base::SysCFStringRefToUTF8(port_address_string);
#if __LP64__
- uint64 port_address = 0;
+ uint64_t port_address = 0;
if (!base::HexStringToUInt64(port_address_std_string, &port_address))
continue;
#else
- uint32 port_address = 0;
+ uint32_t port_address = 0;
if (!base::HexStringToUInt(port_address_std_string, &port_address))
continue;
#endif
diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h
index 4248250..f5f82fe 100644
--- a/content/renderer/renderer_webcolorchooser_impl.h
+++ b/content/renderer/renderer_webcolorchooser_impl.h
@@ -8,6 +8,7 @@
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/public/common/color_suggestion.h"
#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/web/WebColorChooser.h"
diff --git a/content/renderer/resizing_mode_selector.h b/content/renderer/resizing_mode_selector.h
index ac657e2..66a62bc 100644
--- a/content/renderer/resizing_mode_selector.h
+++ b/content/renderer/resizing_mode_selector.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_RESIZING_MODE_SELECTOR_H_
#define CONTENT_RENDERER_RESIZING_MODE_SELECTOR_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
struct ViewMsg_Resize_Params;
diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc
index b677fbe..f525de4 100644
--- a/content/renderer/resource_fetcher_browsertest.cc
+++ b/content/renderer/resource_fetcher_browsertest.cc
@@ -11,6 +11,7 @@
#include "base/message_loop/message_loop.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
+#include "build/build_config.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
@@ -286,7 +287,7 @@
EXPECT_EQ(kHeader, delegate->data());
}
- int32 render_view_routing_id_;
+ int32_t render_view_routing_id_;
};
// Test a fetch from the test server.
diff --git a/content/renderer/savable_resources.h b/content/renderer/savable_resources.h
index eb989609..b12d350 100644
--- a/content/renderer/savable_resources.h
+++ b/content/renderer/savable_resources.h
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
+#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/common/savable_subframe.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc
index dfccd8d..98d3bc6 100644
--- a/content/renderer/savable_resources_browsertest.cc
+++ b/content/renderer/savable_resources_browsertest.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "build/build_config.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
diff --git a/content/renderer/scheduler/resource_dispatch_throttler.cc b/content/renderer/scheduler/resource_dispatch_throttler.cc
index d2f7916..aae15ad 100644
--- a/content/renderer/scheduler/resource_dispatch_throttler.cc
+++ b/content/renderer/scheduler/resource_dispatch_throttler.cc
@@ -23,7 +23,7 @@
IPC::Sender* proxied_sender,
scheduler::RendererScheduler* scheduler,
base::TimeDelta flush_period,
- uint32 max_requests_per_flush)
+ uint32_t max_requests_per_flush)
: proxied_sender_(proxied_sender),
scheduler_(scheduler),
flush_period_(flush_period),
@@ -104,9 +104,9 @@
// If high-priority work is no longer anticipated, dispatch can be safely
// accelerated. Avoid completely flushing in such case in the event that
// a large number of requests have been throttled.
- uint32 max_requests = scheduler_->IsHighPriorityWorkAnticipated()
- ? max_requests_per_flush_
- : max_requests_per_flush_ * 2;
+ uint32_t max_requests = scheduler_->IsHighPriorityWorkAnticipated()
+ ? max_requests_per_flush_
+ : max_requests_per_flush_ * 2;
while (!throttled_messages_.empty() &&
(sent_requests_since_last_flush_ < max_requests ||
diff --git a/content/renderer/scheduler/resource_dispatch_throttler.h b/content/renderer/scheduler/resource_dispatch_throttler.h
index 66fc786..d7f89b7 100644
--- a/content/renderer/scheduler/resource_dispatch_throttler.h
+++ b/content/renderer/scheduler/resource_dispatch_throttler.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_RENDERER_SCHEDULER_RESOURCE_DISPATCH_THROTTLER_H_
#define CONTENT_RENDERER_SCHEDULER_RESOURCE_DISPATCH_THROTTLER_H_
+#include <stdint.h>
+
#include <deque>
+#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
@@ -35,7 +38,7 @@
ResourceDispatchThrottler(IPC::Sender* proxied_sender,
scheduler::RendererScheduler* scheduler,
base::TimeDelta flush_period,
- uint32 max_requests_per_flush);
+ uint32_t max_requests_per_flush);
~ResourceDispatchThrottler() override;
// IPC::Sender implementation:
@@ -57,11 +60,11 @@
IPC::Sender* const proxied_sender_;
scheduler::RendererScheduler* const scheduler_;
const base::TimeDelta flush_period_;
- const uint32 max_requests_per_flush_;
+ const uint32_t max_requests_per_flush_;
base::Timer flush_timer_;
base::TimeTicks last_sent_request_time_;
- uint32 sent_requests_since_last_flush_;
+ uint32_t sent_requests_since_last_flush_;
std::deque<IPC::Message*> throttled_messages_;
DISALLOW_COPY_AND_ASSIGN(ResourceDispatchThrottler);
diff --git a/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc b/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc
index 296c28a..a1dbcac7 100644
--- a/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc
+++ b/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc
@@ -4,6 +4,10 @@
#include "content/renderer/scheduler/resource_dispatch_throttler.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "content/common/resource_messages.h"
#include "content/test/fake_renderer_scheduler.h"
@@ -12,7 +16,7 @@
namespace content {
namespace {
-const uint32 kRequestsPerFlush = 4;
+const uint32_t kRequestsPerFlush = 4;
const double kFlushPeriodSeconds = 1.f / 60;
const int kRoutingId = 1;
diff --git a/content/renderer/service_worker/embedded_worker_devtools_agent.h b/content/renderer/service_worker/embedded_worker_devtools_agent.h
index c63081e..afb6ba8 100644
--- a/content/renderer/service_worker/embedded_worker_devtools_agent.h
+++ b/content/renderer/service_worker/embedded_worker_devtools_agent.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "ipc/ipc_listener.h"
namespace IPC {
diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.h b/content/renderer/service_worker/embedded_worker_dispatcher.h
index 0ecd75a..2ba1da8 100644
--- a/content/renderer/service_worker/embedded_worker_dispatcher.h
+++ b/content/renderer/service_worker/embedded_worker_dispatcher.h
@@ -7,8 +7,8 @@
#include <map>
-#include "base/basictypes.h"
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "ipc/ipc_listener.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index c3f56a1..a370f6d 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -215,7 +215,7 @@
ServiceWorkerContextClient::ServiceWorkerContextClient(
int embedded_worker_id,
- int64 service_worker_version_id,
+ int64_t service_worker_version_id,
const GURL& service_worker_scope,
const GURL& script_url,
int worker_devtools_agent_route_id)
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h
index 08b7acb..f2b9928 100644
--- a/content/renderer/service_worker/service_worker_context_client.h
+++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -5,11 +5,15 @@
#ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_
#define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
#include "base/id_map.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
@@ -68,7 +72,7 @@
// Called on the main thread.
ServiceWorkerContextClient(int embedded_worker_id,
- int64 service_worker_version_id,
+ int64_t service_worker_version_id,
const GURL& service_worker_scope,
const GURL& script_url,
int worker_devtools_agent_route_id);
@@ -222,7 +226,7 @@
base::WeakPtr<ServiceWorkerContextClient> GetWeakPtr();
const int embedded_worker_id_;
- const int64 service_worker_version_id_;
+ const int64_t service_worker_version_id_;
const GURL service_worker_scope_;
const GURL script_url_;
const int worker_devtools_agent_route_id_;
diff --git a/content/renderer/service_worker/service_worker_context_message_filter.h b/content/renderer/service_worker/service_worker_context_message_filter.h
index e34f866..5ed6c46e 100644
--- a/content/renderer/service_worker/service_worker_context_message_filter.h
+++ b/content/renderer/service_worker/service_worker_context_message_filter.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_MESSAGE_FILTER_H_
#define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_MESSAGE_FILTER_H_
+#include "base/macros.h"
#include "content/child/worker_thread_message_filter.h"
namespace content {
diff --git a/content/renderer/shared_memory_seqlock_reader.h b/content/renderer/shared_memory_seqlock_reader.h
index 7fd7beb..7d5bc936 100644
--- a/content/renderer/shared_memory_seqlock_reader.h
+++ b/content/renderer/shared_memory_seqlock_reader.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_SHARED_MEMORY_SEQLOCK_READER_H_
#define CONTENT_RENDERER_SHARED_MEMORY_SEQLOCK_READER_H_
+#include <stddef.h>
+
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "content/common/shared_memory_seqlock_buffer.h"
diff --git a/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h b/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h
index dd3c6b6c..e87e30d 100644
--- a/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h
+++ b/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_
#define CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "third_party/WebKit/public/web/WebWorkerContentSettingsClientProxy.h"
#include "url/gurl.h"
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc
index 975bab9..0eba4409 100644
--- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc
+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc
@@ -4,6 +4,8 @@
#include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
+#include <stdint.h>
+
#include "base/thread_task_runner_handle.h"
#include "content/child/appcache/appcache_dispatcher.h"
#include "content/child/appcache/web_application_cache_host_impl.h"
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.h b/content/renderer/shared_worker/embedded_shared_worker_stub.h
index a7d62d0..232f55a 100644
--- a/content/renderer/shared_worker/embedded_shared_worker_stub.h
+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.h
@@ -7,6 +7,7 @@
#include <vector>
+#include "base/macros.h"
#include "content/child/child_message_filter.h"
#include "content/child/scoped_child_process_reference.h"
#include "ipc/ipc_listener.h"
diff --git a/content/renderer/shared_worker_repository.h b/content/renderer/shared_worker_repository.h
index c245fec..70d73d3 100644
--- a/content/renderer/shared_worker_repository.h
+++ b/content/renderer/shared_worker_repository.h
@@ -7,7 +7,7 @@
#include <set>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"
#include "third_party/WebKit/public/web/WebSharedWorkerCreationContextType.h"
diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc
index dff6eda..f5180d0f 100644
--- a/content/renderer/skia_benchmarking_extension.cc
+++ b/content/renderer/skia_benchmarking_extension.cc
@@ -4,6 +4,9 @@
#include "content/renderer/skia_benchmarking_extension.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/base64.h"
#include "base/time/time.h"
#include "base/values.h"
@@ -230,11 +233,11 @@
blink::WebArrayBuffer buffer =
blink::WebArrayBuffer::create(bitmap.getSize(), 1);
- uint32* packed_pixels = reinterpret_cast<uint32*>(bitmap.getPixels());
- uint8* buffer_pixels = reinterpret_cast<uint8*>(buffer.data());
+ uint32_t* packed_pixels = reinterpret_cast<uint32_t*>(bitmap.getPixels());
+ uint8_t* buffer_pixels = reinterpret_cast<uint8_t*>(buffer.data());
// Swizzle from native Skia format to RGBA as we copy out.
for (size_t i = 0; i < bitmap.getSize(); i += 4) {
- uint32 c = packed_pixels[i >> 2];
+ uint32_t c = packed_pixels[i >> 2];
buffer_pixels[i] = SkGetPackedR32(c);
buffer_pixels[i + 1] = SkGetPackedG32(c);
buffer_pixels[i + 2] = SkGetPackedB32(c);
diff --git a/content/renderer/skia_benchmarking_extension.h b/content/renderer/skia_benchmarking_extension.h
index 103a490..8dd05dd5 100644
--- a/content/renderer/skia_benchmarking_extension.h
+++ b/content/renderer/skia_benchmarking_extension.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_SKIA_BENCHMARKING_EXTENSION_H_
#define CONTENT_RENDERER_SKIA_BENCHMARKING_EXTENSION_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "gin/wrappable.h"
namespace blink {
diff --git a/content/renderer/skia_benchmarking_extension_unittest.cc b/content/renderer/skia_benchmarking_extension_unittest.cc
index 0e97ae7..87ea6a0 100644
--- a/content/renderer/skia_benchmarking_extension_unittest.cc
+++ b/content/renderer/skia_benchmarking_extension_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/skia_benchmarking_extension.h"
+#include <stddef.h>
+
#include "base/values.h"
#include "skia/ext/benchmarking_canvas.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc
index 4719463..1b6500b 100644
--- a/content/renderer/speech_recognition_dispatcher.cc
+++ b/content/renderer/speech_recognition_dispatcher.cc
@@ -4,7 +4,9 @@
#include "content/renderer/speech_recognition_dispatcher.h"
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/strings/utf_string_conversions.h"
#include "content/common/speech_recognition_messages.h"
#include "content/renderer/render_view_impl.h"
@@ -102,7 +104,7 @@
}
msg_params.language =
base::UTF16ToUTF8(base::StringPiece16(params.language()));
- msg_params.max_hypotheses = static_cast<uint32>(params.maxAlternatives());
+ msg_params.max_hypotheses = static_cast<uint32_t>(params.maxAlternatives());
msg_params.continuous = params.continuous();
msg_params.interim_results = params.interimResults();
msg_params.origin_url = params.origin().toString().utf8();
diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h
index d3f3c24..21eb831 100644
--- a/content/renderer/speech_recognition_dispatcher.h
+++ b/content/renderer/speech_recognition_dispatcher.h
@@ -7,7 +7,7 @@
#include <map>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
diff --git a/content/renderer/stats_collection_controller.h b/content/renderer/stats_collection_controller.h
index c36349c..df297c1 100644
--- a/content/renderer/stats_collection_controller.h
+++ b/content/renderer/stats_collection_controller.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_STATS_COLLECTION_CONTROLLER_H_
#define CONTENT_RENDERER_STATS_COLLECTION_CONTROLLER_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "gin/wrappable.h"
namespace blink {
diff --git a/content/renderer/stats_collection_observer.h b/content/renderer/stats_collection_observer.h
index 9aba8dc..5a17dfe 100644
--- a/content/renderer/stats_collection_observer.h
+++ b/content/renderer/stats_collection_observer.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_STATS_COLLECTION_OBSERVER_H_
#define CONTENT_RENDERER_STATS_COLLECTION_OBSERVER_H_
+#include "base/macros.h"
#include "base/time/time.h"
#include "content/public/renderer/render_view_observer.h"
diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc
index 87c7486..eda58f2 100644
--- a/content/renderer/text_input_client_observer.cc
+++ b/content/renderer/text_input_client_observer.cc
@@ -4,7 +4,10 @@
#include "content/renderer/text_input_client_observer.h"
+#include <stddef.h>
+
#include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
#include "content/common/text_input_client_messages.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/render_view_impl.h"
diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h
index f7e8723..b8c62b6 100644
--- a/content/renderer/text_input_client_observer.h
+++ b/content/renderer/text_input_client_observer.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_
#define CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "build/build_config.h"
#include "content/public/renderer/render_view_observer.h"
#include "ui/gfx/geometry/point.h"
diff --git a/content/renderer/usb/type_converters.cc b/content/renderer/usb/type_converters.cc
index 2d56d2b..19b76e5 100644
--- a/content/renderer/usb/type_converters.cc
+++ b/content/renderer/usb/type_converters.cc
@@ -4,6 +4,8 @@
#include "content/renderer/usb/type_converters.h"
+#include <stddef.h>
+
#include "base/logging.h"
namespace mojo {
diff --git a/content/renderer/usb/web_usb_client_impl.cc b/content/renderer/usb/web_usb_client_impl.cc
index 0760848..530b64aa 100644
--- a/content/renderer/usb/web_usb_client_impl.cc
+++ b/content/renderer/usb/web_usb_client_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/usb/web_usb_client_impl.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
diff --git a/content/renderer/usb/web_usb_device_impl.h b/content/renderer/usb/web_usb_device_impl.h
index 0f8fc05a..4e49ae9 100644
--- a/content/renderer/usb/web_usb_device_impl.h
+++ b/content/renderer/usb/web_usb_device_impl.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_USB_WEB_USB_DEVICE_IMPL_H_
#define CONTENT_RENDERER_USB_WEB_USB_DEVICE_IMPL_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/content/renderer/vr/vr_dispatcher.cc b/content/renderer/vr/vr_dispatcher.cc
index a797713..07391761 100644
--- a/content/renderer/vr/vr_dispatcher.cc
+++ b/content/renderer/vr/vr_dispatcher.cc
@@ -4,6 +4,8 @@
#include "content/renderer/vr/vr_dispatcher.h"
+#include <stddef.h>
+
#include "content/public/common/service_registry.h"
#include "content/renderer/vr/vr_type_converters.h"
diff --git a/content/renderer/vr/vr_dispatcher.h b/content/renderer/vr/vr_dispatcher.h
index 1dc79f4..b027d05 100644
--- a/content/renderer/vr/vr_dispatcher.h
+++ b/content/renderer/vr/vr_dispatcher.h
@@ -8,6 +8,7 @@
#include <vector>
#include "base/id_map.h"
+#include "base/macros.h"
#include "content/common/vr_service.mojom.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/platform/modules/vr/WebVR.h"
diff --git a/content/renderer/web_ui_extension.h b/content/renderer/web_ui_extension.h
index 1d593ca..8e4bfbb 100644
--- a/content/renderer/web_ui_extension.h
+++ b/content/renderer/web_ui_extension.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
namespace blink {
class WebFrame;
diff --git a/content/renderer/web_ui_extension_data.h b/content/renderer/web_ui_extension_data.h
index f45bc46..8bbac72 100644
--- a/content/renderer/web_ui_extension_data.h
+++ b/content/renderer/web_ui_extension_data.h
@@ -8,7 +8,7 @@
#include <map>
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/public/renderer/render_view_observer_tracker.h"
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc
index 19f2362..8eca5a9 100644
--- a/content/renderer/webclipboard_impl.cc
+++ b/content/renderer/webclipboard_impl.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "content/common/clipboard_format.h"
#include "content/public/common/drop_data.h"
#include "content/renderer/clipboard_utils.h"
@@ -39,7 +40,7 @@
WebClipboardImpl::~WebClipboardImpl() {
}
-uint64 WebClipboardImpl::sequenceNumber(Buffer buffer) {
+uint64_t WebClipboardImpl::sequenceNumber(Buffer buffer) {
ui::ClipboardType clipboard_type;
if (!ConvertBufferType(buffer, &clipboard_type))
return 0;
@@ -103,8 +104,8 @@
base::string16 html_stdstr;
GURL gurl;
delegate_->ReadHTML(clipboard_type, &html_stdstr, &gurl,
- static_cast<uint32*>(fragment_start),
- static_cast<uint32*>(fragment_end));
+ static_cast<uint32_t*>(fragment_start),
+ static_cast<uint32_t*>(fragment_end));
*source_url = gurl;
return html_stdstr;
}
diff --git a/content/renderer/webclipboard_impl.h b/content/renderer/webclipboard_impl.h
index a960406..3bdc568 100644
--- a/content/renderer/webclipboard_impl.h
+++ b/content/renderer/webclipboard_impl.h
@@ -5,12 +5,14 @@
#ifndef CONTENT_RENDERER_WEBCLIPBOARD_IMPL_H_
#define CONTENT_RENDERER_WEBCLIPBOARD_IMPL_H_
+#include <stdint.h>
+
+#include <string>
+
#include "base/compiler_specific.h"
#include "third_party/WebKit/public/platform/WebClipboard.h"
#include "ui/base/clipboard/clipboard.h"
-#include <string>
-
namespace content {
class RendererClipboardDelegate;
@@ -21,7 +23,7 @@
virtual ~WebClipboardImpl();
// WebClipboard methods:
- uint64 sequenceNumber(Buffer buffer) override;
+ uint64_t sequenceNumber(Buffer buffer) override;
bool isFormatAvailable(Format format, Buffer buffer) override;
blink::WebVector<blink::WebString> readAvailableTypes(
Buffer buffer,
diff --git a/content/renderer/webpublicsuffixlist_impl.h b/content/renderer/webpublicsuffixlist_impl.h
index 3ab8507..36970473d 100644
--- a/content/renderer/webpublicsuffixlist_impl.h
+++ b/content/renderer/webpublicsuffixlist_impl.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_WEBPUBLICSUFFIXLIST_IMPL_H_
#define CONTENT_RENDERER_WEBPUBLICSUFFIXLIST_IMPL_H_
+#include <stddef.h>
+
#include "base/compiler_specific.h"
#include "third_party/WebKit/public/platform/WebPublicSuffixList.h"
diff --git a/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc b/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
index 8dfa998..7149c97 100644
--- a/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
+++ b/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
@@ -4,6 +4,7 @@
#include "content/renderer/webscrollbarbehavior_impl_gtkoraura.h"
+#include "build/build_config.h"
#include "third_party/WebKit/public/platform/WebPoint.h"
#include "third_party/WebKit/public/platform/WebRect.h"
diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc
index 272b4e2b..a10aef9 100644
--- a/content/renderer/websharedworker_proxy.cc
+++ b/content/renderer/websharedworker_proxy.cc
@@ -4,6 +4,8 @@
#include "content/renderer/websharedworker_proxy.h"
+#include <stddef.h>
+
#include "content/child/webmessageportchannel_impl.h"
#include "content/common/message_router.h"
#include "content/common/view_messages.h"
diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h
index 0251f8e..276f956 100644
--- a/content/renderer/websharedworker_proxy.h
+++ b/content/renderer/websharedworker_proxy.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "ipc/ipc_listener.h"
#include "third_party/WebKit/public/web/WebSharedWorkerConnector.h"
#include "url/gurl.h"
