diff options
| author | avi <avi@chromium.org> | 2015-12-22 22:45:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-23 06:46:20 +0000 |
| commit | e029c4134fbfdecd6664d152c2d53b605aba6224 (patch) | |
| tree | f9f38311b7c63a7e5eaba902c02aed0e1bb58cc9 /ppapi | |
| parent | 02cefdcaff9d73c0f72033ee9d2d79e7f0cf8383 (diff) | |
| download | chromium_src-e029c4134fbfdecd6664d152c2d53b605aba6224.zip chromium_src-e029c4134fbfdecd6664d152c2d53b605aba6224.tar.gz chromium_src-e029c4134fbfdecd6664d152c2d53b605aba6224.tar.bz2 | |
Switch to standard integer types in ppapi/.
BUG=138542
TBR=bbudge@chromium.org
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1548813002
Cr-Commit-Position: refs/heads/master@{#366718}
Diffstat (limited to 'ppapi')
595 files changed, 1703 insertions, 610 deletions
diff --git a/ppapi/c/private/ppb_flash_file.h b/ppapi/c/private/ppb_flash_file.h index 1473d45..e3c8107 100644 --- a/ppapi/c/private/ppb_flash_file.h +++ b/ppapi/c/private/ppb_flash_file.h @@ -5,6 +5,8 @@ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_FILE_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_FILE_H_ +#include <stdint.h> + #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/c/private/ppb_pdf.h b/ppapi/c/private/ppb_pdf.h index 4ea79cc..a4c49c3 100644 --- a/ppapi/c/private/ppb_pdf.h +++ b/ppapi/c/private/ppb_pdf.h @@ -5,6 +5,8 @@ #ifndef PPAPI_C_PRIVATE_PPB_PDF_H_ #define PPAPI_C_PRIVATE_PPB_PDF_H_ +#include <stdint.h> + #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/c/private/ppp_pdf.h b/ppapi/c/private/ppp_pdf.h index 2a761b8..01c1ac5 100644 --- a/ppapi/c/private/ppp_pdf.h +++ b/ppapi/c/private/ppp_pdf.h @@ -5,6 +5,8 @@ #ifndef PPAPI_C_PRIVATE_PPP_PDF_H_ #define PPAPI_C_PRIVATE_PPP_PDF_H_ +#include <stdint.h> + #include "ppapi/c/dev/pp_print_settings_dev.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_point.h" diff --git a/ppapi/cpp/array_output.h b/ppapi/cpp/array_output.h index fe0bbc3..4af175f 100644 --- a/ppapi/cpp/array_output.h +++ b/ppapi/cpp/array_output.h @@ -5,6 +5,9 @@ #ifndef PPAPI_CPP_ARRAY_OUTPUT_H_ #define PPAPI_CPP_ARRAY_OUTPUT_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "ppapi/c/pp_array_output.h" diff --git a/ppapi/cpp/audio_buffer.h b/ppapi/cpp/audio_buffer.h index ecaa439..0080f8c 100644 --- a/ppapi/cpp/audio_buffer.h +++ b/ppapi/cpp/audio_buffer.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_AUDIO_BUFFER_H_ #define PPAPI_CPP_AUDIO_BUFFER_H_ +#include <stdint.h> + #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/audio_encoder.h b/ppapi/cpp/audio_encoder.h index 620d507..9e5f3ea 100644 --- a/ppapi/cpp/audio_encoder.h +++ b/ppapi/cpp/audio_encoder.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_AUDIO_ENCODER_H_ #define PPAPI_CPP_AUDIO_ENCODER_H_ +#include <stdint.h> + #include "ppapi/c/pp_codecs.h" #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/cpp/audio_buffer.h" diff --git a/ppapi/cpp/completion_callback.h b/ppapi/cpp/completion_callback.h index 2062180..2edbe622 100644 --- a/ppapi/cpp/completion_callback.h +++ b/ppapi/cpp/completion_callback.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_COMPLETION_CALLBACK_H_ #define PPAPI_CPP_COMPLETION_CALLBACK_H_ +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/cpp/logging.h" diff --git a/ppapi/cpp/compositor.h b/ppapi/cpp/compositor.h index c89e262..940acdf 100644 --- a/ppapi/cpp/compositor.h +++ b/ppapi/cpp/compositor.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_COMPOSITOR_H_ #define PPAPI_CPP_COMPOSITOR_H_ +#include <stdint.h> + #include "ppapi/c/ppb_compositor.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/compositor_layer.h" diff --git a/ppapi/cpp/compositor_layer.h b/ppapi/cpp/compositor_layer.h index 9e65e87..b4c46dc 100644 --- a/ppapi/cpp/compositor_layer.h +++ b/ppapi/cpp/compositor_layer.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_COMPOSITOR_LAYER_H_ #define PPAPI_CPP_COMPOSITOR_LAYER_H_ +#include <stdint.h> + #include "ppapi/c/ppb_compositor_layer.h" #include "ppapi/cpp/graphics_3d.h" #include "ppapi/cpp/image_data.h" diff --git a/ppapi/cpp/core.h b/ppapi/cpp/core.h index 35b8655..e4cb4e9 100644 --- a/ppapi/cpp/core.h +++ b/ppapi/cpp/core.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_CORE_H_ #define PPAPI_CPP_CORE_H_ +#include <stdint.h> + #include "ppapi/c/ppb_core.h" /// @file diff --git a/ppapi/cpp/dev/audio_input_dev.h b/ppapi/cpp/dev/audio_input_dev.h index a6e5a54..aacfa08 100644 --- a/ppapi/cpp/dev/audio_input_dev.h +++ b/ppapi/cpp/dev/audio_input_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_ #define PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_ +#include <stdint.h> + #include <vector> #include "ppapi/c/dev/ppb_audio_input_dev.h" diff --git a/ppapi/cpp/dev/buffer_dev.h b/ppapi/cpp/dev/buffer_dev.h index d82f92d..35f18da 100644 --- a/ppapi/cpp/dev/buffer_dev.h +++ b/ppapi/cpp/dev/buffer_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_BUFFER_DEV_H_ #define PPAPI_CPP_DEV_BUFFER_DEV_H_ +#include <stdint.h> + #include "ppapi/cpp/resource.h" namespace pp { diff --git a/ppapi/cpp/dev/file_chooser_dev.cc b/ppapi/cpp/dev/file_chooser_dev.cc index 2efb346..333eb6f 100644 --- a/ppapi/cpp/dev/file_chooser_dev.cc +++ b/ppapi/cpp/dev/file_chooser_dev.cc @@ -4,6 +4,7 @@ #include "ppapi/cpp/dev/file_chooser_dev.h" +#include <stddef.h> #include <string.h> #include "ppapi/c/dev/ppb_file_chooser_dev.h" diff --git a/ppapi/cpp/dev/file_chooser_dev.h b/ppapi/cpp/dev/file_chooser_dev.h index 3d5ee00..4cd4b28 100644 --- a/ppapi/cpp/dev/file_chooser_dev.h +++ b/ppapi/cpp/dev/file_chooser_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_FILE_CHOOSER_DEV_H_ #define PPAPI_CPP_DEV_FILE_CHOOSER_DEV_H_ +#include <stdint.h> + #include <vector> #include "ppapi/c/dev/ppb_file_chooser_dev.h" diff --git a/ppapi/cpp/dev/ime_input_event_dev.h b/ppapi/cpp/dev/ime_input_event_dev.h index f9126aa..525954dc 100644 --- a/ppapi/cpp/dev/ime_input_event_dev.h +++ b/ppapi/cpp/dev/ime_input_event_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_ #define PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_ +#include <stdint.h> + #include <utility> #include <vector> diff --git a/ppapi/cpp/dev/printing_dev.h b/ppapi/cpp/dev/printing_dev.h index 869dbac..d419bc8 100644 --- a/ppapi/cpp/dev/printing_dev.h +++ b/ppapi/cpp/dev/printing_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_PRINTING_DEV_H_ #define PPAPI_CPP_DEV_PRINTING_DEV_H_ +#include <stdint.h> + #include "ppapi/c/dev/ppp_printing_dev.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance_handle.h" diff --git a/ppapi/cpp/dev/scriptable_object_deprecated.cc b/ppapi/cpp/dev/scriptable_object_deprecated.cc index 19c4738..69f26ea 100644 --- a/ppapi/cpp/dev/scriptable_object_deprecated.cc +++ b/ppapi/cpp/dev/scriptable_object_deprecated.cc @@ -3,6 +3,10 @@ // found in the LICENSE file. #include "ppapi/cpp/dev/scriptable_object_deprecated.h" + +#include <stddef.h> +#include <stdint.h> + #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppp_class_deprecated.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/cpp/dev/text_input_dev.h b/ppapi/cpp/dev/text_input_dev.h index fca8728..87f43b6 100644 --- a/ppapi/cpp/dev/text_input_dev.h +++ b/ppapi/cpp/dev/text_input_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_TEXT_INPUT_DEV_H_ #define PPAPI_CPP_DEV_TEXT_INPUT_DEV_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/dev/ppb_text_input_dev.h" diff --git a/ppapi/cpp/dev/truetype_font_dev.h b/ppapi/cpp/dev/truetype_font_dev.h index bd554f7..f1fa0f0 100644 --- a/ppapi/cpp/dev/truetype_font_dev.h +++ b/ppapi/cpp/dev/truetype_font_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_TRUETYPE_FONT_H_ #define PPAPI_CPP_TRUETYPE_FONT_H_ +#include <stdint.h> + #include "ppapi/c/dev/ppb_truetype_font_dev.h" #include "ppapi/c/pp_time.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/cpp/dev/video_capture_client_dev.h b/ppapi/cpp/dev/video_capture_client_dev.h index 85b766e..1658aa5 100644 --- a/ppapi/cpp/dev/video_capture_client_dev.h +++ b/ppapi/cpp/dev/video_capture_client_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_VIDEO_CAPTURE_CLIENT_DEV_H_ #define PPAPI_CPP_DEV_VIDEO_CAPTURE_CLIENT_DEV_H_ +#include <stdint.h> + #include <vector> #include "ppapi/c/dev/pp_video_capture_dev.h" diff --git a/ppapi/cpp/dev/video_capture_dev.h b/ppapi/cpp/dev/video_capture_dev.h index 649254e..fc751af 100644 --- a/ppapi/cpp/dev/video_capture_dev.h +++ b/ppapi/cpp/dev/video_capture_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_VIDEO_CAPTURE_DEV_H_ #define PPAPI_CPP_DEV_VIDEO_CAPTURE_DEV_H_ +#include <stdint.h> + #include <vector> #include "ppapi/c/dev/pp_video_capture_dev.h" diff --git a/ppapi/cpp/dev/video_decoder_dev.h b/ppapi/cpp/dev/video_decoder_dev.h index fab4fb5..9d07ffd 100644 --- a/ppapi/cpp/dev/video_decoder_dev.h +++ b/ppapi/cpp/dev/video_decoder_dev.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_DEV_VIDEO_DECODER_DEV_H_ #define PPAPI_CPP_DEV_VIDEO_DECODER_DEV_H_ +#include <stdint.h> + #include <vector> #include "ppapi/c/dev/pp_video_dev.h" diff --git a/ppapi/cpp/file_io.h b/ppapi/cpp/file_io.h index bbd6b57..3f3faaa 100644 --- a/ppapi/cpp/file_io.h +++ b/ppapi/cpp/file_io.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_FILE_IO_H_ #define PPAPI_CPP_FILE_IO_H_ +#include <stdint.h> + #include "ppapi/c/pp_time.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/graphics_3d.h b/ppapi/cpp/graphics_3d.h index 31af687..b426147 100644 --- a/ppapi/cpp/graphics_3d.h +++ b/ppapi/cpp/graphics_3d.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_GRAPHICS_3D_H_ #define PPAPI_CPP_GRAPHICS_3D_H_ +#include <stdint.h> + #include "ppapi/c/ppb_graphics_3d.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/image_data.h b/ppapi/cpp/image_data.h index e9366ce..ee64ecb 100644 --- a/ppapi/cpp/image_data.h +++ b/ppapi/cpp/image_data.h @@ -5,10 +5,12 @@ #ifndef PPAPI_CPP_IMAGE_DATA_H_ #define PPAPI_CPP_IMAGE_DATA_H_ +#include <stdint.h> + #include "ppapi/c/ppb_image_data.h" #include "ppapi/cpp/point.h" -#include "ppapi/cpp/size.h" #include "ppapi/cpp/resource.h" +#include "ppapi/cpp/size.h" /// @file /// This file defines the APIs for determining how a browser diff --git a/ppapi/cpp/input_event.h b/ppapi/cpp/input_event.h index f9641ef..239e9be 100644 --- a/ppapi/cpp/input_event.h +++ b/ppapi/cpp/input_event.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_INPUT_EVENT_H_ #define PPAPI_CPP_INPUT_EVENT_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/cpp/media_stream_audio_track.h b/ppapi/cpp/media_stream_audio_track.h index 680e52b..869461a 100644 --- a/ppapi/cpp/media_stream_audio_track.h +++ b/ppapi/cpp/media_stream_audio_track.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_MEDIA_STREAM_AUDIO_TRACK_H_ #define PPAPI_CPP_MEDIA_STREAM_AUDIO_TRACK_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/ppb_media_stream_audio_track.h" diff --git a/ppapi/cpp/media_stream_video_track.h b/ppapi/cpp/media_stream_video_track.h index 5d03745..065d1d4 100644 --- a/ppapi/cpp/media_stream_video_track.h +++ b/ppapi/cpp/media_stream_video_track.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_MEDIA_STREAM_VIDEO_TRACK_H_ #define PPAPI_CPP_MEDIA_STREAM_VIDEO_TRACK_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/ppb_media_stream_video_track.h" diff --git a/ppapi/cpp/message_loop.h b/ppapi/cpp/message_loop.h index 6ae3746..4df2dd7 100644 --- a/ppapi/cpp/message_loop.h +++ b/ppapi/cpp/message_loop.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_MESSAGE_LOOP_H_ #define PPAPI_CPP_MESSAGE_LOOP_H_ +#include <stdint.h> + #include "ppapi/cpp/resource.h" /// @file diff --git a/ppapi/cpp/network_list.h b/ppapi/cpp/network_list.h index d479129..39043e9 100644 --- a/ppapi/cpp/network_list.h +++ b/ppapi/cpp/network_list.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_NETWORK_LIST_H_ #define PPAPI_CPP_NETWORK_LIST_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/cpp/network_monitor.h b/ppapi/cpp/network_monitor.h index bce731d9..c2dac4c 100644 --- a/ppapi/cpp/network_monitor.h +++ b/ppapi/cpp/network_monitor.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_NETWORK_MONITOR_H_ #define PPAPI_CPP_NETWORK_MONITOR_H_ +#include <stdint.h> + #include "ppapi/cpp/instance_handle.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/network_proxy.h b/ppapi/cpp/network_proxy.h index 25696de..26fd9e9 100644 --- a/ppapi/cpp/network_proxy.h +++ b/ppapi/cpp/network_proxy.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_NETWORK_PROXY_H_ #define PPAPI_CPP_NETWORK_PROXY_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/cpp/point.h b/ppapi/cpp/point.h index c881bbd..028d050 100644 --- a/ppapi/cpp/point.h +++ b/ppapi/cpp/point.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_POINT_H_ #define PPAPI_CPP_POINT_H_ +#include <stdint.h> + #include "ppapi/c/pp_point.h" /// @file diff --git a/ppapi/cpp/ppp_entrypoints.cc b/ppapi/cpp/ppp_entrypoints.cc index e9e6457..d345dab 100644 --- a/ppapi/cpp/ppp_entrypoints.cc +++ b/ppapi/cpp/ppp_entrypoints.cc @@ -7,9 +7,11 @@ // plugin implementors can export their derivation of Module by just // linking to this implementation. +#include <stdint.h> + +#include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb.h" #include "ppapi/c/ppp.h" -#include "ppapi/c/pp_errors.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/module_embedder.h" diff --git a/ppapi/cpp/private/camera_capabilities_private.cc b/ppapi/cpp/private/camera_capabilities_private.cc index ad3d435..d954027 100644 --- a/ppapi/cpp/private/camera_capabilities_private.cc +++ b/ppapi/cpp/private/camera_capabilities_private.cc @@ -4,6 +4,8 @@ #include "ppapi/cpp/private/camera_capabilities_private.h" +#include <stdint.h> + #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_size.h" #include "ppapi/cpp/instance_handle.h" diff --git a/ppapi/cpp/private/camera_device_private.h b/ppapi/cpp/private/camera_device_private.h index dce1e1b..d6c774e 100644 --- a/ppapi/cpp/private/camera_device_private.h +++ b/ppapi/cpp/private/camera_device_private.h @@ -6,6 +6,8 @@ #ifndef PPAPI_CPP_PRIVATE_CAMERA_DEVICE_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_CAMERA_DEVICE_PRIVATE_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_camera_device_private.h" #include "ppapi/cpp/resource.h" #include "ppapi/cpp/var.h" diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h index 18d2367..765001d 100644 --- a/ppapi/cpp/private/content_decryptor_private.h +++ b/ppapi/cpp/private/content_decryptor_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/cpp/private/ext_crx_file_system_private.h b/ppapi/cpp/private/ext_crx_file_system_private.h index e307f91..2bd43f5 100644 --- a/ppapi/cpp/private/ext_crx_file_system_private.h +++ b/ppapi/cpp/private/ext_crx_file_system_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_ +#include <stdint.h> + #include "ppapi/c/pp_instance.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/file_system.h" diff --git a/ppapi/cpp/private/find_private.h b/ppapi/cpp/private/find_private.h index 268033b..897cd75 100644 --- a/ppapi/cpp/private/find_private.h +++ b/ppapi/cpp/private/find_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FIND_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_FIND_PRIVATE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/cpp/private/flash_clipboard.h b/ppapi/cpp/private/flash_clipboard.h index 0df6028..5b06e63 100644 --- a/ppapi/cpp/private/flash_clipboard.h +++ b/ppapi/cpp/private/flash_clipboard.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FLASH_CLIPBOARD_H_ #define PPAPI_CPP_PRIVATE_FLASH_CLIPBOARD_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/cpp/private/flash_device_id.h b/ppapi/cpp/private/flash_device_id.h index 33c5e55..d285c47 100644 --- a/ppapi/cpp/private/flash_device_id.h +++ b/ppapi/cpp/private/flash_device_id.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FLASH_DEVICE_ID_H_ #define PPAPI_CPP_PRIVATE_FLASH_DEVICE_ID_H_ +#include <stdint.h> + #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/private/flash_drm.h b/ppapi/cpp/private/flash_drm.h index 2edddac..5ac82bc 100644 --- a/ppapi/cpp/private/flash_drm.h +++ b/ppapi/cpp/private/flash_drm.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FLASH_DRM_H_ #define PPAPI_CPP_PRIVATE_FLASH_DRM_H_ +#include <stdint.h> + #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/file_ref.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/private/flash_file.h b/ppapi/cpp/private/flash_file.h index 04ab195..1441c37 100644 --- a/ppapi/cpp/private/flash_file.h +++ b/ppapi/cpp/private/flash_file.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FLASH_FILE_H_ #define PPAPI_CPP_PRIVATE_FLASH_FILE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/cpp/private/flash_font_file.h b/ppapi/cpp/private/flash_font_file.h index ea1671c..0c4aaa6 100644 --- a/ppapi/cpp/private/flash_font_file.h +++ b/ppapi/cpp/private/flash_font_file.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FLASH_FONT_FILE_H_ #define PPAPI_CPP_PRIVATE_FLASH_FONT_FILE_H_ +#include <stdint.h> + #include "ppapi/c/private/pp_private_font_charset.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/private/flash_menu.h b/ppapi/cpp/private/flash_menu.h index a0a7499..cadc97d 100644 --- a/ppapi/cpp/private/flash_menu.h +++ b/ppapi/cpp/private/flash_menu.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_FLASH_MENU_H_ #define PPAPI_CPP_PRIVATE_FLASH_MENU_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_flash_menu.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/private/isolated_file_system_private.h b/ppapi/cpp/private/isolated_file_system_private.h index 88213d6..2cbdc11 100644 --- a/ppapi/cpp/private/isolated_file_system_private.h +++ b/ppapi/cpp/private/isolated_file_system_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_ISOLATED_FILE_SYSTEM_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_ISOLATED_FILE_SYSTEM_PRIVATE_H_ +#include <stdint.h> + #include "ppapi/c/pp_instance.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/cpp/private/output_protection_private.h b/ppapi/cpp/private/output_protection_private.h index 6b543ea..2bcb260 100644 --- a/ppapi/cpp/private/output_protection_private.h +++ b/ppapi/cpp/private/output_protection_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_OUTPUT_PROTECTION_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_OUTPUT_PROTECTION_PRIVATE_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_output_protection_private.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/private/pdf.h b/ppapi/cpp/private/pdf.h index 7e77270..755c9c3 100644 --- a/ppapi/cpp/private/pdf.h +++ b/ppapi/cpp/private/pdf.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_PDF_H_ #define PPAPI_CPP_PRIVATE_PDF_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/private/ppb_pdf.h" diff --git a/ppapi/cpp/private/platform_verification.h b/ppapi/cpp/private/platform_verification.h index 166077a..a9f73fa 100644 --- a/ppapi/cpp/private/platform_verification.h +++ b/ppapi/cpp/private/platform_verification.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_PLATFORM_VERIFICATION_H_ #define PPAPI_CPP_PRIVATE_PLATFORM_VERIFICATION_H_ +#include <stdint.h> + #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/cpp/private/uma_private.h b/ppapi/cpp/private/uma_private.h index 78d526d..b9ba156 100644 --- a/ppapi/cpp/private/uma_private.h +++ b/ppapi/cpp/private/uma_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_UMA_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_UMA_PRIVATE_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/pp_instance.h" diff --git a/ppapi/cpp/private/var_private.cc b/ppapi/cpp/private/var_private.cc index ff61226..0dbe2dc 100644 --- a/ppapi/cpp/private/var_private.cc +++ b/ppapi/cpp/private/var_private.cc @@ -4,6 +4,8 @@ #include "ppapi/cpp/private/var_private.h" +#include <stddef.h> + #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/cpp/instance_handle.h" diff --git a/ppapi/cpp/private/var_private.h b/ppapi/cpp/private/var_private.h index 7cc0e31..63522ca 100644 --- a/ppapi/cpp/private/var_private.h +++ b/ppapi/cpp/private/var_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_VAR_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_VAR_PRIVATE_H_ +#include <stdint.h> + #include "ppapi/cpp/var.h" namespace pp { diff --git a/ppapi/cpp/private/video_destination_private.h b/ppapi/cpp/private/video_destination_private.h index a936485..7e2bd5b 100644 --- a/ppapi/cpp/private/video_destination_private.h +++ b/ppapi/cpp/private/video_destination_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_VIDEO_DESTINATION_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_VIDEO_DESTINATION_PRIVATE_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/pp_time.h" diff --git a/ppapi/cpp/private/video_source_private.h b/ppapi/cpp/private/video_source_private.h index 487703e..b62e030 100644 --- a/ppapi/cpp/private/video_source_private.h +++ b/ppapi/cpp/private/video_source_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_PRIVATE_VIDEO_SOURCE_PRIVATE_H_ #define PPAPI_CPP_PRIVATE_VIDEO_SOURCE_PRIVATE_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/pp_time.h" diff --git a/ppapi/cpp/rect.h b/ppapi/cpp/rect.h index 15bb1f5..7973a83 100644 --- a/ppapi/cpp/rect.h +++ b/ppapi/cpp/rect.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_RECT_H_ #define PPAPI_CPP_RECT_H_ +#include <stdint.h> + #include "ppapi/c/pp_rect.h" #include "ppapi/cpp/point.h" #include "ppapi/cpp/size.h" diff --git a/ppapi/cpp/tcp_socket.h b/ppapi/cpp/tcp_socket.h index 578e08f..84981e7 100644 --- a/ppapi/cpp/tcp_socket.h +++ b/ppapi/cpp/tcp_socket.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_TCP_SOCKET_H_ #define PPAPI_CPP_TCP_SOCKET_H_ +#include <stdint.h> + #include "ppapi/c/ppb_tcp_socket.h" #include "ppapi/cpp/net_address.h" #include "ppapi/cpp/pass_ref.h" diff --git a/ppapi/cpp/text_input_controller.h b/ppapi/cpp/text_input_controller.h index 8843bd3..69b1120 100644 --- a/ppapi/cpp/text_input_controller.h +++ b/ppapi/cpp/text_input_controller.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_TEXT_INPUT_CONTROLLER_H_ #define PPAPI_CPP_TEXT_INPUT_CONTROLLER_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/ppb_text_input_controller.h" diff --git a/ppapi/cpp/touch_point.h b/ppapi/cpp/touch_point.h index 0868061..66c512b 100644 --- a/ppapi/cpp/touch_point.h +++ b/ppapi/cpp/touch_point.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_TOUCH_POINT_H_ #define PPAPI_CPP_TOUCH_POINT_H_ +#include <stdint.h> + #include "ppapi/c/ppb_input_event.h" #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/point.h" diff --git a/ppapi/cpp/trusted/browser_font_trusted.h b/ppapi/cpp/trusted/browser_font_trusted.h index 7225b26..c3bef77 100644 --- a/ppapi/cpp/trusted/browser_font_trusted.h +++ b/ppapi/cpp/trusted/browser_font_trusted.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_TRUSTED_BROWSER_FONT_TRUSTED_H_ #define PPAPI_CPP_TRUSTED_BROWSER_FONT_TRUSTED_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/trusted/ppb_browser_font_trusted.h" diff --git a/ppapi/cpp/trusted/file_chooser_trusted.h b/ppapi/cpp/trusted/file_chooser_trusted.h index cdb70b0..dfd7c58 100644 --- a/ppapi/cpp/trusted/file_chooser_trusted.h +++ b/ppapi/cpp/trusted/file_chooser_trusted.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_TRUSTED_FILE_CHOOSER_TRUSTED_H_ #define PPAPI_CPP_TRUSTED_FILE_CHOOSER_TRUSTED_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/dev/file_chooser_dev.h" diff --git a/ppapi/cpp/udp_socket.h b/ppapi/cpp/udp_socket.h index 69e906f..2de3766 100644 --- a/ppapi/cpp/udp_socket.h +++ b/ppapi/cpp/udp_socket.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_UDP_SOCKET_H_ #define PPAPI_CPP_UDP_SOCKET_H_ +#include <stdint.h> + #include "ppapi/c/ppb_udp_socket.h" #include "ppapi/cpp/net_address.h" #include "ppapi/cpp/pass_ref.h" diff --git a/ppapi/cpp/url_request_info.h b/ppapi/cpp/url_request_info.h index c476be4..2710d87 100644 --- a/ppapi/cpp/url_request_info.h +++ b/ppapi/cpp/url_request_info.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_URL_REQUEST_INFO_H_ #define PPAPI_CPP_URL_REQUEST_INFO_H_ +#include <stdint.h> + #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/cpp/resource.h" #include "ppapi/cpp/var.h" diff --git a/ppapi/cpp/url_response_info.h b/ppapi/cpp/url_response_info.h index f9e60cf..727b720 100644 --- a/ppapi/cpp/url_response_info.h +++ b/ppapi/cpp/url_response_info.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_URL_RESPONSE_INFO_H_ #define PPAPI_CPP_URL_RESPONSE_INFO_H_ +#include <stdint.h> + #include "ppapi/c/ppb_url_response_info.h" #include "ppapi/cpp/resource.h" #include "ppapi/cpp/var.h" diff --git a/ppapi/cpp/var.cc b/ppapi/cpp/var.cc index e16b0e4..bd5844c 100644 --- a/ppapi/cpp/var.cc +++ b/ppapi/cpp/var.cc @@ -4,6 +4,7 @@ #include "ppapi/cpp/var.h" +#include <stddef.h> #include <stdio.h> #include <string.h> diff --git a/ppapi/cpp/var.h b/ppapi/cpp/var.h index a79f3c4..1b24356 100644 --- a/ppapi/cpp/var.h +++ b/ppapi/cpp/var.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_VAR_H_ #define PPAPI_CPP_VAR_H_ +#include <stdint.h> + #include <string> #include <vector> @@ -164,7 +166,7 @@ class Var { /// This function determines if this <code>Var</code> is a number. /// - /// @return true if this <code>Var</code> is an int32 or double number, + /// @return true if this <code>Var</code> is an int32_t or double number, /// otherwise false. bool is_number() const { return var_.type == PP_VARTYPE_INT32 || diff --git a/ppapi/cpp/var_array_buffer.h b/ppapi/cpp/var_array_buffer.h index 7d1f9ad..54b9395 100644 --- a/ppapi/cpp/var_array_buffer.h +++ b/ppapi/cpp/var_array_buffer.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_VAR_ARRAY_BUFFER_H_ #define PPAPI_CPP_VAR_ARRAY_BUFFER_H_ +#include <stdint.h> + #include "ppapi/cpp/var.h" /// @file diff --git a/ppapi/cpp/video_decoder.h b/ppapi/cpp/video_decoder.h index 50b0ea2..dda74c7 100644 --- a/ppapi/cpp/video_decoder.h +++ b/ppapi/cpp/video_decoder.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_VIDEO_DECODER_H_ #define PPAPI_CPP_VIDEO_DECODER_H_ +#include <stdint.h> + #include "ppapi/c/pp_codecs.h" #include "ppapi/c/pp_size.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/cpp/video_encoder.cc b/ppapi/cpp/video_encoder.cc index 969fc1f..eab719f 100644 --- a/ppapi/cpp/video_encoder.cc +++ b/ppapi/cpp/video_encoder.cc @@ -4,6 +4,8 @@ #include "ppapi/cpp/video_encoder.h" +#include <stddef.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_video_encoder.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/cpp/video_encoder.h b/ppapi/cpp/video_encoder.h index e3b3d3e..1a80185 100644 --- a/ppapi/cpp/video_encoder.h +++ b/ppapi/cpp/video_encoder.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_VIDEO_ENCODER_H_ #define PPAPI_CPP_VIDEO_ENCODER_H_ +#include <stdint.h> + #include "ppapi/c/pp_codecs.h" #include "ppapi/c/pp_size.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/cpp/video_frame.h b/ppapi/cpp/video_frame.h index d456158..05cfcff 100644 --- a/ppapi/cpp/video_frame.h +++ b/ppapi/cpp/video_frame.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_VIDEO_FRAME_H_ #define PPAPI_CPP_VIDEO_FRAME_H_ +#include <stdint.h> + #include "ppapi/c/ppb_video_frame.h" #include "ppapi/cpp/resource.h" #include "ppapi/cpp/size.h" diff --git a/ppapi/cpp/websocket.h b/ppapi/cpp/websocket.h index 0c72dc0..c1c78b0 100644 --- a/ppapi/cpp/websocket.h +++ b/ppapi/cpp/websocket.h @@ -5,6 +5,8 @@ #ifndef PPAPI_CPP_WEBSOCKET_H_ #define PPAPI_CPP_WEBSOCKET_H_ +#include <stdint.h> + #include "ppapi/c/ppb_websocket.h" #include "ppapi/cpp/resource.h" diff --git a/ppapi/examples/2d/graphics_2d_example.c b/ppapi/examples/2d/graphics_2d_example.c index 0f32617..98afadb 100644 --- a/ppapi/examples/2d/graphics_2d_example.c +++ b/ppapi/examples/2d/graphics_2d_example.c @@ -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 <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/ppapi/examples/2d/paint_manager_example.cc b/ppapi/examples/2d/paint_manager_example.cc index c8d6a79..3711ade 100644 --- a/ppapi/examples/2d/paint_manager_example.cc +++ b/ppapi/examples/2d/paint_manager_example.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 <algorithm> #include "ppapi/c/pp_input_event.h" diff --git a/ppapi/examples/2d/scroll.cc b/ppapi/examples/2d/scroll.cc index 506129c..fc3494cb 100644 --- a/ppapi/examples/2d/scroll.cc +++ b/ppapi/examples/2d/scroll.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include <math.h> +#include <stdint.h> #include <algorithm> diff --git a/ppapi/examples/audio/audio.cc b/ppapi/examples/audio/audio.cc index e6a0a84..07540f1 100644 --- a/ppapi/examples/audio/audio.cc +++ b/ppapi/examples/audio/audio.cc @@ -8,6 +8,8 @@ #endif #include <math.h> +#include <stddef.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/ppapi/examples/audio_encode/audio_encode.cc b/ppapi/examples/audio_encode/audio_encode.cc index a5f3372..947c9ca 100644 --- a/ppapi/examples/audio_encode/audio_encode.cc +++ b/ppapi/examples/audio_encode/audio_encode.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 <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/ppapi/examples/audio_input/audio_input.cc b/ppapi/examples/audio_input/audio_input.cc index bf7496e..bceb234 100644 --- a/ppapi/examples/audio_input/audio_input.cc +++ b/ppapi/examples/audio_input/audio_input.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 <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/ppapi/examples/compositor/compositor.cc b/ppapi/examples/compositor/compositor.cc index df2962a..71944e0 100644 --- a/ppapi/examples/compositor/compositor.cc +++ b/ppapi/examples/compositor/compositor.cc @@ -34,6 +34,8 @@ // include-guards), make sure this is the last file #include'd in this file. #undef NDEBUG #include <assert.h> +#include <stddef.h> +#include <stdint.h> // When compiling natively on Windows, PostMessage can be #define-d to // something else. diff --git a/ppapi/examples/crxfs/crxfs.cc b/ppapi/examples/crxfs/crxfs.cc index 86a212b..a66a4c1 100644 --- a/ppapi/examples/crxfs/crxfs.cc +++ b/ppapi/examples/crxfs/crxfs.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 <sstream> #include "ppapi/c/ppb_file_io.h" diff --git a/ppapi/examples/enumerate_devices/enumerate_devices.cc b/ppapi/examples/enumerate_devices/enumerate_devices.cc index 383a0e5..4118a1c 100644 --- a/ppapi/examples/enumerate_devices/enumerate_devices.cc +++ b/ppapi/examples/enumerate_devices/enumerate_devices.cc @@ -3,16 +3,18 @@ // found in the LICENSE file. #include <assert.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <vector> #include "ppapi/c/dev/ppb_video_capture_dev.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/dev/device_ref_dev.h" -#include "ppapi/cpp/dev/video_capture_dev.h" #include "ppapi/cpp/dev/video_capture_client_dev.h" -#include "ppapi/cpp/completion_callback.h" +#include "ppapi/cpp/dev/video_capture_dev.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/private/flash.h" diff --git a/ppapi/examples/file_chooser/file_chooser.cc b/ppapi/examples/file_chooser/file_chooser.cc index f220dd8..6221b613 100644 --- a/ppapi/examples/file_chooser/file_chooser.cc +++ b/ppapi/examples/file_chooser/file_chooser.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 "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/pp_input_event.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/examples/flash_topmost/flash_topmost.cc b/ppapi/examples/flash_topmost/flash_topmost.cc index 001a6e5..56dd967 100644 --- a/ppapi/examples/flash_topmost/flash_topmost.cc +++ b/ppapi/examples/flash_topmost/flash_topmost.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 "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/examples/font/simple_font.cc b/ppapi/examples/font/simple_font.cc index b66c79e..8f513ad2 100644 --- a/ppapi/examples/font/simple_font.cc +++ b/ppapi/examples/font/simple_font.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 <stdint.h> #include <stdio.h> #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/examples/gamepad/gamepad.cc b/ppapi/examples/gamepad/gamepad.cc index bfac65a..218f03f 100644 --- a/ppapi/examples/gamepad/gamepad.cc +++ b/ppapi/examples/gamepad/gamepad.cc @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <algorithm> -#include <cmath> #include <stdarg.h> +#include <stddef.h> +#include <stdint.h> #include <stdio.h> +#include <algorithm> +#include <cmath> #include "ppapi/c/ppb_gamepad.h" #include "ppapi/c/ppb_input_event.h" diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc index af2aaea..0b5797a 100644 --- a/ppapi/examples/gles2/gles2.cc +++ b/ppapi/examples/gles2/gles2.cc @@ -26,6 +26,7 @@ // include-guards), make sure this is the last file #include'd in this file. #undef NDEBUG #include <assert.h> +#include <stdint.h> // Assert |context_| isn't holding any GL Errors. Done as a macro instead of a // function to preserve line number information in the failure message. diff --git a/ppapi/examples/gles2_spinning_cube/gles2_spinning_cube.cc b/ppapi/examples/gles2_spinning_cube/gles2_spinning_cube.cc index de1ccba..6a2f7f1 100644 --- a/ppapi/examples/gles2_spinning_cube/gles2_spinning_cube.cc +++ b/ppapi/examples/gles2_spinning_cube/gles2_spinning_cube.cc @@ -19,6 +19,7 @@ // include-guards), make sure this is the last file #include'd in this file. #undef NDEBUG #include <assert.h> +#include <stdint.h> namespace { diff --git a/ppapi/examples/ime/ime.cc b/ppapi/examples/ime/ime.cc index a48928b..a87d62c 100644 --- a/ppapi/examples/ime/ime.cc +++ b/ppapi/examples/ime/ime.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 <algorithm> #include <string> #include <utility> diff --git a/ppapi/examples/input/pointer_event_input.cc b/ppapi/examples/input/pointer_event_input.cc index 3cd76b3..b413d05 100644 --- a/ppapi/examples/input/pointer_event_input.cc +++ b/ppapi/examples/input/pointer_event_input.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 <algorithm> #include "ppapi/c/pp_input_event.h" diff --git a/ppapi/examples/media_stream_audio/media_stream_audio.cc b/ppapi/examples/media_stream_audio/media_stream_audio.cc index 1d7bac1..f8fe23c 100644 --- a/ppapi/examples/media_stream_audio/media_stream_audio.cc +++ b/ppapi/examples/media_stream_audio/media_stream_audio.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 <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/ppapi/examples/media_stream_video/media_stream_video.cc b/ppapi/examples/media_stream_video/media_stream_video.cc index c0b60a3..e49aa13 100644 --- a/ppapi/examples/media_stream_video/media_stream_video.cc +++ b/ppapi/examples/media_stream_video/media_stream_video.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <stdint.h> #include <string.h> #include <vector> diff --git a/ppapi/examples/mouse_cursor/mouse_cursor.cc b/ppapi/examples/mouse_cursor/mouse_cursor.cc index e922fa0..0bc6a76 100644 --- a/ppapi/examples/mouse_cursor/mouse_cursor.cc +++ b/ppapi/examples/mouse_cursor/mouse_cursor.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 <algorithm> #include "ppapi/cpp/graphics_2d.h" diff --git a/ppapi/examples/mouse_lock/mouse_lock.cc b/ppapi/examples/mouse_lock/mouse_lock.cc index 3b1644f..e6397e6 100644 --- a/ppapi/examples/mouse_lock/mouse_lock.cc +++ b/ppapi/examples/mouse_lock/mouse_lock.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <cmath> #include <stdarg.h> +#include <stdint.h> #include <stdio.h> +#include <cmath> #include "ppapi/c/ppb_console.h" #include "ppapi/c/ppb_input_event.h" diff --git a/ppapi/examples/printing/printing.cc b/ppapi/examples/printing/printing.cc index 37a7273..c52d478 100644 --- a/ppapi/examples/printing/printing.cc +++ b/ppapi/examples/printing/printing.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 <stdint.h> #include <string.h> #include "ppapi/cpp/dev/buffer_dev.h" diff --git a/ppapi/examples/scaling/scaling.cc b/ppapi/examples/scaling/scaling.cc index 6a7c4eb..ec081a2 100644 --- a/ppapi/examples/scaling/scaling.cc +++ b/ppapi/examples/scaling/scaling.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 <sstream> #include "ppapi/c/pp_errors.h" diff --git a/ppapi/examples/stub/stub.c b/ppapi/examples/stub/stub.c index 8786669..6568b6d 100644 --- a/ppapi/examples/stub/stub.c +++ b/ppapi/examples/stub/stub.c @@ -7,6 +7,7 @@ // C++ wrappers. #include <stddef.h> +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_module.h" diff --git a/ppapi/examples/stub/stub.cc b/ppapi/examples/stub/stub.cc index 41628a3..20d819f 100644 --- a/ppapi/examples/stub/stub.cc +++ b/ppapi/examples/stub/stub.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 "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/examples/threading/threading.cc b/ppapi/examples/threading/threading.cc index bfd21a9..0b812c4 100644 --- a/ppapi/examples/threading/threading.cc +++ b/ppapi/examples/threading/threading.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 "ppapi/c/pp_errors.h" #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/examples/url_loader/stream_to_file.cc b/ppapi/examples/url_loader/stream_to_file.cc index 887a9d7..61e5f74 100644 --- a/ppapi/examples/url_loader/stream_to_file.cc +++ b/ppapi/examples/url_loader/stream_to_file.cc @@ -9,6 +9,8 @@ // This example uses PostMessage between the plugin and the url_loader.html // page in this directory to start the load and to communicate the result. +#include <stdint.h> + #include "ppapi/c/ppb_file_io.h" #include "ppapi/cpp/file_io.h" #include "ppapi/cpp/file_ref.h" diff --git a/ppapi/examples/url_loader/streaming.cc b/ppapi/examples/url_loader/streaming.cc index 762a00b..cc8847c 100644 --- a/ppapi/examples/url_loader/streaming.cc +++ b/ppapi/examples/url_loader/streaming.cc @@ -9,6 +9,8 @@ // // The other mode is to stream to a file instead. See stream_to_file.cc +#include <stdint.h> + #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/url_loader.h" diff --git a/ppapi/examples/video_capture/video_capture.cc b/ppapi/examples/video_capture/video_capture.cc index b95fcac..9a0a32d 100644 --- a/ppapi/examples/video_capture/video_capture.cc +++ b/ppapi/examples/video_capture/video_capture.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 <stdint.h> #include <stdlib.h> #include <string.h> @@ -11,13 +13,13 @@ #include "ppapi/c/dev/ppb_video_capture_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_opengles2.h" +#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/dev/buffer_dev.h" #include "ppapi/cpp/dev/device_ref_dev.h" -#include "ppapi/cpp/dev/video_capture_dev.h" #include "ppapi/cpp/dev/video_capture_client_dev.h" -#include "ppapi/cpp/completion_callback.h" -#include "ppapi/cpp/graphics_3d_client.h" +#include "ppapi/cpp/dev/video_capture_dev.h" #include "ppapi/cpp/graphics_3d.h" +#include "ppapi/cpp/graphics_3d_client.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/rect.h" diff --git a/ppapi/examples/video_decode/video_decode.cc b/ppapi/examples/video_decode/video_decode.cc index e15ef42..65b70aa 100644 --- a/ppapi/examples/video_decode/video_decode.cc +++ b/ppapi/examples/video_decode/video_decode.cc @@ -35,6 +35,8 @@ // include-guards), make sure this is the last file #include'd in this file. #undef NDEBUG #include <assert.h> +#include <stddef.h> +#include <stdint.h> // Assert |context_| isn't holding any GL Errors. Done as a macro instead of a // function to preserve line number information in the failure message. diff --git a/ppapi/examples/video_decode/video_decode_dev.cc b/ppapi/examples/video_decode/video_decode_dev.cc index 1cacb1b..acaef1a 100644 --- a/ppapi/examples/video_decode/video_decode_dev.cc +++ b/ppapi/examples/video_decode/video_decode_dev.cc @@ -32,6 +32,8 @@ // include-guards), make sure this is the last file #include'd in this file. #undef NDEBUG #include <assert.h> +#include <stddef.h> +#include <stdint.h> // Assert |context_| isn't holding any GL Errors. Done as a macro instead of a // function to preserve line number information in the failure message. diff --git a/ppapi/examples/video_effects/video_effects.cc b/ppapi/examples/video_effects/video_effects.cc index 101ba9c..ab6dc35 100644 --- a/ppapi/examples/video_effects/video_effects.cc +++ b/ppapi/examples/video_effects/video_effects.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 <stdint.h> #include <string.h> #include <iterator> #include <sstream> diff --git a/ppapi/examples/video_encode/video_encode.cc b/ppapi/examples/video_encode/video_encode.cc index bbe67f3..3c61888 100644 --- a/ppapi/examples/video_encode/video_encode.cc +++ b/ppapi/examples/video_encode/video_encode.cc @@ -38,6 +38,8 @@ // include-guards), make sure this is the last file #include'd in this file. #undef NDEBUG #include <assert.h> +#include <stddef.h> +#include <stdint.h> #define fourcc(a, b, c, d) \ (((uint32_t)(a) << 0) | ((uint32_t)(b) << 8) | ((uint32_t)(c) << 16) | \ diff --git a/ppapi/generators/test_thunk/simple_thunk.cc b/ppapi/generators/test_thunk/simple_thunk.cc index 8fc2ba2..15ba99c 100644 --- a/ppapi/generators/test_thunk/simple_thunk.cc +++ b/ppapi/generators/test_thunk/simple_thunk.cc @@ -4,6 +4,8 @@ // From ../test_thunk/simple.idl modified Fri Nov 16 11:26:06 2012. +#include <stdint.h> + #include "ppapi/c/../test_thunk/simple.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/host/dispatch_host_message.h b/ppapi/host/dispatch_host_message.h index 5d05019..a0b092e 100644 --- a/ppapi/host/dispatch_host_message.h +++ b/ppapi/host/dispatch_host_message.h @@ -10,6 +10,8 @@ #ifndef PPAPI_HOST_DISPATCH_HOST_MESSAGE_H_ #define PPAPI_HOST_DISPATCH_HOST_MESSAGE_H_ +#include <stdint.h> + #include "base/profiler/scoped_profile.h" #include "ipc/ipc_message_macros.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/host/instance_message_filter.h b/ppapi/host/instance_message_filter.h index 2b072e9..83f7115 100644 --- a/ppapi/host/instance_message_filter.h +++ b/ppapi/host/instance_message_filter.h @@ -5,7 +5,7 @@ #ifndef PPAPI_HOST_INSTANCE_MESSAGE_FILTER_H_ #define PPAPI_HOST_INSTANCE_MESSAGE_FILTER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/host/ppapi_host_export.h" namespace IPC { diff --git a/ppapi/host/message_filter_host.h b/ppapi/host/message_filter_host.h index 9aa1c5b..cfc5245 100644 --- a/ppapi/host/message_filter_host.h +++ b/ppapi/host/message_filter_host.h @@ -6,6 +6,7 @@ #define PPAPI_HOST_MESSAGE_FILTER_HOST_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/host/ppapi_host_export.h" #include "ppapi/host/resource_host.h" diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc index 2519aa8..b8a1a01 100644 --- a/ppapi/host/ppapi_host.cc +++ b/ppapi/host/ppapi_host.cc @@ -4,6 +4,8 @@ #include "ppapi/host/ppapi_host.h" +#include <stddef.h> + #include "base/logging.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/host_factory.h" diff --git a/ppapi/host/ppapi_host.h b/ppapi/host/ppapi_host.h index f2a3821..5788745 100644 --- a/ppapi/host/ppapi_host.h +++ b/ppapi/host/ppapi_host.h @@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/ppapi/host/resource_host.cc b/ppapi/host/resource_host.cc index 2d5af58..260e855 100644 --- a/ppapi/host/resource_host.cc +++ b/ppapi/host/resource_host.cc @@ -4,6 +4,8 @@ #include "ppapi/host/resource_host.h" +#include <stddef.h> + #include "base/logging.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/ppapi_host.h" diff --git a/ppapi/host/resource_host.h b/ppapi/host/resource_host.h index 6bf4996..8c1b057 100644 --- a/ppapi/host/resource_host.h +++ b/ppapi/host/resource_host.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_resource.h" #include "ppapi/host/ppapi_host_export.h" diff --git a/ppapi/host/resource_message_filter.h b/ppapi/host/resource_message_filter.h index 9108847..8dcf6c2 100644 --- a/ppapi/host/resource_message_filter.h +++ b/ppapi/host/resource_message_filter.h @@ -5,6 +5,7 @@ #ifndef PPAPI_HOST_RESOURCE_MESSAGE_FILTER_H_ #define PPAPI_HOST_RESOURCE_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/host/host_message_context.h" diff --git a/ppapi/host/resource_message_filter_unittest.cc b/ppapi/host/resource_message_filter_unittest.cc index 2cd015c..f376a81 100644 --- a/ppapi/host/resource_message_filter_unittest.cc +++ b/ppapi/host/resource_message_filter_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/location.h" @@ -41,13 +43,12 @@ class MyResourceHost : public ResourceHost { MyResourceHost(PpapiHost* host, PP_Instance instance, PP_Resource resource, - uint32 msg_type, - uint32 reply_msg_type) + uint32_t msg_type, + uint32_t reply_msg_type) : ResourceHost(host, instance, resource), msg_type_(msg_type), reply_msg_type_(reply_msg_type), - last_reply_message_loop_(NULL) { - } + last_reply_message_loop_(NULL) {} const IPC::Message& last_handled_msg() const { return last_handled_msg_; } const IPC::Message& last_reply_msg() const { return last_reply_msg_; } @@ -78,8 +79,8 @@ class MyResourceHost : public ResourceHost { } private: - uint32 msg_type_; - uint32 reply_msg_type_; + uint32_t msg_type_; + uint32_t reply_msg_type_; IPC::Message last_handled_msg_; IPC::Message last_reply_msg_; @@ -97,8 +98,8 @@ class MyResourceFilter : public ResourceMessageFilter { // should be handled. MyResourceFilter(const base::Thread& io_thread, const base::Thread& bg_thread, - uint32 msg_type, - uint32 reply_msg_type) + uint32_t msg_type, + uint32_t reply_msg_type) : ResourceMessageFilter(io_thread.task_runner()), task_runner_(bg_thread.task_runner()), msg_type_(msg_type), @@ -130,8 +131,8 @@ class MyResourceFilter : public ResourceMessageFilter { private: scoped_refptr<base::SingleThreadTaskRunner> task_runner_; - uint32 msg_type_; - uint32 reply_msg_type_; + uint32_t msg_type_; + uint32_t reply_msg_type_; IPC::Message last_handled_msg_; base::MessageLoop* last_message_loop_; @@ -174,7 +175,7 @@ class ResourceMessageFilterTest : public testing::Test { EXPECT_EQ(filter1->last_handled_msg().type(), message1.type()); EXPECT_EQ(filter1->last_message_loop(), bg_thread1.message_loop()); EXPECT_EQ(host.last_reply_msg().type(), - static_cast<uint32>(REPLY_MSG1_TYPE)); + static_cast<uint32_t>(REPLY_MSG1_TYPE)); EXPECT_EQ(host.last_reply_message_loop(), io_thread.message_loop()); g_handler_completion.Reset(); @@ -184,7 +185,7 @@ class ResourceMessageFilterTest : public testing::Test { EXPECT_EQ(filter2->last_handled_msg().type(), message2.type()); EXPECT_EQ(filter2->last_message_loop(), bg_thread2.message_loop()); EXPECT_EQ(host.last_reply_msg().type(), - static_cast<uint32>(REPLY_MSG2_TYPE)); + static_cast<uint32_t>(REPLY_MSG2_TYPE)); EXPECT_EQ(host.last_reply_message_loop(), io_thread.message_loop()); g_handler_completion.Reset(); @@ -192,7 +193,7 @@ class ResourceMessageFilterTest : public testing::Test { host.HandleMessage(message3, &context); EXPECT_EQ(host.last_handled_msg().type(), message3.type()); EXPECT_EQ(host.last_reply_msg().type(), - static_cast<uint32>(REPLY_MSG3_TYPE)); + static_cast<uint32_t>(REPLY_MSG3_TYPE)); io_thread.Stop(); bg_thread1.Stop(); diff --git a/ppapi/host/resource_message_handler.h b/ppapi/host/resource_message_handler.h index 73f7f842..8aeaf04 100644 --- a/ppapi/host/resource_message_handler.h +++ b/ppapi/host/resource_message_handler.h @@ -5,7 +5,7 @@ #ifndef PPAPI_HOST_RESOURCE_MESSAGE_HANDLER_H_ #define PPAPI_HOST_RESOURCE_MESSAGE_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/host/ppapi_host_export.h" diff --git a/ppapi/nacl_irt/irt_interfaces.h b/ppapi/nacl_irt/irt_interfaces.h index c18d34e..e82e903 100644 --- a/ppapi/nacl_irt/irt_interfaces.h +++ b/ppapi/nacl_irt/irt_interfaces.h @@ -5,6 +5,7 @@ #ifndef PPAPI_NACL_IRT_IRT_INTERFACES_H_ #define PPAPI_NACL_IRT_IRT_INTERFACES_H_ +#include <stddef.h> #include <stdlib.h> extern const struct nacl_irt_ppapihook nacl_irt_ppapihook; diff --git a/ppapi/nacl_irt/irt_manifest.h b/ppapi/nacl_irt/irt_manifest.h index 5938a45..d28b5aa 100644 --- a/ppapi/nacl_irt/irt_manifest.h +++ b/ppapi/nacl_irt/irt_manifest.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "build/build_config.h" #include "ppapi/proxy/ppapi_proxy_export.h" namespace ppapi { diff --git a/ppapi/nacl_irt/irt_pnacl_translator_compile.cc b/ppapi/nacl_irt/irt_pnacl_translator_compile.cc index 9afd505..d676b21 100644 --- a/ppapi/nacl_irt/irt_pnacl_translator_compile.cc +++ b/ppapi/nacl_irt/irt_pnacl_translator_compile.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include <argz.h> +#include <stddef.h> #include <string.h> #include "build/build_config.h" diff --git a/ppapi/nacl_irt/irt_ppapi.cc b/ppapi/nacl_irt/irt_ppapi.cc index 2d2bb66..8d2f715 100644 --- a/ppapi/nacl_irt/irt_ppapi.cc +++ b/ppapi/nacl_irt/irt_ppapi.cc @@ -8,6 +8,8 @@ // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the // ViewMsgLog et al. functions. +#include <stdint.h> + #include "base/threading/thread.h" #include "ipc/ipc_logging.h" #include "ppapi/nacl_irt/irt_interfaces.h" diff --git a/ppapi/nacl_irt/irt_start.cc b/ppapi/nacl_irt/irt_start.cc index 82765c8..b0f09df 100644 --- a/ppapi/nacl_irt/irt_start.cc +++ b/ppapi/nacl_irt/irt_start.cc @@ -8,6 +8,8 @@ // start up procedure so we just exclude it. #if defined(OS_NACL_SFI) +#include <stdint.h> + #include "base/at_exit.h" #include "native_client/src/public/chrome_main.h" #include "native_client/src/public/irt_core.h" diff --git a/ppapi/nacl_irt/manifest_service.cc b/ppapi/nacl_irt/manifest_service.cc index 41e8601..4d4aa42 100644 --- a/ppapi/nacl_irt/manifest_service.cc +++ b/ppapi/nacl_irt/manifest_service.cc @@ -4,7 +4,11 @@ #include "ppapi/nacl_irt/manifest_service.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/single_thread_task_runner.h" +#include "build/build_config.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sync_message_filter.h" diff --git a/ppapi/nacl_irt/ppapi_dispatcher.cc b/ppapi/nacl_irt/ppapi_dispatcher.cc index 42d900c..3a28f98 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.cc +++ b/ppapi/nacl_irt/ppapi_dispatcher.cc @@ -4,6 +4,8 @@ #include "ppapi/nacl_irt/ppapi_dispatcher.h" +#include <stddef.h> + #include <map> #include <set> @@ -82,13 +84,13 @@ std::set<PP_Instance>* PpapiDispatcher::GetGloballySeenInstanceIDSet() { return &instances_; } -uint32 PpapiDispatcher::Register(proxy::PluginDispatcher* plugin_dispatcher) { +uint32_t PpapiDispatcher::Register(proxy::PluginDispatcher* plugin_dispatcher) { if (!plugin_dispatcher || - plugin_dispatchers_.size() >= std::numeric_limits<uint32>::max()) { + plugin_dispatchers_.size() >= std::numeric_limits<uint32_t>::max()) { return 0; } - uint32 id = 0; + uint32_t id = 0; do { // Although it is unlikely, make sure that we won't cause any trouble // when the counter overflows. @@ -99,7 +101,7 @@ uint32 PpapiDispatcher::Register(proxy::PluginDispatcher* plugin_dispatcher) { return id; } -void PpapiDispatcher::Unregister(uint32 plugin_dispatcher_id) { +void PpapiDispatcher::Unregister(uint32_t plugin_dispatcher_id) { plugin_dispatchers_.erase(plugin_dispatcher_id); } @@ -203,12 +205,12 @@ void PpapiDispatcher::OnPluginDispatcherMessageReceived( const IPC::Message& msg) { // The first parameter should be a plugin dispatcher ID. base::PickleIterator iter(msg); - uint32 id = 0; + uint32_t id = 0; if (!iter.ReadUInt32(&id)) { NOTREACHED(); return; } - std::map<uint32, proxy::PluginDispatcher*>::iterator dispatcher = + std::map<uint32_t, proxy::PluginDispatcher*>::iterator dispatcher = plugin_dispatchers_.find(id); if (dispatcher != plugin_dispatchers_.end()) dispatcher->second->OnMessageReceived(msg); diff --git a/ppapi/nacl_irt/ppapi_dispatcher.h b/ppapi/nacl_irt/ppapi_dispatcher.h index 0b193ab..d719d87 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.h +++ b/ppapi/nacl_irt/ppapi_dispatcher.h @@ -5,6 +5,8 @@ #ifndef PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ #define PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> @@ -62,8 +64,8 @@ class PpapiDispatcher : public proxy::PluginDispatcher::PluginDelegate, const base::SharedMemoryHandle& handle, base::ProcessId remote_pid) override; std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; - uint32 Register(proxy::PluginDispatcher* plugin_dispatcher) override; - void Unregister(uint32 plugin_dispatcher_id) override; + uint32_t Register(proxy::PluginDispatcher* plugin_dispatcher) override; + void Unregister(uint32_t plugin_dispatcher_id) override; // PluginProxyDelegate implementation. IPC::Sender* GetBrowserSender() override; @@ -87,8 +89,8 @@ class PpapiDispatcher : public proxy::PluginDispatcher::PluginDelegate, void OnPluginDispatcherMessageReceived(const IPC::Message& msg); std::set<PP_Instance> instances_; - std::map<uint32, proxy::PluginDispatcher*> plugin_dispatchers_; - uint32 next_plugin_dispatcher_id_; + std::map<uint32_t, proxy::PluginDispatcher*> plugin_dispatchers_; + uint32_t next_plugin_dispatcher_id_; scoped_refptr<base::SingleThreadTaskRunner> task_runner_; base::WaitableEvent* shutdown_event_; diff --git a/ppapi/nacl_irt/public/irt_ppapi.h b/ppapi/nacl_irt/public/irt_ppapi.h index c64dbab..2322b6e 100644 --- a/ppapi/nacl_irt/public/irt_ppapi.h +++ b/ppapi/nacl_irt/public/irt_ppapi.h @@ -8,6 +8,7 @@ #define PPAPI_NACL_IRT_PUBLIC_IRT_PPAPI_H_ #include <stddef.h> +#include <stdint.h> #include "ppapi/c/ppp.h" diff --git a/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c b/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c index 2d148ae2..34cef03 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c +++ b/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c @@ -4,6 +4,7 @@ * found in the LICENSE file. */ +#include <stddef.h> #include <stdlib.h> #include <string.h> #include <unistd.h> diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c index f3296e6..67a4622 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c @@ -6,6 +6,8 @@ #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h" +#include <stdint.h> + #include "native_client/src/untrusted/irt/irt.h" #include "ppapi/nacl_irt/irt_ppapi.h" #include "ppapi/nacl_irt/public/irt_ppapi.h" diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c index 561b0cc..d56329b 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c @@ -4,6 +4,8 @@ * found in the LICENSE file. */ +#include <stdint.h> + #include "native_client/src/include/elf32.h" #include "native_client/src/include/elf_auxv.h" #include "native_client/src/include/nacl_macros.h" diff --git a/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc b/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc index 18c2f6a..9c64e21 100644 --- a/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc +++ b/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc @@ -5,6 +5,7 @@ */ #include <dlfcn.h> +#include <stdint.h> #include <stdio.h> #include <string.h> diff --git a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c index ea61366..1799b2a 100644 --- a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c +++ b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c @@ -6,6 +6,7 @@ #include "native_client/tests/inbrowser_test_runner/test_runner.h" +#include <stdint.h> #include <stdio.h> #include <string.h> diff --git a/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc b/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc index ac9f824..c194691b 100644 --- a/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc +++ b/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc @@ -7,11 +7,13 @@ // plugin interfaces. // +#include <stdint.h> #include <stdio.h> #include <string.h> #include <map> +#include "base/macros.h" #include "native_client/src/include/nacl_macros.h" #include "native_client/src/shared/platform/nacl_check.h" diff --git a/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc b/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc index 4cc7952..8ee2672 100644 --- a/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc +++ b/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc @@ -8,13 +8,14 @@ #include <map> #include <new> +#include "base/macros.h" #include "native_client/src/include/nacl_macros.h" #include "native_client/src/shared/platform/nacl_check.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_module.h" -#include "ppapi/c/pp_size.h" #include "ppapi/c/pp_rect.h" +#include "ppapi/c/pp_size.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_core.h" #include "ppapi/c/ppb_graphics_2d.h" diff --git a/ppapi/native_client/tests/ppapi_test_lib/test_interface.h b/ppapi/native_client/tests/ppapi_test_lib/test_interface.h index e5424a6..f00fd94 100644 --- a/ppapi/native_client/tests/ppapi_test_lib/test_interface.h +++ b/ppapi/native_client/tests/ppapi_test_lib/test_interface.h @@ -40,6 +40,7 @@ #ifndef NATIVE_CLIENT_TESTS_PPAPI_TEST_PPB_TEMPLATE_TEST_INTERFACE_H #define NATIVE_CLIENT_TESTS_PPAPI_TEST_PPB_TEMPLATE_TEST_INTERFACE_H +#include <stdint.h> #include <stdio.h> #include <limits> diff --git a/ppapi/proxy/audio_buffer_resource.h b/ppapi/proxy/audio_buffer_resource.h index 8f1e22f..e447917 100644 --- a/ppapi/proxy/audio_buffer_resource.h +++ b/ppapi/proxy/audio_buffer_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_AUDIO_BUFFER_RESOURCE_H_ #define PPAPI_PROXY_AUDIO_BUFFER_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_audio_buffer_api.h" diff --git a/ppapi/proxy/audio_encoder_resource.h b/ppapi/proxy/audio_encoder_resource.h index ff13aae..f1ba9f3 100644 --- a/ppapi/proxy/audio_encoder_resource.h +++ b/ppapi/proxy/audio_encoder_resource.h @@ -5,7 +5,9 @@ #ifndef PPAPI_PROXY_AUDIO_ENCODER_RESOURCE_H_ #define PPAPI_PROXY_AUDIO_ENCODER_RESOURCE_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/scoped_vector.h" diff --git a/ppapi/proxy/audio_input_resource.cc b/ppapi/proxy/audio_input_resource.cc index f17dd0a..7d25a71 100644 --- a/ppapi/proxy/audio_input_resource.cc +++ b/ppapi/proxy/audio_input_resource.cc @@ -255,7 +255,7 @@ void AudioInputResource::Run() { // This is a constantly increasing counter that is used to verify on the // browser side that buffers are in sync. - uint32 buffer_index = 0; + uint32_t buffer_index = 0; while (true) { int pending_data = 0; diff --git a/ppapi/proxy/audio_input_resource.h b/ppapi/proxy/audio_input_resource.h index a94ff9c..3a3b40b 100644 --- a/ppapi/proxy/audio_input_resource.h +++ b/ppapi/proxy/audio_input_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_AUDIO_INPUT_RESOURCE_H_ #define PPAPI_PROXY_AUDIO_INPUT_RESOURCE_H_ -#include "base/basictypes.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 "base/memory/shared_memory.h" diff --git a/ppapi/proxy/broker_dispatcher.h b/ppapi/proxy/broker_dispatcher.h index 828dac6..5b3d586 100644 --- a/ppapi/proxy/broker_dispatcher.h +++ b/ppapi/proxy/broker_dispatcher.h @@ -5,7 +5,10 @@ #ifndef PPAPI_PROXY_BROKER_DISPATCHER_H_ #define PPAPI_PROXY_BROKER_DISPATCHER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/trusted/ppp_broker.h" #include "ppapi/proxy/proxy_channel.h" diff --git a/ppapi/proxy/broker_resource.cc b/ppapi/proxy/broker_resource.cc index 4fac07e..18273cd 100644 --- a/ppapi/proxy/broker_resource.cc +++ b/ppapi/proxy/broker_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/broker_resource.h" +#include <stdint.h> + #include "ppapi/c/pp_bool.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/broker_resource.h b/ppapi/proxy/broker_resource.h index 2331093..60f6fdb 100644 --- a/ppapi/proxy/broker_resource.h +++ b/ppapi/proxy/broker_resource.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_BROKER_RESOURCE_H_ #define PPAPI_PROXY_BROKER_RESOURCE_H_ +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/thunk/ppb_broker_api.h" diff --git a/ppapi/proxy/browser_font_singleton_resource.h b/ppapi/proxy/browser_font_singleton_resource.h index ddbb690..bc332db 100644 --- a/ppapi/proxy/browser_font_singleton_resource.h +++ b/ppapi/proxy/browser_font_singleton_resource.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_BROWSER_FONT_SINGLETON_RESOURCE_H_ #define PPAPI_PROXY_BROWSER_FONT_SINGLETON_RESOURCE_H_ +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/thunk/ppb_browser_font_singleton_api.h" diff --git a/ppapi/proxy/camera_capabilities_resource.h b/ppapi/proxy/camera_capabilities_resource.h index 82e8df8..14431ce 100644 --- a/ppapi/proxy/camera_capabilities_resource.h +++ b/ppapi/proxy/camera_capabilities_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_CAMERA_CAPABILITIES_RESOURCE_H_ #define PPAPI_PROXY_CAMERA_CAPABILITIES_RESOURCE_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/resource.h" diff --git a/ppapi/proxy/camera_device_resource.h b/ppapi/proxy/camera_device_resource.h index 93878fe..d6ff4b7 100644 --- a/ppapi/proxy/camera_device_resource.h +++ b/ppapi/proxy/camera_device_resource.h @@ -5,7 +5,9 @@ #ifndef PPAPI_PROXY_CAMERA_DEVICE_RESOURCE_H_ #define PPAPI_PROXY_CAMERA_DEVICE_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/c/pp_size.h" #include "ppapi/c/private/pp_video_capture_format.h" #include "ppapi/proxy/connection.h" diff --git a/ppapi/proxy/compositor_layer_resource.h b/ppapi/proxy/compositor_layer_resource.h index 8d4dfd3..7bc330a 100644 --- a/ppapi/proxy/compositor_layer_resource.h +++ b/ppapi/proxy/compositor_layer_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_COMPOSITOR_LAYER_RESOURCE_H_ #define PPAPI_PROXY_COMPOSITOR_LAYER_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/c/ppb_compositor_layer.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/compositor_resource.h b/ppapi/proxy/compositor_resource.h index 49ccf3d..366e3e7 100644 --- a/ppapi/proxy/compositor_resource.h +++ b/ppapi/proxy/compositor_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ #define PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ +#include <stdint.h> + #include <map> +#include "base/macros.h" #include "ppapi/proxy/compositor_layer_resource.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/device_enumeration_resource_helper.cc b/ppapi/proxy/device_enumeration_resource_helper.cc index 32a4e1db..45eee0e 100644 --- a/ppapi/proxy/device_enumeration_resource_helper.cc +++ b/ppapi/proxy/device_enumeration_resource_helper.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/device_enumeration_resource_helper.h" +#include <stddef.h> + #include "base/bind.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/ppapi/proxy/device_enumeration_resource_helper.h b/ppapi/proxy/device_enumeration_resource_helper.h index cea3153..ea96ea2 100644 --- a/ppapi/proxy/device_enumeration_resource_helper.h +++ b/ppapi/proxy/device_enumeration_resource_helper.h @@ -5,9 +5,11 @@ #ifndef PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ #define PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_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 "ppapi/c/dev/ppb_device_ref_dev.h" diff --git a/ppapi/proxy/device_enumeration_resource_helper_unittest.cc b/ppapi/proxy/device_enumeration_resource_helper_unittest.cc index 32bc68a..288942f 100644 --- a/ppapi/proxy/device_enumeration_resource_helper_unittest.cc +++ b/ppapi/proxy/device_enumeration_resource_helper_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 "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/device_enumeration_resource_helper.h" diff --git a/ppapi/proxy/dispatcher.h b/ppapi/proxy/dispatcher.h index 3028841..a00c550 100644 --- a/ppapi/proxy/dispatcher.h +++ b/ppapi/proxy/dispatcher.h @@ -11,16 +11,17 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/tracked_objects.h" #include "ipc/message_filter.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_module.h" #include "ppapi/c/ppp.h" -#include "ppapi/proxy/proxy_channel.h" #include "ppapi/proxy/interface_list.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/plugin_var_tracker.h" +#include "ppapi/proxy/proxy_channel.h" #include "ppapi/shared_impl/api_id.h" namespace IPC { diff --git a/ppapi/proxy/enter_proxy.h b/ppapi/proxy/enter_proxy.h index 4ad67b1..b7dbef2 100644 --- a/ppapi/proxy/enter_proxy.h +++ b/ppapi/proxy/enter_proxy.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PROXY_ENTER_PROXY_H_ #define PPAPI_PROXY_ENTER_PROXY_H_ +#include <stdint.h> + #include "base/logging.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/proxy/host_dispatcher.h" diff --git a/ppapi/proxy/file_chooser_resource.cc b/ppapi/proxy/file_chooser_resource.cc index f1d045b..dc70cbd 100644 --- a/ppapi/proxy/file_chooser_resource.cc +++ b/ppapi/proxy/file_chooser_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/file_chooser_resource.h" +#include <stddef.h> + #include "base/bind.h" #include "base/strings/string_split.h" #include "ipc/ipc_message.h" diff --git a/ppapi/proxy/file_chooser_resource.h b/ppapi/proxy/file_chooser_resource.h index 0347fb0..05d01d3 100644 --- a/ppapi/proxy/file_chooser_resource.h +++ b/ppapi/proxy/file_chooser_resource.h @@ -5,10 +5,13 @@ #ifndef PPAPI_PROXY_FILE_CHOOSER_RESOURCE_H_ #define PPAPI_PROXY_FILE_CHOOSER_RESOURCE_H_ +#include <stdint.h> + #include <queue> #include <string> #include <vector> +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/array_writer.h" diff --git a/ppapi/proxy/file_chooser_resource_unittest.cc b/ppapi/proxy/file_chooser_resource_unittest.cc index a97b9c9..e6ad3ed 100644 --- a/ppapi/proxy/file_chooser_resource_unittest.cc +++ b/ppapi/proxy/file_chooser_resource_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/message_loop/message_loop.h" #include "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/proxy/file_io_resource.h b/ppapi/proxy/file_io_resource.h index f32879a43..9834c8e 100644 --- a/ppapi/proxy/file_io_resource.h +++ b/ppapi/proxy/file_io_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_FILE_IO_RESOURCE_H_ #define PPAPI_PROXY_FILE_IO_RESOURCE_H_ +#include <stdint.h> + #include <string> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "ppapi/c/private/pp_file_handle.h" diff --git a/ppapi/proxy/file_ref_resource.cc b/ppapi/proxy/file_ref_resource.cc index ee56969..79e95dc 100644 --- a/ppapi/proxy/file_ref_resource.cc +++ b/ppapi/proxy/file_ref_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/file_ref_resource.h" +#include <stddef.h> + #include "base/numerics/safe_conversions.h" #include "ppapi/c/pp_directory_entry.h" #include "ppapi/c/pp_instance.h" diff --git a/ppapi/proxy/file_ref_resource.h b/ppapi/proxy/file_ref_resource.h index 59e7b7c..2ed2cc7 100644 --- a/ppapi/proxy/file_ref_resource.h +++ b/ppapi/proxy/file_ref_resource.h @@ -5,9 +5,11 @@ #ifndef PPAPI_PROXY_FILE_REF_RESOURCE_H_ #define PPAPI_PROXY_FILE_REF_RESOURCE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/proxy/file_system_resource.h b/ppapi/proxy/file_system_resource.h index 5b35f86..c03765c 100644 --- a/ppapi/proxy/file_system_resource.h +++ b/ppapi/proxy/file_system_resource.h @@ -5,10 +5,13 @@ #ifndef PPAPI_PROXY_FILE_SYSTEM_RESOURCE_H_ #define PPAPI_PROXY_FILE_SYSTEM_RESOURCE_H_ +#include <stdint.h> + #include <map> #include <queue> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/proxy/file_system_resource_unittest.cc b/ppapi/proxy/file_system_resource_unittest.cc index 9b5d981..d8917ce 100644 --- a/ppapi/proxy/file_system_resource_unittest.cc +++ b/ppapi/proxy/file_system_resource_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/message_loop/message_loop.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" diff --git a/ppapi/proxy/flash_clipboard_resource.cc b/ppapi/proxy/flash_clipboard_resource.cc index 28df94c..e430dfd 100644 --- a/ppapi/proxy/flash_clipboard_resource.cc +++ b/ppapi/proxy/flash_clipboard_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/flash_clipboard_resource.h" +#include <stddef.h> + #include "base/numerics/safe_conversions.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/proxy/flash_clipboard_resource.h b/ppapi/proxy/flash_clipboard_resource.h index cd607d6..ba17e41 100644 --- a/ppapi/proxy/flash_clipboard_resource.h +++ b/ppapi/proxy/flash_clipboard_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_FLASH_CLIPBOARD_RESOURCE_H_ #define PPAPI_PROXY_FLASH_CLIPBOARD_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/shared_impl/flash_clipboard_format_registry.h" diff --git a/ppapi/proxy/flash_drm_resource.h b/ppapi/proxy/flash_drm_resource.h index fc773c4..70e0c02 100644 --- a/ppapi/proxy/flash_drm_resource.h +++ b/ppapi/proxy/flash_drm_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_FLASH_DRM_RESOURCE_H_ #define PPAPI_PROXY_FLASH_DRM_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/proxy/flash_file_resource.cc b/ppapi/proxy/flash_file_resource.cc index 6b8fc6c..d696e5b 100644 --- a/ppapi/proxy/flash_file_resource.cc +++ b/ppapi/proxy/flash_file_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/flash_file_resource.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/proxy/flash_file_resource.h b/ppapi/proxy/flash_file_resource.h index ea35152..b45fbd5 100644 --- a/ppapi/proxy/flash_file_resource.h +++ b/ppapi/proxy/flash_file_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_FLASH_FILE_RESOURCE_H_ #define PPAPI_PROXY_FLASH_FILE_RESOURCE_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/shared_impl/file_path.h" diff --git a/ppapi/proxy/flash_font_file_resource.h b/ppapi/proxy/flash_font_file_resource.h index fada61d..4694734 100644 --- a/ppapi/proxy/flash_font_file_resource.h +++ b/ppapi/proxy/flash_font_file_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_ #define PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_ +#include <stdint.h> + #include <string> #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "ppapi/c/private/pp_private_font_charset.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/serialized_structs.h" diff --git a/ppapi/proxy/flash_fullscreen_resource.cc b/ppapi/proxy/flash_fullscreen_resource.cc index 90a68fc..feab277 100644 --- a/ppapi/proxy/flash_fullscreen_resource.cc +++ b/ppapi/proxy/flash_fullscreen_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/flash_fullscreen_resource.h" +#include <stdint.h> + #include "ppapi/c/pp_bool.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/flash_fullscreen_resource.h b/ppapi/proxy/flash_fullscreen_resource.h index b193e30..0c276a3 100644 --- a/ppapi/proxy/flash_fullscreen_resource.h +++ b/ppapi/proxy/flash_fullscreen_resource.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_FLASH_FULLSCREEN_RESOURCE_H_ #define PPAPI_PROXY_FLASH_FULLSCREEN_RESOURCE_H_ +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/thunk/ppb_flash_fullscreen_api.h" diff --git a/ppapi/proxy/flash_menu_resource.h b/ppapi/proxy/flash_menu_resource.h index 23b7487..af0fe86f 100644 --- a/ppapi/proxy/flash_menu_resource.h +++ b/ppapi/proxy/flash_menu_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_FLASH_MENU_RESOURCE_H_ #define PPAPI_PROXY_FLASH_MENU_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/ppb_flash_menu_api.h" diff --git a/ppapi/proxy/flash_resource.cc b/ppapi/proxy/flash_resource.cc index 26a80ae..d8ec440 100644 --- a/ppapi/proxy/flash_resource.cc +++ b/ppapi/proxy/flash_resource.cc @@ -4,12 +4,15 @@ #include "ppapi/proxy/flash_resource.h" +#include <stddef.h> + #include <cmath> #include "base/containers/mru_cache.h" #include "base/debug/crash_logging.h" #include "base/lazy_instance.h" #include "base/time/time.h" +#include "build/build_config.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash.h" #include "ppapi/c/trusted/ppb_browser_font_trusted.h" @@ -118,7 +121,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instance instance, // Note that TimeTicks does not continue counting across sleep/resume on all // platforms. This may be acceptable for 10 seconds, but if in the future this // is changed to one minute or more, then we should consider using base::Time. - const int64 kMaxCachedLocalOffsetAgeInSeconds = 10; + const int64_t kMaxCachedLocalOffsetAgeInSeconds = 10; base::TimeDelta expiration_delta = base::TimeDelta::FromSeconds(kMaxCachedLocalOffsetAgeInSeconds); diff --git a/ppapi/proxy/flash_resource.h b/ppapi/proxy/flash_resource.h index 21cdbb7..df21778 100644 --- a/ppapi/proxy/flash_resource.h +++ b/ppapi/proxy/flash_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_FLASH_RESOURCE_H_ #define PPAPI_PROXY_FLASH_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/private/ppb_flash.h" diff --git a/ppapi/proxy/flash_resource_unittest.cc b/ppapi/proxy/flash_resource_unittest.cc index 1a5e7c6..a4815b7 100644 --- a/ppapi/proxy/flash_resource_unittest.cc +++ b/ppapi/proxy/flash_resource_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 "ppapi/c/dev/ppb_video_capture_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash.h" diff --git a/ppapi/proxy/gamepad_resource.h b/ppapi/proxy/gamepad_resource.h index 4851d69..b2aeca4 100644 --- a/ppapi/proxy/gamepad_resource.h +++ b/ppapi/proxy/gamepad_resource.h @@ -5,8 +5,8 @@ #ifndef PPAPI_PROXY_GAMEPAD_RESOURCE_H_ #define PPAPI_PROXY_GAMEPAD_RESOURCE_H_ -#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 "ppapi/c/ppb_gamepad.h" diff --git a/ppapi/proxy/graphics_2d_resource.cc b/ppapi/proxy/graphics_2d_resource.cc index 0cf7465..3b91a6a 100644 --- a/ppapi/proxy/graphics_2d_resource.cc +++ b/ppapi/proxy/graphics_2d_resource.cc @@ -32,9 +32,10 @@ Graphics2DResource::Graphics2DResource(Connection connection, scale_(1.0f) { // These checks are copied from PPB_ImageData_Impl::Init to make tests passed. // Let's remove/refactor this when start to refactor ImageData. - bool bad_args = size.width <= 0 || size.height <= 0 || - static_cast<int64>(size.width) * static_cast<int64>(size.height) >= - std::numeric_limits<int32>::max() / 4; + bool bad_args = + size.width <= 0 || size.height <= 0 || + static_cast<int64_t>(size.width) * static_cast<int64_t>(size.height) >= + std::numeric_limits<int32_t>::max() / 4; if (!bad_args && !sent_create_to_renderer()) { SendCreate(RENDERER, PpapiHostMsg_Graphics2D_Create(size, is_always_opaque)); diff --git a/ppapi/proxy/graphics_2d_resource.h b/ppapi/proxy/graphics_2d_resource.h index efd7d760..7c8fb69 100644 --- a/ppapi/proxy/graphics_2d_resource.h +++ b/ppapi/proxy/graphics_2d_resource.h @@ -5,7 +5,10 @@ #ifndef PPAPI_PROXY_GRAPHICS_2D_RESOURCE_H_ #define PPAPI_PROXY_GRAPHICS_2D_RESOURCE_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/thunk/ppb_graphics_2d_api.h" diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc index eb9f7ee..5d61429 100644 --- a/ppapi/proxy/host_dispatcher.cc +++ b/ppapi/proxy/host_dispatcher.cc @@ -4,10 +4,12 @@ #include "ppapi/proxy/host_dispatcher.h" +#include <stddef.h> + #include "base/logging.h" #include "base/trace_event/trace_event.h" -#include "ppapi/c/private/ppb_proxy_private.h" #include "ppapi/c/ppb_var.h" +#include "ppapi/c/private/ppb_proxy_private.h" #include "ppapi/proxy/host_var_serialization_rules.h" #include "ppapi/proxy/interface_list.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h index 8c8e948..35daf56 100644 --- a/ppapi/proxy/host_dispatcher.h +++ b/ppapi/proxy/host_dispatcher.h @@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/process/process.h" diff --git a/ppapi/proxy/host_resolver_private_resource.h b/ppapi/proxy/host_resolver_private_resource.h index d83b707..14da867 100644 --- a/ppapi/proxy/host_resolver_private_resource.h +++ b/ppapi/proxy/host_resolver_private_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_HOST_RESOLVER_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_HOST_RESOLVER_PRIVATE_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/host_resolver_resource_base.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/thunk/ppb_host_resolver_private_api.h" diff --git a/ppapi/proxy/host_resolver_resource.h b/ppapi/proxy/host_resolver_resource.h index ae6c524..034b741 100644 --- a/ppapi/proxy/host_resolver_resource.h +++ b/ppapi/proxy/host_resolver_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_HOST_RESOLVER_RESOURCE_H_ #define PPAPI_PROXY_HOST_RESOLVER_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/host_resolver_resource_base.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/thunk/ppb_host_resolver_api.h" diff --git a/ppapi/proxy/host_resolver_resource_base.h b/ppapi/proxy/host_resolver_resource_base.h index d27d988..2147ba9 100644 --- a/ppapi/proxy/host_resolver_resource_base.h +++ b/ppapi/proxy/host_resolver_resource_base.h @@ -5,11 +5,13 @@ #ifndef PPAPI_PROXY_HOST_RESOLVER_RESOURCE_BASE_H_ #define PPAPI_PROXY_HOST_RESOLVER_RESOURCE_BASE_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_host_resolver_private.h" #include "ppapi/proxy/plugin_resource.h" diff --git a/ppapi/proxy/host_var_serialization_rules.h b/ppapi/proxy/host_var_serialization_rules.h index 8de6cde..404312f 100644 --- a/ppapi/proxy/host_var_serialization_rules.h +++ b/ppapi/proxy/host_var_serialization_rules.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/c/ppb_var.h" #include "ppapi/proxy/var_serialization_rules.h" diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index db7a67a..eca4626 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -4,9 +4,12 @@ #include "ppapi/proxy/interface_list.h" +#include <stdint.h> + #include "base/hash.h" #include "base/lazy_instance.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "ppapi/c/dev/ppb_audio_input_dev.h" #include "ppapi/c/dev/ppb_buffer_dev.h" #include "ppapi/c/dev/ppb_char_set_dev.h" @@ -26,6 +29,7 @@ #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/dev/ppb_video_capture_dev.h" #include "ppapi/c/dev/ppb_view_dev.h" +#include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_audio.h" #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/c/ppb_audio_config.h" @@ -67,7 +71,6 @@ #include "ppapi/c/ppb_video_encoder.h" #include "ppapi/c/ppb_video_frame.h" #include "ppapi/c/ppb_view.h" -#include "ppapi/c/pp_errors.h" #include "ppapi/c/ppp_instance.h" #include "ppapi/c/private/ppb_camera_capabilities_private.h" #include "ppapi/c/private/ppb_camera_device_private.h" @@ -76,13 +79,13 @@ #include "ppapi/c/private/ppb_file_io_private.h" #include "ppapi/c/private/ppb_file_ref_private.h" #include "ppapi/c/private/ppb_find_private.h" +#include "ppapi/c/private/ppb_flash.h" #include "ppapi/c/private/ppb_flash_clipboard.h" +#include "ppapi/c/private/ppb_flash_device_id.h" +#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/c/private/ppb_flash_font_file.h" #include "ppapi/c/private/ppb_flash_fullscreen.h" -#include "ppapi/c/private/ppb_flash.h" -#include "ppapi/c/private/ppb_flash_device_id.h" -#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_menu.h" #include "ppapi/c/private/ppb_flash_message_loop.h" #include "ppapi/c/private/ppb_flash_print.h" @@ -408,7 +411,7 @@ void InterfaceList::AddPPP(const char* name, } int InterfaceList::HashInterfaceName(const std::string& name) { - uint32 data = base::Hash(name.c_str(), name.size()); + uint32_t data = base::Hash(name.c_str(), name.size()); // Strip off the signed bit because UMA doesn't support negative values, // but takes a signed int as input. return static_cast<int>(data & 0x7fffffff); diff --git a/ppapi/proxy/interface_list.h b/ppapi/proxy/interface_list.h index 2fec61f..f317241 100644 --- a/ppapi/proxy/interface_list.h +++ b/ppapi/proxy/interface_list.h @@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/interface_proxy.h b/ppapi/proxy/interface_proxy.h index 099d58b..6cfd7d7 100644 --- a/ppapi/proxy/interface_proxy.h +++ b/ppapi/proxy/interface_proxy.h @@ -5,7 +5,6 @@ #ifndef PPAPI_PROXY_INTERFACE_PROXY_H_ #define PPAPI_PROXY_INTERFACE_PROXY_H_ -#include "base/basictypes.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "ppapi/c/pp_completion_callback.h" diff --git a/ppapi/proxy/isolated_file_system_private_resource.h b/ppapi/proxy/isolated_file_system_private_resource.h index 55ff23e..a9e659f 100644 --- a/ppapi/proxy/isolated_file_system_private_resource.h +++ b/ppapi/proxy/isolated_file_system_private_resource.h @@ -19,8 +19,11 @@ #ifndef PPAPI_PROXY_ISOLATED_FILE_SYSTEM_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_ISOLATED_FILE_SYSTEM_PRIVATE_RESOURCE_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" diff --git a/ppapi/proxy/locking_resource_releaser.h b/ppapi/proxy/locking_resource_releaser.h index d390ac4..d770df6 100644 --- a/ppapi/proxy/locking_resource_releaser.h +++ b/ppapi/proxy/locking_resource_releaser.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_LOCKING_RESOURCE_RELEASER_H_ #define PPAPI_PROXY_LOCKING_RESOURCE_RELEASER_H_ +#include "base/macros.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/shared_impl/resource_tracker.h" diff --git a/ppapi/proxy/media_stream_audio_track_resource.h b/ppapi/proxy/media_stream_audio_track_resource.h index 566f42d..3c25726 100644 --- a/ppapi/proxy/media_stream_audio_track_resource.h +++ b/ppapi/proxy/media_stream_audio_track_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_MEDIA_STREAM_AUDIO_TRACK_RESOURCE_H_ #define PPAPI_PROXY_MEDIA_STREAM_AUDIO_TRACK_RESOURCE_H_ +#include <stdint.h> + #include <map> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/proxy/media_stream_track_resource_base.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/media_stream_track_resource_base.cc b/ppapi/proxy/media_stream_track_resource_base.cc index 12ebdb7c..16d5499 100644 --- a/ppapi/proxy/media_stream_track_resource_base.cc +++ b/ppapi/proxy/media_stream_track_resource_base.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/media_stream_track_resource_base.h" +#include <stddef.h> + #include "base/logging.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/media_stream_track_resource_base.h b/ppapi/proxy/media_stream_track_resource_base.h index 0e7e9cc..1de5d0d 100644 --- a/ppapi/proxy/media_stream_track_resource_base.h +++ b/ppapi/proxy/media_stream_track_resource_base.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_MEDIA_STREAM_TRACK_RESOURCE_BASE_H_ #define PPAPI_PROXY_MEDIA_STREAM_TRACK_RESOURCE_BASE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/media_stream_buffer_manager.h" diff --git a/ppapi/proxy/media_stream_video_track_resource.h b/ppapi/proxy/media_stream_video_track_resource.h index b6102ec..1b18cfa 100644 --- a/ppapi/proxy/media_stream_video_track_resource.h +++ b/ppapi/proxy/media_stream_video_track_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_ #define PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_ +#include <stdint.h> + #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/proxy/media_stream_track_resource_base.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/message_handler.h b/ppapi/proxy/message_handler.h index cb3c6ab..6a83f21 100644 --- a/ppapi/proxy/message_handler.h +++ b/ppapi/proxy/message_handler.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_MESSAGE_HANDLER_H_ #define PPAPI_PROXY_MESSAGE_HANDLER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/proxy/mock_resource.h b/ppapi/proxy/mock_resource.h index 768929d..ed894bd 100644 --- a/ppapi/proxy/mock_resource.h +++ b/ppapi/proxy/mock_resource.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_MOCK_RESOURCE_H_ #define PPAPI_PROXY_MOCK_RESOURCE_H_ +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/resource.h" diff --git a/ppapi/proxy/nacl_message_scanner.cc b/ppapi/proxy/nacl_message_scanner.cc index ee09be0..c95287e 100644 --- a/ppapi/proxy/nacl_message_scanner.cc +++ b/ppapi/proxy/nacl_message_scanner.cc @@ -4,10 +4,13 @@ #include "ppapi/proxy/nacl_message_scanner.h" +#include <stddef.h> + #include <utility> #include <vector> #include "base/bind.h" +#include "build/build_config.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/nacl_message_scanner.h b/ppapi/proxy/nacl_message_scanner.h index 6a03923..8c5f766 100644 --- a/ppapi/proxy/nacl_message_scanner.h +++ b/ppapi/proxy/nacl_message_scanner.h @@ -5,10 +5,12 @@ #ifndef PPAPI_PROXY_NACL_MESSAGE_SCANNER_H_ #define PPAPI_PROXY_NACL_MESSAGE_SCANNER_H_ +#include <stdint.h> + #include <map> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/proxy/nacl_message_scanner_unittest.cc b/ppapi/proxy/nacl_message_scanner_unittest.cc index 41b1e01..2ca5a28 100644 --- a/ppapi/proxy/nacl_message_scanner_unittest.cc +++ b/ppapi/proxy/nacl_message_scanner_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 "ipc/ipc_message.h" #include "ppapi/proxy/nacl_message_scanner.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/net_address_resource.h b/ppapi/proxy/net_address_resource.h index fe17ec6..f544896 100644 --- a/ppapi/proxy/net_address_resource.h +++ b/ppapi/proxy/net_address_resource.h @@ -5,8 +5,8 @@ #ifndef PPAPI_PROXY_NET_ADDRESS_RESOURCE_H_ #define PPAPI_PROXY_NET_ADDRESS_RESOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/network_list_resource.cc b/ppapi/proxy/network_list_resource.cc index 466e533..f4ec7ed 100644 --- a/ppapi/proxy/network_list_resource.cc +++ b/ppapi/proxy/network_list_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/network_list_resource.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/ppapi/proxy/network_list_resource.h b/ppapi/proxy/network_list_resource.h index 005b752..66ea8aa 100644 --- a/ppapi/proxy/network_list_resource.h +++ b/ppapi/proxy/network_list_resource.h @@ -5,10 +5,12 @@ #ifndef PPAPI_PROXY_NETWORK_LIST_RESOURCE_H_ #define PPAPI_PROXY_NETWORK_LIST_RESOURCE_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/network_monitor_resource.h b/ppapi/proxy/network_monitor_resource.h index 2fb91e7..77b3e61 100644 --- a/ppapi/proxy/network_monitor_resource.h +++ b/ppapi/proxy/network_monitor_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_NETWORK_MONITOR_RESOURCE_H_ #define PPAPI_PROXY_NETWORK_MONITOR_RESOURCE_H_ +#include <stdint.h> + #include <list> +#include "base/macros.h" #include "ppapi/proxy/network_list_resource.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/shared_impl/scoped_pp_resource.h" diff --git a/ppapi/proxy/network_proxy_resource.h b/ppapi/proxy/network_proxy_resource.h index b48089d..646e046 100644 --- a/ppapi/proxy/network_proxy_resource.h +++ b/ppapi/proxy/network_proxy_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_NETWORK_PROXY_RESOURCE_H_ #define PPAPI_PROXY_NETWORK_PROXY_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/thunk/ppb_network_proxy_api.h" diff --git a/ppapi/proxy/output_protection_resource.h b/ppapi/proxy/output_protection_resource.h index 25dcc53..b18dfc5 100644 --- a/ppapi/proxy/output_protection_resource.h +++ b/ppapi/proxy/output_protection_resource.h @@ -5,7 +5,10 @@ #ifndef PPAPI_PROXY_OUTPUT_PROTECTION_RESOURCE_H_ #define PPAPI_PROXY_OUTPUT_PROTECTION_RESOURCE_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/private/ppb_output_protection_private.h" #include "ppapi/proxy/device_enumeration_resource_helper.h" #include "ppapi/proxy/plugin_resource.h" diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc index d3aad14..914e695 100644 --- a/ppapi/proxy/pdf_resource.cc +++ b/ppapi/proxy/pdf_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/pdf_resource.h" +#include <stddef.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/ppapi/proxy/pdf_resource.h b/ppapi/proxy/pdf_resource.h index 253f619..4420cc7 100644 --- a/ppapi/proxy/pdf_resource.h +++ b/ppapi/proxy/pdf_resource.h @@ -5,8 +5,8 @@ #ifndef PPAPI_PROXY_PDF_RESOURCE_H_ #define PPAPI_PROXY_PDF_RESOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/connection.h" diff --git a/ppapi/proxy/platform_verification_private_resource.cc b/ppapi/proxy/platform_verification_private_resource.cc index 27804d3..ac709c2 100644 --- a/ppapi/proxy/platform_verification_private_resource.cc +++ b/ppapi/proxy/platform_verification_private_resource.cc @@ -56,7 +56,7 @@ int32_t PlatformVerificationPrivateResource::ChallengePlatform( return PP_ERROR_BADARGUMENT; uint8_t* challenge_data = static_cast<uint8_t*>(challenge_buffer->Map()); - uint32 challenge_length = challenge_buffer->ByteLength(); + uint32_t challenge_length = challenge_buffer->ByteLength(); std::vector<uint8_t> challenge_vector(challenge_data, challenge_data + challenge_length); challenge_buffer->Unmap(); diff --git a/ppapi/proxy/platform_verification_private_resource.h b/ppapi/proxy/platform_verification_private_resource.h index 072b3f8..ae3cd13 100644 --- a/ppapi/proxy/platform_verification_private_resource.h +++ b/ppapi/proxy/platform_verification_private_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_PLATFORM_VERIFICATION_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_PLATFORM_VERIFICATION_PRIVATE_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/thunk/ppb_platform_verification_api.h" diff --git a/ppapi/proxy/plugin_array_buffer_var.cc b/ppapi/proxy/plugin_array_buffer_var.cc index 7dd64d1..625facf 100644 --- a/ppapi/proxy/plugin_array_buffer_var.cc +++ b/ppapi/proxy/plugin_array_buffer_var.cc @@ -26,17 +26,14 @@ using ppapi::proxy::PluginResourceTracker; namespace ppapi { -PluginArrayBufferVar::PluginArrayBufferVar(uint32 size_in_bytes) +PluginArrayBufferVar::PluginArrayBufferVar(uint32_t size_in_bytes) : buffer_(size_in_bytes), plugin_handle_(base::SharedMemory::NULLHandle()), - size_in_bytes_(size_in_bytes) { -} + size_in_bytes_(size_in_bytes) {} -PluginArrayBufferVar::PluginArrayBufferVar(uint32 size_in_bytes, +PluginArrayBufferVar::PluginArrayBufferVar(uint32_t size_in_bytes, SharedMemoryHandle plugin_handle) - : plugin_handle_(plugin_handle), - size_in_bytes_(size_in_bytes) { -} + : plugin_handle_(plugin_handle), size_in_bytes_(size_in_bytes) {} PluginArrayBufferVar::~PluginArrayBufferVar() { Unmap(); @@ -72,7 +69,7 @@ void PluginArrayBufferVar::Unmap() { shmem_->Unmap(); } -uint32 PluginArrayBufferVar::ByteLength() { +uint32_t PluginArrayBufferVar::ByteLength() { return size_in_bytes_; } diff --git a/ppapi/proxy/plugin_array_buffer_var.h b/ppapi/proxy/plugin_array_buffer_var.h index ee9b930..8f6fe19 100644 --- a/ppapi/proxy/plugin_array_buffer_var.h +++ b/ppapi/proxy/plugin_array_buffer_var.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "ppapi/c/pp_instance.h" @@ -20,15 +20,15 @@ namespace ppapi { // owned as a vector. class PluginArrayBufferVar : public ArrayBufferVar { public: - explicit PluginArrayBufferVar(uint32 size_in_bytes); - PluginArrayBufferVar(uint32 size_in_bytes, + explicit PluginArrayBufferVar(uint32_t size_in_bytes); + PluginArrayBufferVar(uint32_t size_in_bytes, base::SharedMemoryHandle plugin_handle); ~PluginArrayBufferVar() override; // ArrayBufferVar implementation. void* Map() override; void Unmap() override; - uint32 ByteLength() override; + uint32_t ByteLength() override; bool CopyToNewShmem( PP_Instance instance, int* host_handle, @@ -36,12 +36,12 @@ class PluginArrayBufferVar : public ArrayBufferVar { private: // Non-shared memory - std::vector<uint8> buffer_; + std::vector<uint8_t> buffer_; // Shared memory base::SharedMemoryHandle plugin_handle_; scoped_ptr<base::SharedMemory> shmem_; - uint32 size_in_bytes_; + uint32_t size_in_bytes_; DISALLOW_COPY_AND_ASSIGN(PluginArrayBufferVar); }; diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc index 80fec1f..fd5f72c 100644 --- a/ppapi/proxy/plugin_dispatcher.cc +++ b/ppapi/proxy/plugin_dispatcher.cc @@ -11,6 +11,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_message_filter.h" diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h index 159e69c..5dc2273 100644 --- a/ppapi/proxy/plugin_dispatcher.h +++ b/ppapi/proxy/plugin_dispatcher.h @@ -5,12 +5,14 @@ #ifndef PPAPI_PROXY_PLUGIN_DISPATCHER_H_ #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_ +#include <stdint.h> + #include <set> #include <string> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h" @@ -74,7 +76,7 @@ struct InstanceData { ~FlushInfo(); bool flush_pending; HostResource resource; - int32 put_offset; + int32_t put_offset; }; FlushInfo flush_info_; }; @@ -94,8 +96,8 @@ class PPAPI_PROXY_EXPORT PluginDispatcher // Registers the plugin dispatcher and returns an ID. // Plugin dispatcher IDs will be used to dispatch messages from the browser. // Each call to Register() has to be matched with a call to Unregister(). - virtual uint32 Register(PluginDispatcher* plugin_dispatcher) = 0; - virtual void Unregister(uint32 plugin_dispatcher_id) = 0; + virtual uint32_t Register(PluginDispatcher* plugin_dispatcher) = 0; + virtual void Unregister(uint32_t plugin_dispatcher_id) = 0; }; // Constructor for the plugin side. The init and shutdown functions will be @@ -181,7 +183,7 @@ class PPAPI_PROXY_EXPORT PluginDispatcher // Returns the Preferences. const Preferences& preferences() const { return preferences_; } - uint32 plugin_dispatcher_id() const { return plugin_dispatcher_id_; } + uint32_t plugin_dispatcher_id() const { return plugin_dispatcher_id_; } bool incognito() const { return incognito_; } private: @@ -215,7 +217,7 @@ class PPAPI_PROXY_EXPORT PluginDispatcher bool received_preferences_; Preferences preferences_; - uint32 plugin_dispatcher_id_; + uint32_t plugin_dispatcher_id_; // Set to true when the instances associated with this dispatcher are // incognito mode. diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc index 64ff47b..765ec64 100644 --- a/ppapi/proxy/plugin_globals.cc +++ b/ppapi/proxy/plugin_globals.cc @@ -5,6 +5,7 @@ #include "ppapi/proxy/plugin_globals.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/task_runner.h" #include "base/threading/thread.h" diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h index 28cfe48..5075f81 100644 --- a/ppapi/proxy/plugin_globals.h +++ b/ppapi/proxy/plugin_globals.h @@ -8,6 +8,7 @@ #include <string> #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_local_storage.h" diff --git a/ppapi/proxy/plugin_resource.h b/ppapi/proxy/plugin_resource.h index 0f21240..0fabab2 100644 --- a/ppapi/proxy/plugin_resource.h +++ b/ppapi/proxy/plugin_resource.h @@ -5,10 +5,12 @@ #ifndef PPAPI_PROXY_PLUGIN_RESOURCE_H_ #define PPAPI_PROXY_PLUGIN_RESOURCE_H_ +#include <stdint.h> + #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" diff --git a/ppapi/proxy/plugin_resource_tracker.h b/ppapi/proxy/plugin_resource_tracker.h index 7dbeb61..df6e6be 100644 --- a/ppapi/proxy/plugin_resource_tracker.h +++ b/ppapi/proxy/plugin_resource_tracker.h @@ -10,10 +10,11 @@ #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/host_resource.h" diff --git a/ppapi/proxy/plugin_resource_var.h b/ppapi/proxy/plugin_resource_var.h index 461dbfd..2f7d085 100644 --- a/ppapi/proxy/plugin_resource_var.h +++ b/ppapi/proxy/plugin_resource_var.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PLUGIN_RESOURCE_VAR_H_ #define PPAPI_PROXY_PLUGIN_RESOURCE_VAR_H_ +#include "base/macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/resource.h" diff --git a/ppapi/proxy/plugin_var_serialization_rules.h b/ppapi/proxy/plugin_var_serialization_rules.h index 1616a75..1f11669 100644 --- a/ppapi/proxy/plugin_var_serialization_rules.h +++ b/ppapi/proxy/plugin_var_serialization_rules.h @@ -5,7 +5,7 @@ #ifndef PPAPI_PROXY_PLUGIN_VAR_SERIALIZATION_RULES_H_ #define PPAPI_PROXY_PLUGIN_VAR_SERIALIZATION_RULES_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ppapi/proxy/var_serialization_rules.h" diff --git a/ppapi/proxy/plugin_var_tracker.cc b/ppapi/proxy/plugin_var_tracker.cc index 81f313c..f7e68f8 100644 --- a/ppapi/proxy/plugin_var_tracker.cc +++ b/ppapi/proxy/plugin_var_tracker.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/plugin_var_tracker.h" +#include <stddef.h> + #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "ipc/ipc_message.h" @@ -37,10 +39,8 @@ Connection GetConnectionForInstance(PP_Instance instance) { } // namespace -PluginVarTracker::HostVar::HostVar(PluginDispatcher* d, int32 i) - : dispatcher(d), - host_object_id(i) { -} +PluginVarTracker::HostVar::HostVar(PluginDispatcher* d, int32_t i) + : dispatcher(d), host_object_id(i) {} bool PluginVarTracker::HostVar::operator<(const HostVar& other) const { if (dispatcher < other.dispatcher) @@ -159,7 +159,7 @@ void PluginVarTracker::ReleaseHostObject(PluginDispatcher* dispatcher, // Convert the host object to a normal var valid in the plugin. HostVarToPluginVarMap::iterator found = host_var_to_plugin_var_.find( - HostVar(dispatcher, static_cast<int32>(host_object.value.as_id))); + HostVar(dispatcher, static_cast<int32_t>(host_object.value.as_id))); if (found == host_var_to_plugin_var_.end()) { NOTREACHED(); return; @@ -303,12 +303,12 @@ void PluginVarTracker::DidDeleteDispatcher(PluginDispatcher* dispatcher) { } } -ArrayBufferVar* PluginVarTracker::CreateArrayBuffer(uint32 size_in_bytes) { +ArrayBufferVar* PluginVarTracker::CreateArrayBuffer(uint32_t size_in_bytes) { return new PluginArrayBufferVar(size_in_bytes); } ArrayBufferVar* PluginVarTracker::CreateShmArrayBuffer( - uint32 size_in_bytes, + uint32_t size_in_bytes, base::SharedMemoryHandle handle) { return new PluginArrayBufferVar(size_in_bytes, handle); } @@ -353,9 +353,9 @@ bool PluginVarTracker::ValidatePluginObjectCall( return found->second.ppp_class == ppp_class; } -int32 PluginVarTracker::AddVarInternal(Var* var, AddVarRefMode mode) { +int32_t PluginVarTracker::AddVarInternal(Var* var, AddVarRefMode mode) { // Normal adding. - int32 new_id = VarTracker::AddVarInternal(var, mode); + int32_t new_id = VarTracker::AddVarInternal(var, mode); // Need to add proxy objects to the host var map. ProxyObjectVar* proxy_object = var->AsProxyObjectVar(); @@ -443,7 +443,7 @@ bool PluginVarTracker::DeleteObjectInfoIfNecessary(VarMap::iterator iter) { PP_Var PluginVarTracker::GetOrCreateObjectVarID(ProxyObjectVar* object) { // We can't use object->GetPPVar() because we don't want to affect the // refcount, so we have to add everything manually here. - int32 var_id = object->GetExistingVarID(); + int32_t var_id = object->GetExistingVarID(); if (!var_id) { var_id = AddVarInternal(object, ADD_VAR_CREATE_WITH_NO_REFERENCE); object->AssignVarID(var_id); @@ -481,7 +481,7 @@ scoped_refptr<ProxyObjectVar> PluginVarTracker::FindOrMakePluginVarFromHostVar( if (found == host_var_to_plugin_var_.end()) { // Create a new object. return scoped_refptr<ProxyObjectVar>( - new ProxyObjectVar(dispatcher, static_cast<int32>(var.value.as_id))); + new ProxyObjectVar(dispatcher, static_cast<int32_t>(var.value.as_id))); } // Have this host var, look up the object. @@ -498,7 +498,7 @@ scoped_refptr<ProxyObjectVar> PluginVarTracker::FindOrMakePluginVarFromHostVar( int PluginVarTracker::TrackSharedMemoryHandle(PP_Instance instance, base::SharedMemoryHandle handle, - uint32 size_in_bytes) { + uint32_t size_in_bytes) { NOTREACHED(); return -1; } @@ -507,7 +507,7 @@ bool PluginVarTracker::StopTrackingSharedMemoryHandle( int id, PP_Instance instance, base::SharedMemoryHandle* handle, - uint32* size_in_bytes) { + uint32_t* size_in_bytes) { NOTREACHED(); return false; } diff --git a/ppapi/proxy/plugin_var_tracker.h b/ppapi/proxy/plugin_var_tracker.h index 0318a4a..fa86657 100644 --- a/ppapi/proxy/plugin_var_tracker.h +++ b/ppapi/proxy/plugin_var_tracker.h @@ -8,8 +8,8 @@ #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/shared_memory.h" #include "ppapi/c/pp_stdint.h" @@ -70,11 +70,11 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker { void DidDeleteInstance(PP_Instance instance) override; 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; // Notification that a plugin-implemented object (PPP_Class) was created by // the plugin or deallocated by WebKit over IPC. @@ -99,13 +99,13 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker { private: // VarTracker protected overrides. - int32 AddVarInternal(Var* var, AddVarRefMode mode) override; + int32_t AddVarInternal(Var* var, AddVarRefMode mode) override; void TrackedObjectGettingOneRef(VarMap::const_iterator iter) override; void ObjectGettingZeroRef(VarMap::iterator iter) override; bool DeleteObjectInfoIfNecessary(VarMap::iterator iter) override; - ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) override; + ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) override; ArrayBufferVar* CreateShmArrayBuffer( - uint32 size_in_bytes, + uint32_t size_in_bytes, base::SharedMemoryHandle handle) override; private: @@ -114,7 +114,7 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker { // Represents a var as received from the host. struct HostVar { - HostVar(PluginDispatcher* d, int32 i); + HostVar(PluginDispatcher* d, int32_t i); bool operator<(const HostVar& other) const; @@ -125,7 +125,7 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker { // The object ID that the host generated to identify the object. This is // unique only within that host: different hosts could give us different // objects with the same ID. - int32 host_object_id; + int32_t host_object_id; }; struct PluginImplementedVar { @@ -151,7 +151,7 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker { // that it implements that it previously released but got again through // indirect means would be extremely rare, and we only allow var scripting // in limited cases anyway. - int32 plugin_object_id; + int32_t plugin_object_id; }; // Returns the existing var ID for the given object var, creating and @@ -173,7 +173,7 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker { PluginDispatcher* dispatcher); // Maps host vars in the host to IDs in the plugin process. - typedef std::map<HostVar, int32> HostVarToPluginVarMap; + typedef std::map<HostVar, int32_t> HostVarToPluginVarMap; HostVarToPluginVarMap host_var_to_plugin_var_; // Maps "user data" for plugin implemented objects (PPP_Class) that are diff --git a/ppapi/proxy/plugin_var_tracker_unittest.cc b/ppapi/proxy/plugin_var_tracker_unittest.cc index 51d5036..79c1247 100644 --- a/ppapi/proxy/plugin_var_tracker_unittest.cc +++ b/ppapi/proxy/plugin_var_tracker_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 "ipc/ipc_test_sink.h" #include "ppapi/c/dev/ppp_class_deprecated.h" #include "ppapi/proxy/plugin_var_tracker.h" @@ -15,7 +17,7 @@ namespace proxy { namespace { -PP_Var MakeObject(int32 object_id) { +PP_Var MakeObject(int32_t object_id) { PP_Var ret; ret.type = PP_VARTYPE_OBJECT; ret.value.as_id = object_id; @@ -50,13 +52,13 @@ class PluginVarTrackerTest : public PluginProxyTest { protected: // Asserts that there is a unique "release object" IPC message in the test // sink. This will return the var ID from the message or -1 if none found. - int32 GetObjectIDForUniqueReleaseObject() { + int32_t GetObjectIDForUniqueReleaseObject() { const IPC::Message* release_msg = sink().GetUniqueMessageMatching( PpapiHostMsg_PPBVar_ReleaseObject::ID); if (!release_msg) return -1; - base::Tuple<int64> id; + base::Tuple<int64_t> id; PpapiHostMsg_PPBVar_ReleaseObject::Read(release_msg, &id); return base::get<0>(id); } diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc index 1ce6a53..ecf64da 100644 --- a/ppapi/proxy/ppapi_command_buffer_proxy.cc +++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc @@ -49,13 +49,13 @@ gpu::CommandBuffer::State PpapiCommandBufferProxy::GetLastState() { return last_state_; } -int32 PpapiCommandBufferProxy::GetLastToken() { +int32_t PpapiCommandBufferProxy::GetLastToken() { ppapi::ProxyLock::AssertAcquiredDebugOnly(); TryUpdateState(); return last_state_.token; } -void PpapiCommandBufferProxy::Flush(int32 put_offset) { +void PpapiCommandBufferProxy::Flush(int32_t put_offset) { if (last_state_.error != gpu::error::kNoError) return; @@ -63,7 +63,7 @@ void PpapiCommandBufferProxy::Flush(int32 put_offset) { FlushInternal(); } -void PpapiCommandBufferProxy::OrderingBarrier(int32 put_offset) { +void PpapiCommandBufferProxy::OrderingBarrier(int32_t put_offset) { if (last_state_.error != gpu::error::kNoError) return; @@ -77,7 +77,7 @@ void PpapiCommandBufferProxy::OrderingBarrier(int32 put_offset) { pending_fence_sync_release_ = next_fence_sync_release_ - 1; } -void PpapiCommandBufferProxy::WaitForTokenInRange(int32 start, int32 end) { +void PpapiCommandBufferProxy::WaitForTokenInRange(int32_t start, int32_t end) { TryUpdateState(); if (!InRange(start, end, last_state_.token) && last_state_.error == gpu::error::kNoError) { @@ -96,7 +96,8 @@ void PpapiCommandBufferProxy::WaitForTokenInRange(int32 start, int32 end) { last_state_.error != gpu::error::kNoError); } -void PpapiCommandBufferProxy::WaitForGetOffsetInRange(int32 start, int32 end) { +void PpapiCommandBufferProxy::WaitForGetOffsetInRange(int32_t start, + int32_t end) { TryUpdateState(); if (!InRange(start, end, last_state_.get_offset) && last_state_.error == gpu::error::kNoError) { @@ -115,7 +116,7 @@ void PpapiCommandBufferProxy::WaitForGetOffsetInRange(int32 start, int32 end) { last_state_.error != gpu::error::kNoError); } -void PpapiCommandBufferProxy::SetGetBuffer(int32 transfer_buffer_id) { +void PpapiCommandBufferProxy::SetGetBuffer(int32_t transfer_buffer_id) { if (last_state_.error == gpu::error::kNoError) { Send(new PpapiHostMsg_PPBGraphics3D_SetGetBuffer( ppapi::API_ID_PPB_GRAPHICS_3D, resource_, transfer_buffer_id)); @@ -124,7 +125,7 @@ void PpapiCommandBufferProxy::SetGetBuffer(int32 transfer_buffer_id) { scoped_refptr<gpu::Buffer> PpapiCommandBufferProxy::CreateTransferBuffer( size_t size, - int32* id) { + int32_t* id) { *id = -1; if (last_state_.error != gpu::error::kNoError) @@ -165,7 +166,7 @@ scoped_refptr<gpu::Buffer> PpapiCommandBufferProxy::CreateTransferBuffer( handle.size()); } -void PpapiCommandBufferProxy::DestroyTransferBuffer(int32 id) { +void PpapiCommandBufferProxy::DestroyTransferBuffer(int32_t id) { if (last_state_.error != gpu::error::kNoError) return; @@ -220,8 +221,8 @@ int32_t PpapiCommandBufferProxy::GetExtraCommandBufferData() const { return 0; } -uint32 PpapiCommandBufferProxy::InsertSyncPoint() { - uint32 sync_point = 0; +uint32_t PpapiCommandBufferProxy::InsertSyncPoint() { + uint32_t sync_point = 0; if (last_state_.error == gpu::error::kNoError) { Send(new PpapiHostMsg_PPBGraphics3D_InsertSyncPoint( ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &sync_point)); @@ -229,8 +230,8 @@ uint32 PpapiCommandBufferProxy::InsertSyncPoint() { return sync_point; } -uint32 PpapiCommandBufferProxy::InsertFutureSyncPoint() { - uint32 sync_point = 0; +uint32_t PpapiCommandBufferProxy::InsertFutureSyncPoint() { + uint32_t sync_point = 0; if (last_state_.error == gpu::error::kNoError) { Send(new PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint( ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &sync_point)); @@ -238,19 +239,19 @@ uint32 PpapiCommandBufferProxy::InsertFutureSyncPoint() { return sync_point; } -void PpapiCommandBufferProxy::RetireSyncPoint(uint32 sync_point) { +void PpapiCommandBufferProxy::RetireSyncPoint(uint32_t sync_point) { if (last_state_.error == gpu::error::kNoError) { Send(new PpapiHostMsg_PPBGraphics3D_RetireSyncPoint( ppapi::API_ID_PPB_GRAPHICS_3D, resource_, sync_point)); } } -void PpapiCommandBufferProxy::SignalSyncPoint(uint32 sync_point, +void PpapiCommandBufferProxy::SignalSyncPoint(uint32_t sync_point, const base::Closure& callback) { NOTREACHED(); } -void PpapiCommandBufferProxy::SignalQuery(uint32 query, +void PpapiCommandBufferProxy::SignalQuery(uint32_t query, const base::Closure& callback) { NOTREACHED(); } @@ -259,19 +260,19 @@ gpu::Capabilities PpapiCommandBufferProxy::GetCapabilities() { return capabilities_; } -int32 PpapiCommandBufferProxy::CreateImage(ClientBuffer buffer, - size_t width, - size_t height, - unsigned internalformat) { +int32_t PpapiCommandBufferProxy::CreateImage(ClientBuffer buffer, + size_t width, + size_t height, + unsigned internalformat) { NOTREACHED(); return -1; } -void PpapiCommandBufferProxy::DestroyImage(int32 id) { +void PpapiCommandBufferProxy::DestroyImage(int32_t id) { NOTREACHED(); } -int32 PpapiCommandBufferProxy::CreateGpuMemoryBufferImage( +int32_t PpapiCommandBufferProxy::CreateGpuMemoryBufferImage( size_t width, size_t height, unsigned internalformat, diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h index 0242d4c..e829191 100644 --- a/ppapi/proxy/ppapi_command_buffer_proxy.h +++ b/ppapi/proxy/ppapi_command_buffer_proxy.h @@ -5,8 +5,12 @@ #ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/client/gpu_control.h" #include "gpu/command_buffer/common/command_buffer.h" @@ -37,33 +41,33 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, // gpu::CommandBuffer implementation: bool Initialize() override; State GetLastState() override; - int32 GetLastToken() override; - void Flush(int32 put_offset) override; - void OrderingBarrier(int32 put_offset) override; - void WaitForTokenInRange(int32 start, int32 end) override; - void WaitForGetOffsetInRange(int32 start, int32 end) override; - void SetGetBuffer(int32 transfer_buffer_id) override; + int32_t GetLastToken() override; + void Flush(int32_t put_offset) override; + void OrderingBarrier(int32_t put_offset) override; + void WaitForTokenInRange(int32_t start, int32_t end) override; + void WaitForGetOffsetInRange(int32_t start, int32_t end) override; + void SetGetBuffer(int32_t transfer_buffer_id) override; scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size, - int32* id) override; - void DestroyTransferBuffer(int32 id) override; + int32_t* id) override; + void DestroyTransferBuffer(int32_t id) override; // gpu::GpuControl implementation: gpu::Capabilities GetCapabilities() override; - int32 CreateImage(ClientBuffer buffer, - size_t width, - size_t height, - unsigned internalformat) override; - void DestroyImage(int32 id) override; - int32 CreateGpuMemoryBufferImage(size_t width, - size_t height, - unsigned internalformat, - unsigned usage) override; - uint32 InsertSyncPoint() override; - uint32 InsertFutureSyncPoint() override; - void RetireSyncPoint(uint32 sync_point) override; - void SignalSyncPoint(uint32 sync_point, + int32_t CreateImage(ClientBuffer buffer, + size_t width, + size_t height, + unsigned internalformat) override; + void DestroyImage(int32_t id) override; + int32_t CreateGpuMemoryBufferImage(size_t width, + size_t height, + unsigned internalformat, + unsigned usage) override; + uint32_t InsertSyncPoint() override; + uint32_t InsertFutureSyncPoint() override; + void RetireSyncPoint(uint32_t sync_point) override; + void SignalSyncPoint(uint32_t sync_point, const base::Closure& callback) override; - void SignalQuery(uint32 query, const base::Closure& callback) override; + void SignalQuery(uint32_t query, const base::Closure& callback) override; void SetLock(base::Lock*) override; bool IsGpuChannelLost() override; gpu::CommandBufferNamespace GetNamespaceID() const override; diff --git a/ppapi/proxy/ppapi_message_utils.h b/ppapi/proxy/ppapi_message_utils.h index 6588a6e..fbcb105 100644 --- a/ppapi/proxy/ppapi_message_utils.h +++ b/ppapi/proxy/ppapi_message_utils.h @@ -5,7 +5,6 @@ #ifndef PPAPI_PROXY_PPAPI_MESSAGE_UTILS_H_ #define PPAPI_PROXY_PPAPI_MESSAGE_UTILS_H_ -#include "base/basictypes.h" #include "base/pickle.h" #include "base/tuple.h" #include "ipc/ipc_message.h" diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index c332a9d..2a59a7a 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -3,16 +3,19 @@ // found in the LICENSE file. // Multiply-included message header, no traditional include guard. + +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/shared_memory.h" #include "base/process/process.h" #include "base/strings/string16.h" #include "base/sync_socket.h" +#include "build/build_config.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/sync_token.h" @@ -542,60 +545,60 @@ IPC_MESSAGE_CONTROL1(PpapiMsg_SetNetworkState, // process will respond with PpapiHostMsg_GetSitesWithDataResult. This is used // for Flash. IPC_MESSAGE_CONTROL2(PpapiMsg_GetSitesWithData, - uint32 /* request_id */, + uint32_t /* request_id */, base::FilePath /* plugin_data_path */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_GetSitesWithDataResult, - uint32 /* request_id */, + uint32_t /* request_id */, std::vector<std::string> /* sites */) // Instructs the plugin to clear data for the given site & time. The plugin // process will respond with PpapiHostMsg_ClearSiteDataResult. This is used // for Flash. IPC_MESSAGE_CONTROL5(PpapiMsg_ClearSiteData, - uint32 /* request_id */, + uint32_t /* request_id */, base::FilePath /* plugin_data_path */, std::string /* site */, - uint64 /* flags */, - uint64 /* max_age */) + uint64_t /* flags */, + uint64_t /* max_age */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_ClearSiteDataResult, - uint32 /* request_id */, + uint32_t /* request_id */, bool /* success */) IPC_MESSAGE_CONTROL2(PpapiMsg_DeauthorizeContentLicenses, - uint32 /* request_id */, + uint32_t /* request_id */, base::FilePath /* plugin_data_path */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_DeauthorizeContentLicensesResult, - uint32 /* request_id */, + uint32_t /* request_id */, bool /* success */) IPC_MESSAGE_CONTROL3(PpapiMsg_GetPermissionSettings, - uint32 /* request_id */, + uint32_t /* request_id */, base::FilePath /* plugin_data_path */, PP_Flash_BrowserOperations_SettingType /* setting_type */) IPC_MESSAGE_CONTROL4( PpapiHostMsg_GetPermissionSettingsResult, - uint32 /* request_id */, + uint32_t /* request_id */, bool /* success */, PP_Flash_BrowserOperations_Permission /* default_permission */, ppapi::FlashSiteSettings /* sites */) IPC_MESSAGE_CONTROL5(PpapiMsg_SetDefaultPermission, - uint32 /* request_id */, + uint32_t /* request_id */, base::FilePath /* plugin_data_path */, PP_Flash_BrowserOperations_SettingType /* setting_type */, PP_Flash_BrowserOperations_Permission /* permission */, bool /* clear_site_specific */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetDefaultPermissionResult, - uint32 /* request_id */, + uint32_t /* request_id */, bool /* success */) IPC_MESSAGE_CONTROL4(PpapiMsg_SetSitePermission, - uint32 /* request_id */, + uint32_t /* request_id */, base::FilePath /* plugin_data_path */, PP_Flash_BrowserOperations_SettingType /* setting_type */, ppapi::FlashSiteSettings /* sites */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetSitePermissionResult, - uint32 /* request_id */, + uint32_t /* request_id */, bool /* success */) // Broker Process. @@ -636,55 +639,55 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPBInstance_MouseLockComplete, // PPP_Class. IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_HasProperty, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, ppapi::proxy::SerializedVar /* property */, ppapi::proxy::SerializedVar /* out_exception */, bool /* result */) IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_HasMethod, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, ppapi::proxy::SerializedVar /* method */, ppapi::proxy::SerializedVar /* out_exception */, bool /* result */) IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_GetProperty, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, ppapi::proxy::SerializedVar /* property */, ppapi::proxy::SerializedVar /* out_exception */, ppapi::proxy::SerializedVar /* result */) IPC_SYNC_MESSAGE_ROUTED2_2(PpapiMsg_PPPClass_EnumerateProperties, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, std::vector<ppapi::proxy::SerializedVar> /* props */, ppapi::proxy::SerializedVar /* out_exception */) IPC_SYNC_MESSAGE_ROUTED4_1(PpapiMsg_PPPClass_SetProperty, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, ppapi::proxy::SerializedVar /* name */, ppapi::proxy::SerializedVar /* value */, ppapi::proxy::SerializedVar /* out_exception */) IPC_SYNC_MESSAGE_ROUTED3_1(PpapiMsg_PPPClass_RemoveProperty, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, ppapi::proxy::SerializedVar /* property */, ppapi::proxy::SerializedVar /* out_exception */) IPC_SYNC_MESSAGE_ROUTED4_2(PpapiMsg_PPPClass_Call, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, ppapi::proxy::SerializedVar /* method_name */, std::vector<ppapi::proxy::SerializedVar> /* args */, ppapi::proxy::SerializedVar /* out_exception */, ppapi::proxy::SerializedVar /* result */) IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_Construct, - int64 /* ppp_class */, - int64 /* object */, + int64_t /* ppp_class */, + int64_t /* object */, std::vector<ppapi::proxy::SerializedVar> /* args */, ppapi::proxy::SerializedVar /* out_exception */, ppapi::proxy::SerializedVar /* result */) IPC_MESSAGE_ROUTED2(PpapiMsg_PPPClass_Deallocate, - int64 /* ppp_class */, - int64 /* object */) + int64_t /* ppp_class */, + int64_t /* object */) // PPP_Graphics3D_Dev. IPC_MESSAGE_ROUTED1(PpapiMsg_PPPGraphics3D_ContextLost, @@ -964,46 +967,46 @@ IPC_SYNC_MESSAGE_ROUTED3_4(PpapiHostMsg_PPBGraphics3D_Create, uint64_t /* command_buffer_id */) IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_SetGetBuffer, ppapi::HostResource /* context */, - int32 /* transfer_buffer_id */) + int32_t /* transfer_buffer_id */) IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBGraphics3D_WaitForTokenInRange, ppapi::HostResource /* context */, - int32 /* start */, - int32 /* end */, + int32_t /* start */, + int32_t /* end */, gpu::CommandBuffer::State /* state */, bool /* success */) IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBGraphics3D_WaitForGetOffsetInRange, ppapi::HostResource /* context */, - int32 /* start */, - int32 /* end */, + int32_t /* start */, + int32_t /* end */, gpu::CommandBuffer::State /* state */, bool /* success */) IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_AsyncFlush, ppapi::HostResource /* context */, - int32 /* put_offset */) + int32_t /* put_offset */) IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBGraphics3D_CreateTransferBuffer, ppapi::HostResource /* context */, - uint32 /* size */, - int32 /* id */, + uint32_t /* size */, + int32_t /* id */, ppapi::proxy::SerializedHandle /* transfer_buffer */) IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_DestroyTransferBuffer, ppapi::HostResource /* context */, - int32 /* id */) + int32_t /* id */) IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers, ppapi::HostResource /* graphics_3d */) IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBGraphics3D_InsertSyncPoint, ppapi::HostResource /* context */, - uint32 /* sync_point */) + uint32_t /* sync_point */) IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint, ppapi::HostResource /* context */, - uint32 /* sync_point */) + uint32_t /* sync_point */) IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_RetireSyncPoint, ppapi::HostResource /* context */, - uint32 /* sync_point */) + uint32_t /* sync_point */) // PPB_ImageData. IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreatePlatform, PP_Instance /* instance */, - int32 /* format */, + int32_t /* format */, PP_Size /* size */, PP_Bool /* init_to_zero */, ppapi::HostResource /* result_resource */, @@ -1011,7 +1014,7 @@ IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreatePlatform, ppapi::proxy::ImageHandle /* result */) IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreateSimple, PP_Instance /* instance */, - int32 /* format */, + int32_t /* format */, PP_Size /* size */, PP_Bool /* init_to_zero */, ppapi::HostResource /* result_resource */, @@ -1113,9 +1116,8 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_UpdateSurroundingText, // PPB_Var. IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVar_AddRefObject, - int64 /* object_id */) -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVar_ReleaseObject, - int64 /* object_id */) + int64_t /* object_id */) +IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVar_ReleaseObject, int64_t /* object_id */) IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_HasProperty, ppapi::proxy::SerializedVar /* object */, ppapi::proxy::SerializedVar /* property */, @@ -1158,13 +1160,13 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_Construct, ppapi::proxy::SerializedVar /* result */) IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_IsInstanceOfDeprecated, ppapi::proxy::SerializedVar /* var */, - int64 /* object_class */, - int64 /* object-data */, + int64_t /* object_class */, + int64_t /* object-data */, PP_Bool /* result */) IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVar_CreateObjectDeprecated, PP_Instance /* instance */, - int64 /* object_class */, - int64 /* object_data */, + int64_t /* object_class */, + int64_t /* object_data */, ppapi::proxy::SerializedVar /* result */) #if !defined(OS_NACL) && !defined(NACL_WIN64) @@ -1257,7 +1259,7 @@ IPC_SYNC_MESSAGE_ROUTED3_1( PP_Bool /* result */) IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBTesting_GetLiveObjectsForInstance, PP_Instance /* instance */, - uint32 /* result */) + uint32_t /* result */) IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBTesting_PostPowerSaverStatus, PP_Instance /* instance */) IPC_SYNC_MESSAGE_ROUTED1_0( @@ -1282,8 +1284,8 @@ IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVideoDecoder_Create, IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBVideoDecoder_Decode, ppapi::HostResource /* video_decoder */, ppapi::HostResource /* bitstream buffer */, - int32 /* bitstream buffer id */, - uint32 /* size of buffer */) + int32_t /* bitstream buffer id */, + uint32_t /* size of buffer */) IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_AssignPictureBuffers, ppapi::HostResource /* video_decoder */, std::vector<PP_PictureBuffer_Dev> /* picture buffers */) diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc index 2b6a826..57f8a9f 100644 --- a/ppapi/proxy/ppapi_param_traits.cc +++ b/ppapi/proxy/ppapi_param_traits.cc @@ -4,12 +4,16 @@ #include "ppapi/proxy/ppapi_param_traits.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> // For memcpy +#include "base/macros.h" +#include "build/build_config.h" #include "ppapi/c/pp_resource.h" #include "ppapi/proxy/ppapi_messages.h" -#include "ppapi/proxy/serialized_var.h" #include "ppapi/proxy/serialized_flash_menu.h" +#include "ppapi/proxy/serialized_var.h" #include "ppapi/shared_impl/host_resource.h" #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" @@ -156,7 +160,7 @@ void ParamTraits<PP_NetAddress_Private>::Write(Message* m, bool ParamTraits<PP_NetAddress_Private>::Read(const Message* m, base::PickleIterator* iter, param_type* p) { - uint16 size; + uint16_t size; if (!ReadParam(m, iter, &size)) return false; if (size > sizeof(p->data)) diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h index 6aff574..e3638b8 100644 --- a/ppapi/proxy/ppapi_param_traits.h +++ b/ppapi/proxy/ppapi_param_traits.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "build/build_config.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/pp_completion_callback.h" diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index bd76918..f3fb9dd 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -270,14 +270,13 @@ PluginProxyTestHarness::PluginDelegateMock::GetGloballySeenInstanceIDSet() { return &instance_id_set_; } -uint32 PluginProxyTestHarness::PluginDelegateMock::Register( +uint32_t PluginProxyTestHarness::PluginDelegateMock::Register( PluginDispatcher* plugin_dispatcher) { return 0; } void PluginProxyTestHarness::PluginDelegateMock::Unregister( - uint32 plugin_dispatcher_id) { -} + uint32_t plugin_dispatcher_id) {} IPC::Sender* PluginProxyTestHarness::PluginDelegateMock::GetBrowserSender() { return browser_sender_; diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h index 897410d..ec99071 100644 --- a/ppapi/proxy/ppapi_proxy_test.h +++ b/ppapi/proxy/ppapi_proxy_test.h @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <map> #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" @@ -146,8 +149,8 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase { // PluginDispatcher::PluginDelegate implementation. std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; - uint32 Register(PluginDispatcher* plugin_dispatcher) override; - void Unregister(uint32 plugin_dispatcher_id) override; + uint32_t Register(PluginDispatcher* plugin_dispatcher) override; + void Unregister(uint32_t plugin_dispatcher_id) override; // PluginProxyDelegate implementation. IPC::Sender* GetBrowserSender() override; diff --git a/ppapi/proxy/ppb_audio_proxy.cc b/ppapi/proxy/ppb_audio_proxy.cc index daa0395..ed60aa1 100644 --- a/ppapi/proxy/ppb_audio_proxy.cc +++ b/ppapi/proxy/ppb_audio_proxy.cc @@ -5,7 +5,9 @@ #include "ppapi/proxy/ppb_audio_proxy.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/simple_thread.h" +#include "build/build_config.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_audio.h" #include "ppapi/c/ppb_audio_config.h" @@ -18,8 +20,8 @@ #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/ppb_audio_shared.h" #include "ppapi/shared_impl/resource.h" -#include "ppapi/thunk/ppb_audio_config_api.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppb_audio_config_api.h" #include "ppapi/thunk/resource_creation_api.h" #include "ppapi/thunk/thunk.h" diff --git a/ppapi/proxy/ppb_audio_proxy.h b/ppapi/proxy/ppb_audio_proxy.h index cc8af6c..a738104 100644 --- a/ppapi/proxy/ppb_audio_proxy.h +++ b/ppapi/proxy/ppb_audio_proxy.h @@ -5,9 +5,11 @@ #ifndef PPAPI_PROXY_PPB_AUDIO_PROXY_H_ #define PPAPI_PROXY_PPB_AUDIO_PROXY_H_ +#include <stdint.h> + #include <utility> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "ipc/ipc_platform_file.h" diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc index e1d38ea..3f2b617 100644 --- a/ppapi/proxy/ppb_broker_proxy.cc +++ b/ppapi/proxy/ppb_broker_proxy.cc @@ -5,6 +5,7 @@ #include "ppapi/proxy/ppb_broker_proxy.h" #include "base/bind.h" +#include "base/macros.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/trusted/ppb_broker_trusted.h" #include "ppapi/proxy/enter_proxy.h" @@ -12,8 +13,8 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/platform_file.h" #include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/ppb_broker_api.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppb_broker_api.h" #include "ppapi/thunk/resource_creation_api.h" #include "ppapi/thunk/thunk.h" diff --git a/ppapi/proxy/ppb_broker_proxy.h b/ppapi/proxy/ppb_broker_proxy.h index 5bc195a..7baf3a2 100644 --- a/ppapi/proxy/ppb_broker_proxy.h +++ b/ppapi/proxy/ppb_broker_proxy.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PROXY_PPB_BROKER_PROXY_H_ #define PPAPI_PROXY_PPB_BROKER_PROXY_H_ +#include <stdint.h> + #include "base/sync_socket.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/pp_instance.h" diff --git a/ppapi/proxy/ppb_buffer_proxy.h b/ppapi/proxy/ppb_buffer_proxy.h index 2c131a0..b3ba248 100644 --- a/ppapi/proxy/ppb_buffer_proxy.h +++ b/ppapi/proxy/ppb_buffer_proxy.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_PPB_BUFFER_PROXY_H_ #define PPAPI_PROXY_PPB_BUFFER_PROXY_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppb_core_proxy.cc b/ppapi/proxy/ppb_core_proxy.cc index 0cf2a95..b3651ab 100644 --- a/ppapi/proxy/ppb_core_proxy.cc +++ b/ppapi/proxy/ppb_core_proxy.cc @@ -4,12 +4,14 @@ #include "ppapi/proxy/ppb_core_proxy.h" +#include <stdint.h> #include <stdlib.h> // For malloc #include "base/bind.h" #include "base/logging.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/ppb_core.h" diff --git a/ppapi/proxy/ppb_flash_message_loop_proxy.cc b/ppapi/proxy/ppb_flash_message_loop_proxy.cc index 1b332185..24d990e 100644 --- a/ppapi/proxy/ppb_flash_message_loop_proxy.cc +++ b/ppapi/proxy/ppb_flash_message_loop_proxy.cc @@ -5,6 +5,7 @@ #include "ppapi/proxy/ppb_flash_message_loop_proxy.h" #include "base/bind.h" +#include "base/macros.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_message_loop.h" #include "ppapi/proxy/enter_proxy.h" diff --git a/ppapi/proxy/ppb_flash_message_loop_proxy.h b/ppapi/proxy/ppb_flash_message_loop_proxy.h index a28bbda..9f0a3f9 100644 --- a/ppapi/proxy/ppb_flash_message_loop_proxy.h +++ b/ppapi/proxy/ppb_flash_message_loop_proxy.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PPB_FLASH_MESSAGE_LOOP_PROXY_H_ #define PPAPI_PPB_FLASH_MESSAGE_LOOP_PROXY_H_ -#include "base/basictypes.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/c/pp_instance.h" diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc index 81b6a70..06db5af 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.cc +++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc @@ -5,6 +5,7 @@ #include "ppapi/proxy/ppb_graphics_3d_proxy.h" #include "base/numerics/safe_conversions.h" +#include "build/build_config.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/common/command_buffer.h" #include "ppapi/c/pp_errors.h" @@ -26,8 +27,8 @@ namespace proxy { namespace { -const int32 kCommandBufferSize = 1024 * 1024; -const int32 kTransferBufferSize = 1024 * 1024; +const int32_t kCommandBufferSize = 1024 * 1024; +const int32_t kTransferBufferSize = 1024 * 1024; #if !defined(OS_NACL) base::SharedMemoryHandle TransportSHMHandle( @@ -121,7 +122,7 @@ gpu::GpuControl* Graphics3D::GetGpuControl() { return command_buffer_.get(); } -int32 Graphics3D::DoSwapBuffers() { +int32_t Graphics3D::DoSwapBuffers() { gles2_impl()->SwapBuffers(); IPC::Message* msg = new PpapiHostMsg_PPBGraphics3D_SwapBuffers( API_ID_PPB_GRAPHICS_3D, host_resource()); @@ -228,14 +229,13 @@ bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) { } #if !defined(OS_NACL) -void PPB_Graphics3D_Proxy::OnMsgCreate( - PP_Instance instance, - HostResource share_context, - const std::vector<int32_t>& attribs, - HostResource* result, - gpu::Capabilities* capabilities, - SerializedHandle* shared_state, - uint64* command_buffer_id) { +void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance, + HostResource share_context, + const std::vector<int32_t>& attribs, + HostResource* result, + gpu::Capabilities* capabilities, + SerializedHandle* shared_state, + uint64_t* command_buffer_id) { shared_state->set_null_shmem(); if (attribs.empty() || attribs.back() != PP_GRAPHICS3DATTRIB_NONE || @@ -262,9 +262,8 @@ void PPB_Graphics3D_Proxy::OnMsgCreate( } } -void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer( - const HostResource& context, - int32 transfer_buffer_id) { +void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer(const HostResource& context, + int32_t transfer_buffer_id) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) enter.object()->SetGetBuffer(transfer_buffer_id); @@ -272,8 +271,8 @@ void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer( void PPB_Graphics3D_Proxy::OnMsgWaitForTokenInRange( const HostResource& context, - int32 start, - int32 end, + int32_t start, + int32_t end, gpu::CommandBuffer::State* state, bool* success) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); @@ -287,8 +286,8 @@ void PPB_Graphics3D_Proxy::OnMsgWaitForTokenInRange( void PPB_Graphics3D_Proxy::OnMsgWaitForGetOffsetInRange( const HostResource& context, - int32 start, - int32 end, + int32_t start, + int32_t end, gpu::CommandBuffer::State* state, bool* success) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); @@ -301,7 +300,7 @@ void PPB_Graphics3D_Proxy::OnMsgWaitForGetOffsetInRange( } void PPB_Graphics3D_Proxy::OnMsgAsyncFlush(const HostResource& context, - int32 put_offset) { + int32_t put_offset) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) enter.object()->Flush(put_offset); @@ -309,8 +308,8 @@ void PPB_Graphics3D_Proxy::OnMsgAsyncFlush(const HostResource& context, void PPB_Graphics3D_Proxy::OnMsgCreateTransferBuffer( const HostResource& context, - uint32 size, - int32* id, + uint32_t size, + int32_t* id, SerializedHandle* transfer_buffer) { transfer_buffer->set_null_shmem(); EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); @@ -332,7 +331,7 @@ void PPB_Graphics3D_Proxy::OnMsgCreateTransferBuffer( void PPB_Graphics3D_Proxy::OnMsgDestroyTransferBuffer( const HostResource& context, - int32 id) { + int32_t id) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) enter.object()->DestroyTransferBuffer(id); @@ -347,7 +346,7 @@ void PPB_Graphics3D_Proxy::OnMsgSwapBuffers(const HostResource& context) { } void PPB_Graphics3D_Proxy::OnMsgInsertSyncPoint(const HostResource& context, - uint32* sync_point) { + uint32_t* sync_point) { *sync_point = 0; EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) @@ -356,7 +355,7 @@ void PPB_Graphics3D_Proxy::OnMsgInsertSyncPoint(const HostResource& context, void PPB_Graphics3D_Proxy::OnMsgInsertFutureSyncPoint( const HostResource& context, - uint32* sync_point) { + uint32_t* sync_point) { *sync_point = 0; EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) @@ -364,7 +363,7 @@ void PPB_Graphics3D_Proxy::OnMsgInsertFutureSyncPoint( } void PPB_Graphics3D_Proxy::OnMsgRetireSyncPoint(const HostResource& context, - uint32 sync_point) { + uint32_t sync_point) { EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); if (enter.succeeded()) enter.object()->RetireSyncPoint(sync_point); diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h index 6beed42..acbaa81 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.h +++ b/ppapi/proxy/ppb_graphics_3d_proxy.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ #define PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "gpu/command_buffer/common/command_buffer.h" #include "ppapi/c/pp_graphics_3d.h" #include "ppapi/c/pp_instance.h" @@ -44,7 +47,7 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared { PP_Bool SetGetBuffer(int32_t shm_id) override; PP_Bool Flush(int32_t put_offset) override; scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, - int32* id) override; + int32_t* id) override; PP_Bool DestroyTransferBuffer(int32_t id) override; gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, int32_t end) override; @@ -58,7 +61,7 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared { // PPB_Graphics3D_Shared overrides. gpu::CommandBuffer* GetCommandBuffer() override; gpu::GpuControl* GetGpuControl() override; - int32 DoSwapBuffers() override; + int32_t DoSwapBuffers() override; scoped_ptr<PpapiCommandBufferProxy> command_buffer_; @@ -88,31 +91,29 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy { gpu::Capabilities* capabilities, SerializedHandle* handle, uint64_t* command_buffer_id); - void OnMsgSetGetBuffer(const HostResource& context, - int32 id); + void OnMsgSetGetBuffer(const HostResource& context, int32_t id); void OnMsgWaitForTokenInRange(const HostResource& context, - int32 start, - int32 end, + int32_t start, + int32_t end, gpu::CommandBuffer::State* state, bool* success); void OnMsgWaitForGetOffsetInRange(const HostResource& context, - int32 start, - int32 end, + int32_t start, + int32_t end, gpu::CommandBuffer::State* state, bool* success); - void OnMsgAsyncFlush(const HostResource& context, int32 put_offset); + void OnMsgAsyncFlush(const HostResource& context, int32_t put_offset); void OnMsgCreateTransferBuffer( const HostResource& context, - uint32 size, - int32* id, + uint32_t size, + int32_t* id, ppapi::proxy::SerializedHandle* transfer_buffer); - void OnMsgDestroyTransferBuffer(const HostResource& context, - int32 id); + void OnMsgDestroyTransferBuffer(const HostResource& context, int32_t id); void OnMsgSwapBuffers(const HostResource& context); - void OnMsgInsertSyncPoint(const HostResource& context, uint32* sync_point); + void OnMsgInsertSyncPoint(const HostResource& context, uint32_t* sync_point); void OnMsgInsertFutureSyncPoint(const HostResource& context, - uint32* sync_point); - void OnMsgRetireSyncPoint(const HostResource& context, uint32 sync_point); + uint32_t* sync_point); + void OnMsgRetireSyncPoint(const HostResource& context, uint32_t sync_point); // Renderer->plugin message handlers. void OnMsgSwapBuffersACK(const HostResource& context, int32_t pp_error); diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc index ead31cb..3e28629 100644 --- a/ppapi/proxy/ppb_image_data_proxy.cc +++ b/ppapi/proxy/ppb_image_data_proxy.cc @@ -10,6 +10,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h index 47dccc4..38fc109 100644 --- a/ppapi/proxy/ppb_image_data_proxy.h +++ b/ppapi/proxy/ppb_image_data_proxy.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PPB_IMAGE_DATA_PROXY_H_ #define PPAPI_PPB_IMAGE_DATA_PROXY_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "build/build_config.h" @@ -121,7 +124,7 @@ class PPAPI_PROXY_EXPORT SimpleImageData : public ImageData { private: base::SharedMemory shm_; - uint32 size_; + uint32_t size_; int map_count_; DISALLOW_COPY_AND_ASSIGN(SimpleImageData); diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 4506953..63372cb 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -546,13 +546,13 @@ PP_Var PPB_Instance_Proxy::GetPluginReferrerURL( } void PPB_Instance_Proxy::PromiseResolved(PP_Instance instance, - uint32 promise_id) { + uint32_t promise_id) { dispatcher()->Send(new PpapiHostMsg_PPBInstance_PromiseResolved( API_ID_PPB_INSTANCE, instance, promise_id)); } void PPB_Instance_Proxy::PromiseResolvedWithSession(PP_Instance instance, - uint32 promise_id, + uint32_t promise_id, PP_Var session_id_var) { dispatcher()->Send(new PpapiHostMsg_PPBInstance_PromiseResolvedWithSession( API_ID_PPB_INSTANCE, instance, promise_id, @@ -560,9 +560,9 @@ void PPB_Instance_Proxy::PromiseResolvedWithSession(PP_Instance instance, } void PPB_Instance_Proxy::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) { dispatcher()->Send(new PpapiHostMsg_PPBInstance_PromiseRejected( API_ID_PPB_INSTANCE, @@ -634,7 +634,7 @@ void PPB_Instance_Proxy::SessionClosed(PP_Instance instance, void PPB_Instance_Proxy::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) { dispatcher()->Send(new PpapiHostMsg_PPBInstance_LegacySessionError( API_ID_PPB_INSTANCE, instance, diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index aac53b4..d568ed2 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "build/build_config.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" @@ -111,14 +114,14 @@ class PPB_Instance_Proxy : public InterfaceProxy, PP_URLComponents_Dev* components) override; PP_Var GetPluginReferrerURL(PP_Instance instance, PP_URLComponents_Dev* components) override; - 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, @@ -138,7 +141,7 @@ class PPB_Instance_Proxy : public InterfaceProxy, 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/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc index c9ea5a8..e05ec5c 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.cc +++ b/ppapi/proxy/ppb_message_loop_proxy.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/ppb_message_loop_proxy.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -178,7 +180,7 @@ bool MessageLoopResource::IsCurrent() const { void MessageLoopResource::PostClosure( const tracked_objects::Location& from_here, const base::Closure& closure, - int64 delay_ms) { + int64_t delay_ms) { if (task_runner_.get()) { task_runner_->PostDelayedTask(from_here, closure, base::TimeDelta::FromMilliseconds(delay_ms)); diff --git a/ppapi/proxy/ppb_message_loop_proxy.h b/ppapi/proxy/ppb_message_loop_proxy.h index 25e69b3..e8213a9 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.h +++ b/ppapi/proxy/ppb_message_loop_proxy.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_PPB_MESSAGE_LOOP_PROXY_H_ #define PPAPI_PROXY_PPB_MESSAGE_LOOP_PROXY_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -56,7 +58,7 @@ class PPAPI_PROXY_EXPORT MessageLoopResource : public MessageLoopShared { struct TaskInfo { tracked_objects::Location from_here; base::Closure closure; - int64 delay_ms; + int64_t delay_ms; }; // Returns true if the object is associated with the current thread. @@ -71,7 +73,7 @@ class PPAPI_PROXY_EXPORT MessageLoopResource : public MessageLoopShared { // proxy operations (e.g., MessageLoop::QuitClosure). void PostClosure(const tracked_objects::Location& from_here, const base::Closure& closure, - int64 delay_ms) override; + int64_t delay_ms) override; base::SingleThreadTaskRunner* GetTaskRunner() override; bool CurrentlyHandlingBlockingMessage() override; diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc index 4381798..6ddbd7e 100644 --- a/ppapi/proxy/ppb_testing_proxy.cc +++ b/ppapi/proxy/ppb_testing_proxy.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/ppb_testing_proxy.h" +#include <stddef.h> + #include "base/message_loop/message_loop.h" #include "ppapi/c/private/ppb_testing_private.h" #include "ppapi/proxy/enter_proxy.h" diff --git a/ppapi/proxy/ppb_testing_proxy.h b/ppapi/proxy/ppb_testing_proxy.h index 7640291..c4b149a 100644 --- a/ppapi/proxy/ppb_testing_proxy.h +++ b/ppapi/proxy/ppb_testing_proxy.h @@ -5,7 +5,9 @@ #ifndef PPAPI_PROXY_PPB_TESTING_PROXY_H_ #define PPAPI_PROXY_PPB_TESTING_PROXY_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/private/ppb_testing_private.h" diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc index 7adda60..dd4bb4c 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.cc +++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc @@ -238,8 +238,9 @@ bool IsInstanceOf(PP_Var var, return false; PP_Bool result = PP_FALSE; - int64 class_int = static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class)); - int64 class_data_int = 0; + int64_t class_int = + static_cast<int64_t>(reinterpret_cast<intptr_t>(ppp_class)); + int64_t class_data_int = 0; dispatcher->Send(new PpapiHostMsg_PPBVar_IsInstanceOfDeprecated( API_ID_PPB_VAR_DEPRECATED, SerializedVarSendInput(dispatcher, var), class_int, &class_data_int, &result)); @@ -261,9 +262,10 @@ PP_Var CreateObject(PP_Instance instance, return PP_MakeUndefined(); // Object already exists with this user data. ReceiveSerializedVarReturnValue result; - int64 class_int = static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class)); - int64 data_int = - static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class_data)); + int64_t class_int = + static_cast<int64_t>(reinterpret_cast<intptr_t>(ppp_class)); + int64_t data_int = + static_cast<int64_t>(reinterpret_cast<intptr_t>(ppp_class_data)); dispatcher->Send(new PpapiHostMsg_PPBVar_CreateObjectDeprecated( API_ID_PPB_VAR_DEPRECATED, instance, class_int, data_int, &result)); @@ -355,13 +357,13 @@ bool PPB_Var_Deprecated_Proxy::OnMessageReceived(const IPC::Message& msg) { return handled; } -void PPB_Var_Deprecated_Proxy::OnMsgAddRefObject(int64 object_id) { +void PPB_Var_Deprecated_Proxy::OnMsgAddRefObject(int64_t object_id) { PP_Var var = { PP_VARTYPE_OBJECT }; var.value.as_id = object_id; ppb_var_impl_->AddRef(var); } -void PPB_Var_Deprecated_Proxy::OnMsgReleaseObject(int64 object_id) { +void PPB_Var_Deprecated_Proxy::OnMsgReleaseObject(int64_t object_id) { // Ok, so this is super subtle. // When the browser side sends a sync IPC message that returns a var, and the // plugin wants to give ownership of that var to the browser, dropping all @@ -489,8 +491,8 @@ void PPB_Var_Deprecated_Proxy::OnMsgConstruct( void PPB_Var_Deprecated_Proxy::OnMsgIsInstanceOfDeprecated( SerializedVarReceiveInput var, - int64 ppp_class, - int64* ppp_class_data, + int64_t ppp_class, + int64_t* ppp_class_data, PP_Bool* result) { SetAllowPluginReentrancy(); *result = PPP_Class_Proxy::IsInstanceOf(ppb_var_impl_, @@ -501,8 +503,8 @@ void PPB_Var_Deprecated_Proxy::OnMsgIsInstanceOfDeprecated( void PPB_Var_Deprecated_Proxy::OnMsgCreateObjectDeprecated( PP_Instance instance, - int64 ppp_class, - int64 class_data, + int64_t ppp_class, + int64_t class_data, SerializedVarReturnValue result) { SetAllowPluginReentrancy(); result.Return(dispatcher(), PPP_Class_Proxy::CreateProxiedObject( @@ -516,7 +518,7 @@ void PPB_Var_Deprecated_Proxy::SetAllowPluginReentrancy() { static_cast<HostDispatcher*>(dispatcher())->set_allow_plugin_reentrancy(); } -void PPB_Var_Deprecated_Proxy::DoReleaseObject(int64 object_id) { +void PPB_Var_Deprecated_Proxy::DoReleaseObject(int64_t object_id) { PP_Var var = { PP_VARTYPE_OBJECT }; var.value.as_id = object_id; ppb_var_impl_->Release(var); diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.h b/ppapi/proxy/ppb_var_deprecated_proxy.h index 344ccd5..b5a6d18 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.h +++ b/ppapi/proxy/ppb_var_deprecated_proxy.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_PPB_VAR_DEPRECATED_PROXY_H_ #define PPAPI_PROXY_PPB_VAR_DEPRECATED_PROXY_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" @@ -35,8 +38,8 @@ class PPB_Var_Deprecated_Proxy : public InterfaceProxy { private: // Message handlers. - void OnMsgAddRefObject(int64 object_id); - void OnMsgReleaseObject(int64 object_id); + void OnMsgAddRefObject(int64_t object_id); + void OnMsgReleaseObject(int64_t object_id); void OnMsgHasProperty(SerializedVarReceiveInput var, SerializedVarReceiveInput name, SerializedVarOutParam exception, @@ -77,18 +80,18 @@ class PPB_Var_Deprecated_Proxy : public InterfaceProxy { SerializedVarOutParam exception, SerializedVarReturnValue result); void OnMsgIsInstanceOfDeprecated(SerializedVarReceiveInput var, - int64 ppp_class, - int64* ppp_class_data, + int64_t ppp_class, + int64_t* ppp_class_data, PP_Bool* result); void OnMsgCreateObjectDeprecated(PP_Instance instance, - int64 ppp_class, - int64 ppp_class_data, + int64_t ppp_class, + int64_t ppp_class_data, SerializedVarReturnValue result); // Call in the host for messages that can be reentered. void SetAllowPluginReentrancy(); - void DoReleaseObject(int64 object_id); + void DoReleaseObject(int64_t object_id); const PPB_Var_Deprecated* ppb_var_impl_; diff --git a/ppapi/proxy/ppb_var_unittest.cc b/ppapi/proxy/ppb_var_unittest.cc index 98b6428..cfabf0f 100644 --- a/ppapi/proxy/ppb_var_unittest.cc +++ b/ppapi/proxy/ppb_var_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 <string> #include <vector> diff --git a/ppapi/proxy/ppb_video_decoder_proxy.cc b/ppapi/proxy/ppb_video_decoder_proxy.cc index e63423d..1ec9605 100644 --- a/ppapi/proxy/ppb_video_decoder_proxy.cc +++ b/ppapi/proxy/ppb_video_decoder_proxy.cc @@ -5,6 +5,7 @@ #include "ppapi/proxy/ppb_video_decoder_proxy.h" #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "ppapi/proxy/enter_proxy.h" @@ -230,9 +231,10 @@ void PPB_VideoDecoder_Proxy::OnMsgCreate( instance, graphics_context.host_resource(), profile)); } -void PPB_VideoDecoder_Proxy::OnMsgDecode( - const HostResource& decoder, - const HostResource& buffer, int32 id, uint32 size) { +void PPB_VideoDecoder_Proxy::OnMsgDecode(const HostResource& decoder, + const HostResource& buffer, + int32_t id, + uint32_t size) { EnterHostFromHostResourceForceCallback<PPB_VideoDecoder_Dev_API> enter( decoder, callback_factory_, &PPB_VideoDecoder_Proxy::SendMsgEndOfBitstreamACKToPlugin, decoder, id); @@ -254,7 +256,8 @@ void PPB_VideoDecoder_Proxy::OnMsgAssignPictureBuffers( } void PPB_VideoDecoder_Proxy::OnMsgReusePictureBuffer( - const HostResource& decoder, int32 picture_buffer_id) { + const HostResource& decoder, + int32_t picture_buffer_id) { EnterHostFromHostResource<PPB_VideoDecoder_Dev_API> enter(decoder); if (enter.succeeded()) enter.object()->ReusePictureBuffer(picture_buffer_id); @@ -283,7 +286,9 @@ void PPB_VideoDecoder_Proxy::OnMsgDestroy(const HostResource& decoder) { } void PPB_VideoDecoder_Proxy::SendMsgEndOfBitstreamACKToPlugin( - int32_t result, const HostResource& decoder, int32 id) { + int32_t result, + const HostResource& decoder, + int32_t id) { dispatcher()->Send(new PpapiMsg_PPBVideoDecoder_EndOfBitstreamACK( API_ID_PPB_VIDEO_DECODER_DEV, decoder, id, result)); } diff --git a/ppapi/proxy/ppb_video_decoder_proxy.h b/ppapi/proxy/ppb_video_decoder_proxy.h index dbc030e4..0b2a6f6 100644 --- a/ppapi/proxy/ppb_video_decoder_proxy.h +++ b/ppapi/proxy/ppb_video_decoder_proxy.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_PPB_VIDEO_DECODER_PROXY_H_ #define PPAPI_PROXY_PPB_VIDEO_DECODER_PROXY_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/proxy_completion_callback_factory.h" @@ -38,23 +41,24 @@ class PPB_VideoDecoder_Proxy : public InterfaceProxy { const ppapi::HostResource& graphics_context, PP_VideoDecoder_Profile profile, ppapi::HostResource* result); - void OnMsgDecode( - const ppapi::HostResource& decoder, - const ppapi::HostResource& buffer, int32 id, uint32 size); + void OnMsgDecode(const ppapi::HostResource& decoder, + const ppapi::HostResource& buffer, + int32_t id, + uint32_t size); void OnMsgAssignPictureBuffers( const ppapi::HostResource& decoder, const std::vector<PP_PictureBuffer_Dev>& buffers); - void OnMsgReusePictureBuffer( - const ppapi::HostResource& decoder, - int32 picture_buffer_id); + void OnMsgReusePictureBuffer(const ppapi::HostResource& decoder, + int32_t picture_buffer_id); void OnMsgFlush(const ppapi::HostResource& decoder); void OnMsgReset(const ppapi::HostResource& decoder); void OnMsgDestroy(const ppapi::HostResource& decoder); // Send a message from the renderer process to the plugin process to tell it // to run its callback. - void SendMsgEndOfBitstreamACKToPlugin( - int32_t result, const ppapi::HostResource& decoder, int32 id); + void SendMsgEndOfBitstreamACKToPlugin(int32_t result, + const ppapi::HostResource& decoder, + int32_t id); void SendMsgFlushACKToPlugin( int32_t result, const ppapi::HostResource& decoder); void SendMsgResetACKToPlugin( diff --git a/ppapi/proxy/ppb_x509_certificate_private_proxy.cc b/ppapi/proxy/ppb_x509_certificate_private_proxy.cc index df58f43..8ed49d6f 100644 --- a/ppapi/proxy/ppb_x509_certificate_private_proxy.cc +++ b/ppapi/proxy/ppb_x509_certificate_private_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppb_x509_certificate_private_proxy.h" +#include "base/macros.h" #include "ppapi/c/private/ppb_x509_certificate_private.h" #include "ppapi/proxy/plugin_globals.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/ppb_x509_certificate_private_proxy.h b/ppapi/proxy/ppb_x509_certificate_private_proxy.h index 95d8f2c..4a45117 100644 --- a/ppapi/proxy/ppb_x509_certificate_private_proxy.h +++ b/ppapi/proxy/ppb_x509_certificate_private_proxy.h @@ -5,8 +5,8 @@ #ifndef PPAPI_PROXY_PPB_X509_CERTIFICATE_PRIVATE_PROXY_H_ #define PPAPI_PROXY_PPB_X509_CERTIFICATE_PRIVATE_PROXY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_class_proxy.cc b/ppapi/proxy/ppp_class_proxy.cc index 3c28d0d..f8301e0 100644 --- a/ppapi/proxy/ppp_class_proxy.cc +++ b/ppapi/proxy/ppp_class_proxy.cc @@ -11,8 +11,8 @@ #include "ppapi/proxy/plugin_globals.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_var.h" -#include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/shared_impl/api_id.h" +#include "ppapi/shared_impl/proxy_lock.h" namespace ppapi { namespace proxy { @@ -24,15 +24,12 @@ namespace { // Represents a plugin-implemented class in the browser process. This just // stores the data necessary to call back the plugin. struct ObjectProxy { - ObjectProxy(Dispatcher* d, int64 p, int64 ud) - : dispatcher(d), - ppp_class(p), - user_data(ud) { - } + ObjectProxy(Dispatcher* d, int64_t p, int64_t ud) + : dispatcher(d), ppp_class(p), user_data(ud) {} Dispatcher* dispatcher; - int64 ppp_class; - int64 user_data; + int64_t ppp_class; + int64_t user_data; }; ObjectProxy* ToObjectProxy(void* data) { @@ -187,16 +184,16 @@ const PPP_Class_Deprecated class_interface = { // Plugin helper functions ----------------------------------------------------- -// Converts an int64 object from IPC to a PPP_Class* for calling into the +// Converts an int64_t object from IPC to a PPP_Class* for calling into the // plugin's implementation. -const PPP_Class_Deprecated* ToPPPClass(int64 value) { +const PPP_Class_Deprecated* ToPPPClass(int64_t value) { return reinterpret_cast<const PPP_Class_Deprecated*>( static_cast<intptr_t>(value)); } -// Converts an int64 object from IPC to a void* for calling into the plugin's +// Converts an int64_t object from IPC to a void* for calling into the plugin's // implementation as the user data. -void* ToUserData(int64 value) { +void* ToUserData(int64_t value) { return reinterpret_cast<void*>(static_cast<intptr_t>(value)); } @@ -220,8 +217,8 @@ InterfaceProxy* PPP_Class_Proxy::Create(Dispatcher* dispatcher) { PP_Var PPP_Class_Proxy::CreateProxiedObject(const PPB_Var_Deprecated* var, Dispatcher* dispatcher, PP_Instance instance_id, - int64 ppp_class, - int64 class_data) { + int64_t ppp_class, + int64_t class_data) { ObjectProxy* object_proxy = new ObjectProxy(dispatcher, ppp_class, class_data); return var->CreateObject(instance_id, &class_interface, object_proxy); @@ -230,8 +227,8 @@ PP_Var PPP_Class_Proxy::CreateProxiedObject(const PPB_Var_Deprecated* var, // static PP_Bool PPP_Class_Proxy::IsInstanceOf(const PPB_Var_Deprecated* ppb_var_impl, const PP_Var& var, - int64 ppp_class, - int64* ppp_class_data) { + int64_t ppp_class, + int64_t* ppp_class_data) { void* proxied_object = NULL; if (ppb_var_impl->IsInstanceOf(var, &class_interface, @@ -272,7 +269,8 @@ bool PPP_Class_Proxy::OnMessageReceived(const IPC::Message& msg) { return handled; } -void PPP_Class_Proxy::OnMsgHasProperty(int64 ppp_class, int64 object, +void PPP_Class_Proxy::OnMsgHasProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception, bool* result) { @@ -284,7 +282,8 @@ void PPP_Class_Proxy::OnMsgHasProperty(int64 ppp_class, int64 object, exception.OutParam(dispatcher())); } -void PPP_Class_Proxy::OnMsgHasMethod(int64 ppp_class, int64 object, +void PPP_Class_Proxy::OnMsgHasMethod(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception, bool* result) { @@ -296,7 +295,8 @@ void PPP_Class_Proxy::OnMsgHasMethod(int64 ppp_class, int64 object, exception.OutParam(dispatcher())); } -void PPP_Class_Proxy::OnMsgGetProperty(int64 ppp_class, int64 object, +void PPP_Class_Proxy::OnMsgGetProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception, SerializedVarReturnValue result) { @@ -309,7 +309,8 @@ void PPP_Class_Proxy::OnMsgGetProperty(int64 ppp_class, int64 object, } void PPP_Class_Proxy::OnMsgEnumerateProperties( - int64 ppp_class, int64 object, + int64_t ppp_class, + int64_t object, std::vector<SerializedVar>* props, SerializedVarOutParam exception) { if (!ValidateUserData(ppp_class, object, &exception)) @@ -318,7 +319,8 @@ void PPP_Class_Proxy::OnMsgEnumerateProperties( // TODO(brettw) implement this. } -void PPP_Class_Proxy::OnMsgSetProperty(int64 ppp_class, int64 object, +void PPP_Class_Proxy::OnMsgSetProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarReceiveInput value, SerializedVarOutParam exception) { @@ -329,7 +331,8 @@ void PPP_Class_Proxy::OnMsgSetProperty(int64 ppp_class, int64 object, exception.OutParam(dispatcher())); } -void PPP_Class_Proxy::OnMsgRemoveProperty(int64 ppp_class, int64 object, +void PPP_Class_Proxy::OnMsgRemoveProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception) { if (!ValidateUserData(ppp_class, object, &exception)) @@ -339,12 +342,12 @@ void PPP_Class_Proxy::OnMsgRemoveProperty(int64 ppp_class, int64 object, exception.OutParam(dispatcher())); } -void PPP_Class_Proxy::OnMsgCall( - int64 ppp_class, int64 object, - SerializedVarReceiveInput method_name, - SerializedVarVectorReceiveInput arg_vector, - SerializedVarOutParam exception, - SerializedVarReturnValue result) { +void PPP_Class_Proxy::OnMsgCall(int64_t ppp_class, + int64_t object, + SerializedVarReceiveInput method_name, + SerializedVarVectorReceiveInput arg_vector, + SerializedVarOutParam exception, + SerializedVarReturnValue result) { if (!ValidateUserData(ppp_class, object, &exception)) return; uint32_t arg_count = 0; @@ -354,11 +357,11 @@ void PPP_Class_Proxy::OnMsgCall( arg_count, args, exception.OutParam(dispatcher()))); } -void PPP_Class_Proxy::OnMsgConstruct( - int64 ppp_class, int64 object, - SerializedVarVectorReceiveInput arg_vector, - SerializedVarOutParam exception, - SerializedVarReturnValue result) { +void PPP_Class_Proxy::OnMsgConstruct(int64_t ppp_class, + int64_t object, + SerializedVarVectorReceiveInput arg_vector, + SerializedVarOutParam exception, + SerializedVarReturnValue result) { if (!ValidateUserData(ppp_class, object, &exception)) return; uint32_t arg_count = 0; @@ -368,7 +371,7 @@ void PPP_Class_Proxy::OnMsgConstruct( ToUserData(object), arg_count, args, exception.OutParam(dispatcher()))); } -void PPP_Class_Proxy::OnMsgDeallocate(int64 ppp_class, int64 object) { +void PPP_Class_Proxy::OnMsgDeallocate(int64_t ppp_class, int64_t object) { if (!ValidateUserData(ppp_class, object, NULL)) return; PluginGlobals::Get()->plugin_var_tracker()->PluginImplementedObjectDestroyed( @@ -376,7 +379,8 @@ void PPP_Class_Proxy::OnMsgDeallocate(int64 ppp_class, int64 object) { CallWhileUnlocked(ToPPPClass(ppp_class)->Deallocate, ToUserData(object)); } -bool PPP_Class_Proxy::ValidateUserData(int64 ppp_class, int64 class_data, +bool PPP_Class_Proxy::ValidateUserData(int64_t ppp_class, + int64_t class_data, SerializedVarOutParam* exception) { if (!PluginGlobals::Get()->plugin_var_tracker()->ValidatePluginObjectCall( ToPPPClass(ppp_class), ToUserData(class_data))) { diff --git a/ppapi/proxy/ppp_class_proxy.h b/ppapi/proxy/ppp_class_proxy.h index f890b3d..c70b564 100644 --- a/ppapi/proxy/ppp_class_proxy.h +++ b/ppapi/proxy/ppp_class_proxy.h @@ -5,9 +5,11 @@ #ifndef PPAPI_PROXY_PPP_CLASS_PROXY_H_ #define PPAPI_PROXY_PPP_CLASS_PROXY_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/interface_proxy.h" @@ -39,56 +41,64 @@ class PPP_Class_Proxy : public InterfaceProxy { static PP_Var CreateProxiedObject(const PPB_Var_Deprecated* var, Dispatcher* dispatcher, PP_Instance instance_id, - int64 ppp_class, - int64 class_data); + int64_t ppp_class, + int64_t class_data); static PP_Bool IsInstanceOf(const PPB_Var_Deprecated* ppb_var_impl, const PP_Var& var, - int64 ppp_class, - int64* ppp_class_data); + int64_t ppp_class, + int64_t* ppp_class_data); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); private: // IPC message handlers. - void OnMsgHasProperty(int64 ppp_class, int64 object, + void OnMsgHasProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception, bool* result); - void OnMsgHasMethod(int64 ppp_class, int64 object, + void OnMsgHasMethod(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception, bool* result); - void OnMsgGetProperty(int64 ppp_class, int64 object, + void OnMsgGetProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception, SerializedVarReturnValue result); - void OnMsgEnumerateProperties( - int64 ppp_class, int64 object, - std::vector<SerializedVar>* props, - SerializedVarOutParam exception); - void OnMsgSetProperty(int64 ppp_class, int64 object, + void OnMsgEnumerateProperties(int64_t ppp_class, + int64_t object, + std::vector<SerializedVar>* props, + SerializedVarOutParam exception); + void OnMsgSetProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarReceiveInput value, SerializedVarOutParam exception); - void OnMsgRemoveProperty(int64 ppp_class, int64 object, + void OnMsgRemoveProperty(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput property, SerializedVarOutParam exception); - void OnMsgCall(int64 ppp_class, int64 object, + void OnMsgCall(int64_t ppp_class, + int64_t object, SerializedVarReceiveInput method_name, SerializedVarVectorReceiveInput arg_vector, SerializedVarOutParam exception, SerializedVarReturnValue result); - void OnMsgConstruct(int64 ppp_class, int64 object, + void OnMsgConstruct(int64_t ppp_class, + int64_t object, SerializedVarVectorReceiveInput arg_vector, SerializedVarOutParam exception, SerializedVarReturnValue result); - void OnMsgDeallocate(int64 ppp_class, int64 object); + void OnMsgDeallocate(int64_t ppp_class, int64_t object); // Returns true if the given class/data points to a plugin-implemented // object. On failure, the exception, if non-NULL, will also be set. - bool ValidateUserData(int64 ppp_class, int64 class_data, + bool ValidateUserData(int64_t ppp_class, + int64_t class_data, SerializedVarOutParam* exception); DISALLOW_COPY_AND_ASSIGN(PPP_Class_Proxy); diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.h b/ppapi/proxy/ppp_content_decryptor_private_proxy.h index 0df8734..2ab19c3 100644 --- a/ppapi/proxy/ppp_content_decryptor_private_proxy.h +++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_PPP_CONTENT_DECRYPTOR_PRIVATE_PROXY_H_ #define PPAPI_PROXY_PPP_CONTENT_DECRYPTOR_PRIVATE_PROXY_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/private/ppp_content_decryptor_private.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_find_proxy.cc b/ppapi/proxy/ppp_find_proxy.cc index abd5663..c5d62b7 100644 --- a/ppapi/proxy/ppp_find_proxy.cc +++ b/ppapi/proxy/ppp_find_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppp_find_proxy.h" +#include "build/build_config.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/api_id.h" diff --git a/ppapi/proxy/ppp_find_proxy.h b/ppapi/proxy/ppp_find_proxy.h index 6d22304..8e07d7e 100644 --- a/ppapi/proxy/ppp_find_proxy.h +++ b/ppapi/proxy/ppp_find_proxy.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "ppapi/c/private/ppp_find_private.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_graphics_3d_proxy.cc b/ppapi/proxy/ppp_graphics_3d_proxy.cc index b5f0ac1..50f7fe5 100644 --- a/ppapi/proxy/ppp_graphics_3d_proxy.cc +++ b/ppapi/proxy/ppp_graphics_3d_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppp_graphics_3d_proxy.h" +#include "build/build_config.h" #include "ppapi/c/ppp_graphics_3d.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" diff --git a/ppapi/proxy/ppp_graphics_3d_proxy.h b/ppapi/proxy/ppp_graphics_3d_proxy.h index a6f7eb6..6897e6b 100644 --- a/ppapi/proxy/ppp_graphics_3d_proxy.h +++ b/ppapi/proxy/ppp_graphics_3d_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_GRAPHICS_3D_PROXY_H_ #define PPAPI_PROXY_PPP_GRAPHICS_3D_PROXY_H_ +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp_graphics_3d.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_input_event_proxy.cc b/ppapi/proxy/ppp_input_event_proxy.cc index cbf6a63..b256a2b 100644 --- a/ppapi/proxy/ppp_input_event_proxy.cc +++ b/ppapi/proxy/ppp_input_event_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppp_input_event_proxy.h" +#include "build/build_config.h" #include "ppapi/c/ppp_input_event.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" diff --git a/ppapi/proxy/ppp_input_event_proxy.h b/ppapi/proxy/ppp_input_event_proxy.h index 9fbc418..01479da 100644 --- a/ppapi/proxy/ppp_input_event_proxy.h +++ b/ppapi/proxy/ppp_input_event_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_INPUT_EVENT_PROXY_H_ #define PPAPI_PROXY_PPP_INPUT_EVENT_PROXY_H_ +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp_input_event.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_instance_private_proxy.h b/ppapi/proxy/ppp_instance_private_proxy.h index 4fc3a3a0..f430203 100644 --- a/ppapi/proxy/ppp_instance_private_proxy.h +++ b/ppapi/proxy/ppp_instance_private_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_INSTANCE_PRIVATE_PROXY_H_ #define PPAPI_PROXY_PPP_INSTANCE_PRIVATE_PROXY_H_ +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" diff --git a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc index 8b758d9..cbf9f9c 100644 --- a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc +++ b/ppapi/proxy/ppp_instance_private_proxy_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/message_loop/message_loop.h" #include "base/test/test_timeouts.h" @@ -178,7 +180,7 @@ TEST_F(PPP_Instance_Private_ProxyTest, PPPInstancePrivate) { EXPECT_EQ(1, plugin().var_tracker().GetRefCountForObject(instance_obj)); // Check the host-side var exists with the expected id and has 1 refcount (the // refcount on behalf of the plugin). - int32 expected_host_id = + int32_t expected_host_id = plugin().var_tracker().GetHostObject(instance_obj).value.as_id; Var* host_var = host().var_tracker().GetVar(expected_host_id); ASSERT_TRUE(host_var); diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc index a7a0699..37a848b 100644 --- a/ppapi/proxy/ppp_instance_proxy.cc +++ b/ppapi/proxy/ppp_instance_proxy.cc @@ -4,9 +4,13 @@ #include "ppapi/proxy/ppp_instance_proxy.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/bind.h" +#include "build/build_config.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_core.h" #include "ppapi/c/ppb_fullscreen.h" diff --git a/ppapi/proxy/ppp_instance_proxy_unittest.cc b/ppapi/proxy/ppp_instance_proxy_unittest.cc index 18ec919..755d83b 100644 --- a/ppapi/proxy/ppp_instance_proxy_unittest.cc +++ b/ppapi/proxy/ppp_instance_proxy_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/synchronization/waitable_event.h" #include "ipc/ipc_message_utils.h" #include "ppapi/c/pp_var.h" diff --git a/ppapi/proxy/ppp_messaging_proxy.h b/ppapi/proxy/ppp_messaging_proxy.h index f232c6b..753c771 100644 --- a/ppapi/proxy/ppp_messaging_proxy.h +++ b/ppapi/proxy/ppp_messaging_proxy.h @@ -6,6 +6,7 @@ #define PPAPI_PROXY_PPP_MESSAGING_PROXY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp_messaging.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.cc b/ppapi/proxy/ppp_mouse_lock_proxy.cc index 66dc130..30aadce 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.cc +++ b/ppapi/proxy/ppp_mouse_lock_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppp_mouse_lock_proxy.h" +#include "build/build_config.h" #include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.h b/ppapi/proxy/ppp_mouse_lock_proxy.h index f04d7f3..dfb4513 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.h +++ b/ppapi/proxy/ppp_mouse_lock_proxy.h @@ -6,6 +6,7 @@ #define PPAPI_PROXY_PPP_MOUSE_LOCK_PROXY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_pdf_proxy.cc b/ppapi/proxy/ppp_pdf_proxy.cc index 4b16dd6..cafde23 100644 --- a/ppapi/proxy/ppp_pdf_proxy.cc +++ b/ppapi/proxy/ppp_pdf_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppp_pdf_proxy.h" +#include "build/build_config.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/ppapi/proxy/ppp_pdf_proxy.h b/ppapi/proxy/ppp_pdf_proxy.h index 2544c0f..5cc2790 100644 --- a/ppapi/proxy/ppp_pdf_proxy.h +++ b/ppapi/proxy/ppp_pdf_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_PDF_PROXY_H_ #define PPAPI_PROXY_PPP_PDF_PROXY_H_ +#include "base/macros.h" #include "ppapi/c/private/ppp_pdf.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_printing_proxy.cc b/ppapi/proxy/ppp_printing_proxy.cc index 81710ef..512f0ed 100644 --- a/ppapi/proxy/ppp_printing_proxy.cc +++ b/ppapi/proxy/ppp_printing_proxy.cc @@ -7,6 +7,7 @@ #include <string.h> #include "base/numerics/safe_conversions.h" +#include "build/build_config.h" #include "ppapi/c/dev/ppp_printing_dev.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" diff --git a/ppapi/proxy/ppp_printing_proxy.h b/ppapi/proxy/ppp_printing_proxy.h index 03bebf7..7c4025d 100644 --- a/ppapi/proxy/ppp_printing_proxy.h +++ b/ppapi/proxy/ppp_printing_proxy.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_PPP_PRINTING_PROXY_H_ #define PPAPI_PROXY_PPP_PRINTING_PROXY_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "ppapi/c/dev/ppp_printing_dev.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_text_input_proxy.cc b/ppapi/proxy/ppp_text_input_proxy.cc index 061b73c..235e0e0 100644 --- a/ppapi/proxy/ppp_text_input_proxy.cc +++ b/ppapi/proxy/ppp_text_input_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/ppp_text_input_proxy.h" +#include "build/build_config.h" #include "ppapi/c/dev/ppp_text_input_dev.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/ppp_text_input_proxy.h b/ppapi/proxy/ppp_text_input_proxy.h index 0ae023c..5771256 100644 --- a/ppapi/proxy/ppp_text_input_proxy.h +++ b/ppapi/proxy/ppp_text_input_proxy.h @@ -5,7 +5,10 @@ #ifndef PPAPI_PROXY_PPP_TEXT_INPUT_PROXY_H_ #define PPAPI_PROXY_PPP_TEXT_INPUT_PROXY_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/dev/ppp_text_input_dev.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_video_decoder_proxy.h b/ppapi/proxy/ppp_video_decoder_proxy.h index 54beac1..c4b23ef 100644 --- a/ppapi/proxy/ppp_video_decoder_proxy.h +++ b/ppapi/proxy/ppp_video_decoder_proxy.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_PPP_VIDEO_DECODER_PROXY_H_ #define PPAPI_PROXY_PPP_VIDEO_DECODER_PROXY_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/c/dev/ppp_video_decoder_dev.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/printing_resource.h b/ppapi/proxy/printing_resource.h index deaa1f5..0ef5c77 100644 --- a/ppapi/proxy/printing_resource.h +++ b/ppapi/proxy/printing_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_PRINTING_RESOURCE_H_ #define PPAPI_PROXY_PRINTING_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/printing_resource_unittest.cc b/ppapi/proxy/printing_resource_unittest.cc index 6551ba1..09589c3 100644 --- a/ppapi/proxy/printing_resource_unittest.cc +++ b/ppapi/proxy/printing_resource_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 <cstring> #include "base/message_loop/message_loop.h" diff --git a/ppapi/proxy/proxy_array_output.h b/ppapi/proxy/proxy_array_output.h index 6d15e0b..455b026 100644 --- a/ppapi/proxy/proxy_array_output.h +++ b/ppapi/proxy/proxy_array_output.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PROXY_PROXY_ARRAY_OUTPUT_H_ #define PPAPI_PROXY_PROXY_ARRAY_OUTPUT_H_ +#include <stdint.h> + #include <vector> #include "base/logging.h" diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc index 2784e4b..23b0449 100644 --- a/ppapi/proxy/proxy_channel.cc +++ b/ppapi/proxy/proxy_channel.cc @@ -5,6 +5,7 @@ #include "ppapi/proxy/proxy_channel.h" #include "base/logging.h" +#include "build/build_config.h" #include "ipc/ipc_platform_file.h" #include "ipc/ipc_test_sink.h" diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h index fbd31ad..0e657f73 100644 --- a/ppapi/proxy/proxy_channel.h +++ b/ppapi/proxy/proxy_channel.h @@ -6,9 +6,11 @@ #define PPAPI_PROXY_PROXY_CHANNEL_H_ #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/process/process.h" +#include "build/build_config.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" #include "ipc/ipc_sender.h" diff --git a/ppapi/proxy/proxy_completion_callback_factory.h b/ppapi/proxy/proxy_completion_callback_factory.h index c8dabf1..71322b0 100644 --- a/ppapi/proxy/proxy_completion_callback_factory.h +++ b/ppapi/proxy/proxy_completion_callback_factory.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PROXY_PROXY_COMPLETION_CALLBACK_FACTORY_H_ #define PPAPI_PROXY_PROXY_COMPLETION_CALLBACK_FACTORY_H_ +#include <stdint.h> + #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/proxy/proxy_module.h b/ppapi/proxy/proxy_module.h index 5d3a125..21f53b1 100644 --- a/ppapi/proxy/proxy_module.h +++ b/ppapi/proxy/proxy_module.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" namespace base { diff --git a/ppapi/proxy/proxy_object_var.cc b/ppapi/proxy/proxy_object_var.cc index cc0054f..507d206 100644 --- a/ppapi/proxy/proxy_object_var.cc +++ b/ppapi/proxy/proxy_object_var.cc @@ -12,10 +12,8 @@ using ppapi::proxy::PluginDispatcher; namespace ppapi { ProxyObjectVar::ProxyObjectVar(PluginDispatcher* dispatcher, - int32 host_var_id) - : dispatcher_(dispatcher), - host_var_id_(host_var_id), - user_data_(NULL) { + int32_t host_var_id) + : dispatcher_(dispatcher), host_var_id_(host_var_id), user_data_(NULL) { // Should be given valid objects or we'll crash later. DCHECK(host_var_id_); } @@ -31,7 +29,7 @@ PP_VarType ProxyObjectVar::GetType() const { return PP_VARTYPE_OBJECT; } -void ProxyObjectVar::AssignVarID(int32 id) { +void ProxyObjectVar::AssignVarID(int32_t id) { return Var::AssignVarID(id); } diff --git a/ppapi/proxy/proxy_object_var.h b/ppapi/proxy/proxy_object_var.h index a3ba153..0690129 100644 --- a/ppapi/proxy/proxy_object_var.h +++ b/ppapi/proxy/proxy_object_var.h @@ -5,7 +5,10 @@ #ifndef PPAPI_PROXY_PROXY_OBJECT_VAR_H_ #define PPAPI_PROXY_PROXY_OBJECT_VAR_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/var.h" @@ -20,8 +23,7 @@ class PluginDispatcher; // integrating this with PP_Var creation. class PPAPI_PROXY_EXPORT ProxyObjectVar : public Var { public: - ProxyObjectVar(proxy::PluginDispatcher* dispatcher, - int32 host_var_id); + ProxyObjectVar(proxy::PluginDispatcher* dispatcher, int32_t host_var_id); ~ProxyObjectVar() override; @@ -30,20 +32,20 @@ class PPAPI_PROXY_EXPORT ProxyObjectVar : public Var { PP_VarType GetType() const override; proxy::PluginDispatcher* dispatcher() const { return dispatcher_; } - int32 host_var_id() const { return host_var_id_; } + int32_t host_var_id() const { return host_var_id_; } void* user_data() const { return user_data_; } void set_user_data(void* ud) { user_data_ = ud; } // Expose AssignVarID on Var so the PluginResourceTracker can call us when // it's creating IDs. - void AssignVarID(int32 id); + void AssignVarID(int32_t id); void clear_dispatcher() { dispatcher_ = NULL; } private: proxy::PluginDispatcher* dispatcher_; - int32 host_var_id_; + int32_t host_var_id_; // When this object is created as representing a var implemented by the // plugin, this stores the user data so that we can look it up later. See diff --git a/ppapi/proxy/raw_var_data.cc b/ppapi/proxy/raw_var_data.cc index 7e80810..6e4e057 100644 --- a/ppapi/proxy/raw_var_data.cc +++ b/ppapi/proxy/raw_var_data.cc @@ -28,8 +28,8 @@ namespace { // When sending array buffers, if the size is over 256K, we use shared // memory instead of sending the data over IPC. Light testing suggests // shared memory is much faster for 256K and larger messages. -static const uint32 kMinimumArrayBufferSizeForShmem = 256 * 1024; -static uint32 g_minimum_array_buffer_size_for_shmem = +static const uint32_t kMinimumArrayBufferSizeForShmem = 256 * 1024; +static uint32_t g_minimum_array_buffer_size_for_shmem = kMinimumArrayBufferSizeForShmem; struct StackEntry { @@ -214,7 +214,7 @@ std::vector<SerializedHandle*> RawVarDataGraph::GetHandles() { // static void RawVarDataGraph::SetMinimumArrayBufferSizeForShmemForTest( - uint32 threshold) { + uint32_t threshold) { if (threshold == 0) g_minimum_array_buffer_size_for_shmem = kMinimumArrayBufferSizeForShmem; else @@ -444,7 +444,7 @@ PP_Var ArrayBufferRawVarData::CreatePPVar(PP_Instance instance) { switch (type_) { case ARRAY_BUFFER_SHMEM_HOST: { base::SharedMemoryHandle host_handle; - uint32 size_in_bytes; + uint32_t size_in_bytes; bool ok = PpapiGlobals::Get()->GetVarTracker()-> StopTrackingSharedMemoryHandle(host_shm_handle_id_, instance, @@ -467,7 +467,7 @@ PP_Var ArrayBufferRawVarData::CreatePPVar(PP_Instance instance) { } case ARRAY_BUFFER_NO_SHMEM: { result = PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( - static_cast<uint32>(data_.size()), data_.data()); + static_cast<uint32_t>(data_.size()), data_.data()); break; } default: diff --git a/ppapi/proxy/raw_var_data.h b/ppapi/proxy/raw_var_data.h index 9db3100..4789ccd 100644 --- a/ppapi/proxy/raw_var_data.h +++ b/ppapi/proxy/raw_var_data.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_RAW_VAR_DATA_H_ #define PPAPI_PROXY_RAW_VAR_DATA_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/callback.h" @@ -81,7 +84,7 @@ class PPAPI_PROXY_EXPORT RawVarDataGraph { // array buffers in IPC messages to using shared memory. This is only used // for testing purposes where we need to transmit small buffers using shmem // (in order to have fast tests). - static void SetMinimumArrayBufferSizeForShmemForTest(uint32 threshold); + static void SetMinimumArrayBufferSizeForShmemForTest(uint32_t threshold); // A list of the nodes in the graph. ScopedVector<RawVarData> data_; diff --git a/ppapi/proxy/raw_var_data_unittest.cc b/ppapi/proxy/raw_var_data_unittest.cc index 8f783c2..1e68712 100644 --- a/ppapi/proxy/raw_var_data_unittest.cc +++ b/ppapi/proxy/raw_var_data_unittest.cc @@ -4,6 +4,9 @@ #include "ppapi/proxy/raw_var_data.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc index 5efd92b..fa08843 100644 --- a/ppapi/proxy/resource_creation_proxy.cc +++ b/ppapi/proxy/resource_creation_proxy.cc @@ -4,6 +4,7 @@ #include "ppapi/proxy/resource_creation_proxy.h" +#include "build/build_config.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_size.h" #include "ppapi/proxy/audio_encoder_resource.h" diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h index f1b645c..aad6bf3 100644 --- a/ppapi/proxy/resource_creation_proxy.h +++ b/ppapi/proxy/resource_creation_proxy.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_ #define PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ipc/ipc_channel.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" diff --git a/ppapi/proxy/resource_message_params.h b/ppapi/proxy/resource_message_params.h index 500ebb9..9e76d1e 100644 --- a/ppapi/proxy/resource_message_params.h +++ b/ppapi/proxy/resource_message_params.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_RESOURCE_MESSAGE_PARAMS_H_ #define PPAPI_PROXY_RESOURCE_MESSAGE_PARAMS_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/memory/ref_counted.h" diff --git a/ppapi/proxy/resource_message_test_sink.cc b/ppapi/proxy/resource_message_test_sink.cc index b3f3724..4047d59 100644 --- a/ppapi/proxy/resource_message_test_sink.cc +++ b/ppapi/proxy/resource_message_test_sink.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/resource_message_test_sink.h" +#include <stddef.h> + #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/resource_message_params.h" #include "ppapi/proxy/serialized_handle.h" @@ -14,10 +16,10 @@ namespace proxy { namespace { // Backend for GetAllResource[Calls|Replies]Matching. -template<class WrapperMessage, class Params> -std::vector<std::pair<Params, IPC::Message> > -GetAllResourceMessagesMatching(const ResourceMessageTestSink& sink, - uint32 id) { +template <class WrapperMessage, class Params> +std::vector<std::pair<Params, IPC::Message>> GetAllResourceMessagesMatching( + const ResourceMessageTestSink& sink, + uint32_t id) { std::vector<std::pair<Params, IPC::Message> > result; for (size_t i = 0; i < sink.message_count(); i++) { const IPC::Message* msg = sink.GetMessageAt(i); @@ -67,7 +69,7 @@ void ResourceMessageTestSink::SetSyncReplyMessage(IPC::Message* reply_msg) { } bool ResourceMessageTestSink::GetFirstResourceCallMatching( - uint32 id, + uint32_t id, ResourceMessageCallParams* params, IPC::Message* nested_msg) const { ResourceCallVector matching_messages = @@ -82,7 +84,7 @@ bool ResourceMessageTestSink::GetFirstResourceCallMatching( } bool ResourceMessageTestSink::GetFirstResourceReplyMatching( - uint32 id, + uint32_t id, ResourceMessageReplyParams* params, IPC::Message* nested_msg) { ResourceReplyVector matching_messages = @@ -97,28 +99,27 @@ bool ResourceMessageTestSink::GetFirstResourceReplyMatching( } ResourceMessageTestSink::ResourceCallVector -ResourceMessageTestSink::GetAllResourceCallsMatching(uint32 id) { +ResourceMessageTestSink::GetAllResourceCallsMatching(uint32_t id) { return GetAllResourceMessagesMatching<PpapiHostMsg_ResourceCall, ResourceMessageCallParams>(*this, id); } ResourceMessageTestSink::ResourceReplyVector -ResourceMessageTestSink::GetAllResourceRepliesMatching(uint32 id) { +ResourceMessageTestSink::GetAllResourceRepliesMatching(uint32_t id) { return GetAllResourceMessagesMatching<PpapiPluginMsg_ResourceReply, ResourceMessageReplyParams>(*this, id); } ResourceSyncCallHandler::ResourceSyncCallHandler( ResourceMessageTestSink* test_sink, - uint32 incoming_type, + uint32_t incoming_type, int32_t result, const IPC::Message& reply_msg) : test_sink_(test_sink), incoming_type_(incoming_type), result_(result), serialized_handle_(NULL), - reply_msg_(reply_msg) { -} + reply_msg_(reply_msg) {} ResourceSyncCallHandler::~ResourceSyncCallHandler() { } diff --git a/ppapi/proxy/resource_message_test_sink.h b/ppapi/proxy/resource_message_test_sink.h index 3e40e31..b6ada44 100644 --- a/ppapi/proxy/resource_message_test_sink.h +++ b/ppapi/proxy/resource_message_test_sink.h @@ -34,27 +34,25 @@ class ResourceMessageTestSink : public IPC::TestSink { // Searches the queue for the first resource call message with a nested // message matching the given ID. On success, returns true and populates the // given params and nested message. - bool GetFirstResourceCallMatching( - uint32 id, - ResourceMessageCallParams* params, - IPC::Message* nested_msg) const; + bool GetFirstResourceCallMatching(uint32_t id, + ResourceMessageCallParams* params, + IPC::Message* nested_msg) const; // Like GetFirstResourceCallMatching except for replies. - bool GetFirstResourceReplyMatching( - uint32 id, - ResourceMessageReplyParams* params, - IPC::Message* nested_msg); + bool GetFirstResourceReplyMatching(uint32_t id, + ResourceMessageReplyParams* params, + IPC::Message* nested_msg); // Searches the queue for all resource call messages with a nested message // matching the given ID. typedef std::pair<ResourceMessageCallParams, IPC::Message> ResourceCall; typedef std::vector<ResourceCall> ResourceCallVector; - ResourceCallVector GetAllResourceCallsMatching(uint32 id); + ResourceCallVector GetAllResourceCallsMatching(uint32_t id); // Like GetAllResourceCallsMatching except for replies. typedef std::pair<ResourceMessageReplyParams, IPC::Message> ResourceReply; typedef std::vector<ResourceReply> ResourceReplyVector; - ResourceReplyVector GetAllResourceRepliesMatching(uint32 id); + ResourceReplyVector GetAllResourceRepliesMatching(uint32_t id); private: scoped_ptr<IPC::Message> sync_reply_msg_; @@ -79,7 +77,7 @@ class ResourceMessageTestSink : public IPC::TestSink { class ResourceSyncCallHandler : public IPC::Listener { public: ResourceSyncCallHandler(ResourceMessageTestSink* test_sink, - uint32 incoming_type, + uint32_t incoming_type, int32_t result, const IPC::Message& reply_msg); ~ResourceSyncCallHandler() override; @@ -97,7 +95,7 @@ class ResourceSyncCallHandler : public IPC::Listener { private: ResourceMessageTestSink* test_sink_; - uint32 incoming_type_; + uint32_t incoming_type_; int32_t result_; const SerializedHandle* serialized_handle_; // Non-owning pointer. IPC::Message reply_msg_; diff --git a/ppapi/proxy/resource_reply_thread_registrar.h b/ppapi/proxy/resource_reply_thread_registrar.h index 193c205..256890c 100644 --- a/ppapi/proxy/resource_reply_thread_registrar.h +++ b/ppapi/proxy/resource_reply_thread_registrar.h @@ -5,10 +5,12 @@ #ifndef PPAPI_PROXY_RESOURCE_REPLY_THREAD_REGISTRAR_H_ #define PPAPI_PROXY_RESOURCE_REPLY_THREAD_REGISTRAR_H_ +#include <stdint.h> + #include <map> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/proxy/serialized_flash_menu.cc b/ppapi/proxy/serialized_flash_menu.cc index 7c55b39d..4791b06 100644 --- a/ppapi/proxy/serialized_flash_menu.cc +++ b/ppapi/proxy/serialized_flash_menu.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/serialized_flash_menu.h" +#include <stdint.h> + #include "ipc/ipc_message.h" #include "ppapi/c/private/ppb_flash_menu.h" #include "ppapi/proxy/ppapi_param_traits.h" diff --git a/ppapi/proxy/serialized_flash_menu.h b/ppapi/proxy/serialized_flash_menu.h index 8c1d709..607c603 100644 --- a/ppapi/proxy/serialized_flash_menu.h +++ b/ppapi/proxy/serialized_flash_menu.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" namespace base { diff --git a/ppapi/proxy/serialized_handle.cc b/ppapi/proxy/serialized_handle.cc index ee0f359..f5eda87 100644 --- a/ppapi/proxy/serialized_handle.cc +++ b/ppapi/proxy/serialized_handle.cc @@ -36,14 +36,13 @@ SerializedHandle::SerializedHandle(Type type_param) } SerializedHandle::SerializedHandle(const base::SharedMemoryHandle& handle, - uint32 size) + uint32_t size) : type_(SHARED_MEMORY), shm_handle_(handle), size_(size), descriptor_(IPC::InvalidPlatformFileForTransit()), open_flags_(0), - file_io_(0) { -} + file_io_(0) {} SerializedHandle::SerializedHandle( Type type, @@ -113,7 +112,7 @@ bool SerializedHandle::ReadHeader(base::PickleIterator* iter, Header* hdr) { bool valid_type = false; switch (type) { case SHARED_MEMORY: { - uint32 size = 0; + uint32_t size = 0; if (!iter->ReadUInt32(&size)) return false; hdr->size = size; diff --git a/ppapi/proxy/serialized_handle.h b/ppapi/proxy/serialized_handle.h index 6e765fd..d7e74cc 100644 --- a/ppapi/proxy/serialized_handle.h +++ b/ppapi/proxy/serialized_handle.h @@ -5,11 +5,12 @@ #ifndef PPAPI_PROXY_SERIALIZED_HANDLES_H_ #define PPAPI_PROXY_SERIALIZED_HANDLES_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/atomicops.h" -#include "base/basictypes.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/shared_memory.h" @@ -37,18 +38,17 @@ class PPAPI_PROXY_EXPORT SerializedHandle { struct Header { Header() : type(INVALID), size(0), open_flags(0) {} Header(Type type_arg, - uint32 size_arg, - int32 open_flags_arg, + uint32_t size_arg, + int32_t open_flags_arg, PP_Resource file_io_arg) : type(type_arg), size(size_arg), open_flags(open_flags_arg), - file_io(file_io_arg) { - } + file_io(file_io_arg) {} Type type; - uint32 size; - int32 open_flags; + uint32_t size; + int32_t open_flags; PP_Resource file_io; }; @@ -57,7 +57,7 @@ class PPAPI_PROXY_EXPORT SerializedHandle { explicit SerializedHandle(Type type); // Create a shared memory handle. - SerializedHandle(const base::SharedMemoryHandle& handle, uint32 size); + SerializedHandle(const base::SharedMemoryHandle& handle, uint32_t size); // Create a socket or file handle. SerializedHandle(const Type type, @@ -71,7 +71,7 @@ class PPAPI_PROXY_EXPORT SerializedHandle { DCHECK(is_shmem()); return shm_handle_; } - uint32 size() const { + uint32_t size() const { DCHECK(is_shmem()); return size_; } @@ -79,13 +79,11 @@ class PPAPI_PROXY_EXPORT SerializedHandle { DCHECK(is_socket() || is_file()); return descriptor_; } - int32 open_flags() const { - return open_flags_; - } + int32_t open_flags() const { return open_flags_; } PP_Resource file_io() const { return file_io_; } - void set_shmem(const base::SharedMemoryHandle& handle, uint32 size) { + void set_shmem(const base::SharedMemoryHandle& handle, uint32_t size) { type_ = SHARED_MEMORY; shm_handle_ = handle; size_ = size; @@ -100,7 +98,7 @@ class PPAPI_PROXY_EXPORT SerializedHandle { size_ = 0; } void set_file_handle(const IPC::PlatformFileForTransit& descriptor, - int32 open_flags, + int32_t open_flags, PP_Resource file_io) { type_ = FILE; @@ -144,13 +142,13 @@ class PPAPI_PROXY_EXPORT SerializedHandle { // efficient strategy. // These are valid if type == SHARED_MEMORY. base::SharedMemoryHandle shm_handle_; - uint32 size_; + uint32_t size_; // This is valid if type == SOCKET || type == FILE. IPC::PlatformFileForTransit descriptor_; // The following fields are valid if type == FILE. - int32 open_flags_; + int32_t open_flags_; // This is non-zero if file writes require quota checking. PP_Resource file_io_; }; diff --git a/ppapi/proxy/serialized_structs.h b/ppapi/proxy/serialized_structs.h index 79c851d..3820056 100644 --- a/ppapi/proxy/serialized_structs.h +++ b/ppapi/proxy/serialized_structs.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PROXY_SERIALIZED_STRUCTS_H_ #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/proxy/serialized_var.h b/ppapi/proxy/serialized_var.h index 46f8ed5..3f8ec99 100644 --- a/ppapi/proxy/serialized_var.h +++ b/ppapi/proxy/serialized_var.h @@ -5,10 +5,13 @@ #ifndef PPAPI_PROXY_SERIALIZED_VAR_H_ #define PPAPI_PROXY_SERIALIZED_VAR_H_ +#include <stddef.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 "ppapi/c/pp_instance.h" diff --git a/ppapi/proxy/serialized_var_unittest.cc b/ppapi/proxy/serialized_var_unittest.cc index d88c848..3a5513d 100644 --- a/ppapi/proxy/serialized_var_unittest.cc +++ b/ppapi/proxy/serialized_var_unittest.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/proxy/ppapi_proxy_test.h" +#include <stdint.h> +#include "ppapi/proxy/ppapi_proxy_test.h" #include "ppapi/proxy/proxy_object_var.h" #include "ppapi/proxy/serialized_var.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/ppapi/proxy/tcp_server_socket_private_resource.h b/ppapi/proxy/tcp_server_socket_private_resource.h index 055b3b0..ea131e3 100644 --- a/ppapi/proxy/tcp_server_socket_private_resource.h +++ b/ppapi/proxy/tcp_server_socket_private_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_TCP_SERVER_SOCKET_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_TCP_SERVER_SOCKET_PRIVATE_RESOURCE_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/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/tcp_socket_private_resource.h b/ppapi/proxy/tcp_socket_private_resource.h index bbc5b1c..0a36d1b7 100644 --- a/ppapi/proxy/tcp_socket_private_resource.h +++ b/ppapi/proxy/tcp_socket_private_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_TCP_SOCKET_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_TCP_SOCKET_PRIVATE_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/tcp_socket_resource_base.h" #include "ppapi/thunk/ppb_tcp_socket_private_api.h" diff --git a/ppapi/proxy/tcp_socket_resource.h b/ppapi/proxy/tcp_socket_resource.h index 449cab6..57da040 100644 --- a/ppapi/proxy/tcp_socket_resource.h +++ b/ppapi/proxy/tcp_socket_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_TCP_SOCKET_RESOURCE_H_ #define PPAPI_PROXY_TCP_SOCKET_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/tcp_socket_resource_base.h" #include "ppapi/thunk/ppb_tcp_socket_api.h" diff --git a/ppapi/proxy/tcp_socket_resource_base.cc b/ppapi/proxy/tcp_socket_resource_base.cc index fb4db5b..3cc4fdd 100644 --- a/ppapi/proxy/tcp_socket_resource_base.cc +++ b/ppapi/proxy/tcp_socket_resource_base.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/error_conversion.h" diff --git a/ppapi/proxy/tcp_socket_resource_base.h b/ppapi/proxy/tcp_socket_resource_base.h index 3274fb9..c60ff33 100644 --- a/ppapi/proxy/tcp_socket_resource_base.h +++ b/ppapi/proxy/tcp_socket_resource_base.h @@ -5,11 +5,13 @@ #ifndef PPAPI_PROXY_TCP_SOCKET_RESOURCE_BASE_H_ #define PPAPI_PROXY_TCP_SOCKET_RESOURCE_BASE_H_ +#include <stdint.h> + #include <queue> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_tcp_socket.h" #include "ppapi/c/private/ppb_net_address_private.h" diff --git a/ppapi/proxy/tracked_callback_unittest.cc b/ppapi/proxy/tracked_callback_unittest.cc index 0a9278a..8b68b8e 100644 --- a/ppapi/proxy/tracked_callback_unittest.cc +++ b/ppapi/proxy/tracked_callback_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/memory/ref_counted.h" diff --git a/ppapi/proxy/truetype_font_resource.h b/ppapi/proxy/truetype_font_resource.h index 2f44365..99cbf2f 100644 --- a/ppapi/proxy/truetype_font_resource.h +++ b/ppapi/proxy/truetype_font_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_TRUETYPE_FONT_RESOURCE_H_ #define PPAPI_PROXY_TRUETYPE_FONT_RESOURCE_H_ +#include <stdint.h> + #include <queue> #include <string> +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/truetype_font_singleton_resource.cc b/ppapi/proxy/truetype_font_singleton_resource.cc index 77a7432..277aba1 100644 --- a/ppapi/proxy/truetype_font_singleton_resource.cc +++ b/ppapi/proxy/truetype_font_singleton_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/truetype_font_singleton_resource.h" +#include <stddef.h> + #include "base/bind.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" diff --git a/ppapi/proxy/truetype_font_singleton_resource.h b/ppapi/proxy/truetype_font_singleton_resource.h index df09471..3c498b0 100644 --- a/ppapi/proxy/truetype_font_singleton_resource.h +++ b/ppapi/proxy/truetype_font_singleton_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_TRUETYPE_FONT_SINGLETON_RESOURCE_H_ #define PPAPI_PROXY_TRUETYPE_FONT_SINGLETON_RESOURCE_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/thunk/ppb_truetype_font_singleton_api.h" diff --git a/ppapi/proxy/udp_socket_filter.h b/ppapi/proxy/udp_socket_filter.h index faa62e0..4aa3e5c 100644 --- a/ppapi/proxy/udp_socket_filter.h +++ b/ppapi/proxy/udp_socket_filter.h @@ -5,10 +5,12 @@ #ifndef PPAPI_PROXY_UDP_SOCKET_FILTER_H_ #define PPAPI_PROXY_UDP_SOCKET_FILTER_H_ +#include <stddef.h> +#include <stdint.h> + #include <queue> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/scoped_ptr_hash_map.h" #include "base/memory/ref_counted.h" diff --git a/ppapi/proxy/udp_socket_private_resource.h b/ppapi/proxy/udp_socket_private_resource.h index f335c6c..d57ef04 100644 --- a/ppapi/proxy/udp_socket_private_resource.h +++ b/ppapi/proxy/udp_socket_private_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_UDP_SOCKET_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_UDP_SOCKET_PRIVATE_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/proxy/udp_socket_resource_base.h" #include "ppapi/thunk/ppb_udp_socket_private_api.h" diff --git a/ppapi/proxy/udp_socket_resource.h b/ppapi/proxy/udp_socket_resource.h index 5217d96..e7ba86d 100644 --- a/ppapi/proxy/udp_socket_resource.h +++ b/ppapi/proxy/udp_socket_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_UDP_SOCKET_RESOURCE_H_ #define PPAPI_PROXY_UDP_SOCKET_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/proxy/udp_socket_resource_base.h" #include "ppapi/thunk/ppb_udp_socket_api.h" diff --git a/ppapi/proxy/udp_socket_resource_base.h b/ppapi/proxy/udp_socket_resource_base.h index e5a8aef..3059942 100644 --- a/ppapi/proxy/udp_socket_resource_base.h +++ b/ppapi/proxy/udp_socket_resource_base.h @@ -5,10 +5,13 @@ #ifndef PPAPI_PROXY_UDP_SOCKET_RESOURCE_BASE_H_ #define PPAPI_PROXY_UDP_SOCKET_RESOURCE_BASE_H_ +#include <stddef.h> +#include <stdint.h> + #include <queue> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_udp_socket.h" #include "ppapi/c/private/ppb_net_address_private.h" diff --git a/ppapi/proxy/uma_private_resource.h b/ppapi/proxy/uma_private_resource.h index 3215e64..67eb67b 100644 --- a/ppapi/proxy/uma_private_resource.h +++ b/ppapi/proxy/uma_private_resource.h @@ -5,6 +5,9 @@ #ifndef PPAPI_PROXY_UMA_PRIVATE_RESOURCE_H_ #define PPAPI_PROXY_UMA_PRIVATE_RESOURCE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/url_loader_resource.h b/ppapi/proxy/url_loader_resource.h index f96c1ab..d349bee 100644 --- a/ppapi/proxy/url_loader_resource.h +++ b/ppapi/proxy/url_loader_resource.h @@ -5,10 +5,13 @@ #ifndef PPAPI_PROXY_URL_LOADER_RESOURCE_H_ #define PPAPI_PROXY_URL_LOADER_RESOURCE_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" diff --git a/ppapi/proxy/url_request_info_resource.h b/ppapi/proxy/url_request_info_resource.h index 318668f..1ec7d13 100644 --- a/ppapi/proxy/url_request_info_resource.h +++ b/ppapi/proxy/url_request_info_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_URL_REQUEST_INFO_RESOURCE_H_ #define PPAPI_PROXY_URL_REQUEST_INFO_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/url_request_info_data.h" diff --git a/ppapi/proxy/url_response_info_resource.cc b/ppapi/proxy/url_response_info_resource.cc index 315b4a1..74370da 100644 --- a/ppapi/proxy/url_response_info_resource.cc +++ b/ppapi/proxy/url_response_info_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/url_response_info_resource.h" +#include <stdint.h> + #include "ppapi/proxy/file_ref_resource.h" #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/proxy/url_response_info_resource.h b/ppapi/proxy/url_response_info_resource.h index e20417f..506b4d36 100644 --- a/ppapi/proxy/url_response_info_resource.h +++ b/ppapi/proxy/url_response_info_resource.h @@ -5,8 +5,8 @@ #ifndef PPAPI_PROXY_URL_RESPONSE_INFO_RESOURCE_H_ #define PPAPI_PROXY_URL_RESPONSE_INFO_RESOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/scoped_pp_resource.h" diff --git a/ppapi/proxy/video_capture_resource.cc b/ppapi/proxy/video_capture_resource.cc index ca69d38..5189509 100644 --- a/ppapi/proxy/video_capture_resource.cc +++ b/ppapi/proxy/video_capture_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/video_capture_resource.h" +#include <stddef.h> + #include "ppapi/c/dev/ppp_video_capture_dev.h" #include "ppapi/proxy/dispatch_reply_message.h" #include "ppapi/proxy/plugin_dispatcher.h" diff --git a/ppapi/proxy/video_capture_resource.h b/ppapi/proxy/video_capture_resource.h index add9713..9b1a8a1 100644 --- a/ppapi/proxy/video_capture_resource.h +++ b/ppapi/proxy/video_capture_resource.h @@ -5,7 +5,10 @@ #ifndef PPAPI_PROXY_VIDEO_CAPTURE_RESOURCE_H_ #define PPAPI_PROXY_VIDEO_CAPTURE_RESOURCE_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/dev/ppp_video_capture_dev.h" #include "ppapi/proxy/device_enumeration_resource_helper.h" #include "ppapi/proxy/plugin_resource.h" diff --git a/ppapi/proxy/video_decoder_resource.h b/ppapi/proxy/video_decoder_resource.h index bb630c4..8f66e4a 100644 --- a/ppapi/proxy/video_decoder_resource.h +++ b/ppapi/proxy/video_decoder_resource.h @@ -5,9 +5,12 @@ #ifndef PPAPI_PROXY_VIDEO_DECODER_RESOURCE_H_ #define PPAPI_PROXY_VIDEO_DECODER_RESOURCE_H_ +#include <stdint.h> + #include <queue> #include "base/containers/hash_tables.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/ppapi/proxy/video_decoder_resource_unittest.cc b/ppapi/proxy/video_decoder_resource_unittest.cc index 5a128d1..a8e3c4f 100644 --- a/ppapi/proxy/video_decoder_resource_unittest.cc +++ b/ppapi/proxy/video_decoder_resource_unittest.cc @@ -3,9 +3,12 @@ // found in the LICENSE file. #include <GLES2/gl2.h> +#include <stddef.h> +#include <stdint.h> #include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_video_decoder.h" #include "ppapi/proxy/locking_resource_releaser.h" diff --git a/ppapi/proxy/video_destination_resource.h b/ppapi/proxy/video_destination_resource.h index 2e545a3..a74450e 100644 --- a/ppapi/proxy/video_destination_resource.h +++ b/ppapi/proxy/video_destination_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_VIDEO_DESTINATION_RESOURCE_H_ #define PPAPI_PROXY_VIDEO_DESTINATION_RESOURCE_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" diff --git a/ppapi/proxy/video_encoder_resource.h b/ppapi/proxy/video_encoder_resource.h index 41f33c7..f040a38 100644 --- a/ppapi/proxy/video_encoder_resource.h +++ b/ppapi/proxy/video_encoder_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_VIDEO_ENCODER_RESOURCE_H_ #define PPAPI_PROXY_VIDEO_ENCODER_RESOURCE_H_ +#include <stdint.h> + #include <deque> +#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/ppapi/proxy/video_encoder_resource_unittest.cc b/ppapi/proxy/video_encoder_resource_unittest.cc index 466a1ef..2b122e9 100644 --- a/ppapi/proxy/video_encoder_resource_unittest.cc +++ b/ppapi/proxy/video_encoder_resource_unittest.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/video_encoder_resource.h" +#include <stdint.h> + #include <utility> #include "base/memory/shared_memory.h" @@ -511,7 +513,7 @@ TEST_F(VideoEncoderResourceTest, GetSupportedProfiles0_1) { ASSERT_EQ(profiles_response.size(), static_cast<uint32_t>(cb.result())); - for (uint32 i = 0; i < profiles_response.size(); i++) { + for (uint32_t i = 0; i < profiles_response.size(); i++) { ASSERT_EQ(profiles_response[i].profile, profiles[i].profile); ASSERT_EQ(profiles_response[i].max_resolution.width, profiles[i].max_resolution.width); diff --git a/ppapi/proxy/video_frame_resource.h b/ppapi/proxy/video_frame_resource.h index e796eed..d82518b 100644 --- a/ppapi/proxy/video_frame_resource.h +++ b/ppapi/proxy/video_frame_resource.h @@ -5,8 +5,10 @@ #ifndef PPAPI_PROXY_VIDEO_FRAME_RESOURCE_H_ #define PPAPI_PROXY_VIDEO_FRAME_RESOURCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/media_stream_buffer.h" #include "ppapi/shared_impl/resource.h" diff --git a/ppapi/proxy/video_source_resource.h b/ppapi/proxy/video_source_resource.h index 56cd7dd..bbc85b4 100644 --- a/ppapi/proxy/video_source_resource.h +++ b/ppapi/proxy/video_source_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_VIDEO_SOURCE_RESOURCE_H_ #define PPAPI_PROXY_VIDEO_SOURCE_RESOURCE_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "ppapi/c/pp_time.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/connection.h" diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc index b374ef3..02b918e 100644 --- a/ppapi/proxy/websocket_resource.cc +++ b/ppapi/proxy/websocket_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/websocket_resource.h" +#include <stddef.h> + #include <limits> #include <set> #include <string> @@ -273,7 +275,7 @@ int32_t WebSocketResource::SendMessage(const PP_Var& message) { if (!message_arraybuffer.get()) return PP_ERROR_BADARGUMENT; uint8_t* message_data = static_cast<uint8_t*>(message_arraybuffer->Map()); - uint32 message_length = message_arraybuffer->ByteLength(); + uint32_t message_length = message_arraybuffer->ByteLength(); std::vector<uint8_t> message_vector(message_data, message_data + message_length); Post(RENDERER, PpapiHostMsg_WebSocket_SendBinary(message_vector)); diff --git a/ppapi/proxy/websocket_resource.h b/ppapi/proxy/websocket_resource.h index 51fb52d..2cb43b8 100644 --- a/ppapi/proxy/websocket_resource.h +++ b/ppapi/proxy/websocket_resource.h @@ -5,8 +5,11 @@ #ifndef PPAPI_PROXY_WEBSOCKET_RESOURCE_H_ #define PPAPI_PROXY_WEBSOCKET_RESOURCE_H_ +#include <stdint.h> + #include <queue> +#include "base/macros.h" #include "ppapi/c/ppb_websocket.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/proxy/websocket_resource_unittest.cc b/ppapi/proxy/websocket_resource_unittest.cc index bdc0b88..9df1308 100644 --- a/ppapi/proxy/websocket_resource_unittest.cc +++ b/ppapi/proxy/websocket_resource_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/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/shared_impl/array_var.h b/ppapi/shared_impl/array_var.h index 2e3ab02..bce8416 100644 --- a/ppapi/shared_impl/array_var.h +++ b/ppapi/shared_impl/array_var.h @@ -5,10 +5,12 @@ #ifndef PPAPI_SHARED_IMPL_ARRAY_VAR_H_ #define PPAPI_SHARED_IMPL_ARRAY_VAR_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/ppapi_shared_export.h" #include "ppapi/shared_impl/scoped_pp_var.h" diff --git a/ppapi/shared_impl/array_writer.cc b/ppapi/shared_impl/array_writer.cc index fe87e07..e984715 100644 --- a/ppapi/shared_impl/array_writer.cc +++ b/ppapi/shared_impl/array_writer.cc @@ -4,6 +4,8 @@ #include "ppapi/shared_impl/array_writer.h" +#include <stddef.h> + #include <algorithm> #include "ppapi/shared_impl/ppapi_globals.h" diff --git a/ppapi/shared_impl/array_writer.h b/ppapi/shared_impl/array_writer.h index 1d2608a..a301dcc 100644 --- a/ppapi/shared_impl/array_writer.h +++ b/ppapi/shared_impl/array_writer.h @@ -5,10 +5,12 @@ #ifndef PPAPI_SHARED_IMPL_ARRAY_WRITER_H_ #define PPAPI_SHARED_IMPL_ARRAY_WRITER_H_ +#include <stdint.h> #include <string.h> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_array_output.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/shared_impl/callback_tracker.h b/ppapi/shared_impl/callback_tracker.h index bafd818..3b91038 100644 --- a/ppapi/shared_impl/callback_tracker.h +++ b/ppapi/shared_impl/callback_tracker.h @@ -8,7 +8,7 @@ #include <map> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/shared_impl/compositor_layer_data.h b/ppapi/shared_impl/compositor_layer_data.h index d726e28..86a5b59 100644 --- a/ppapi/shared_impl/compositor_layer_data.h +++ b/ppapi/shared_impl/compositor_layer_data.h @@ -5,6 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ #define PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ +#include <stdint.h> #include <string.h> #include "base/logging.h" diff --git a/ppapi/shared_impl/dictionary_var.h b/ppapi/shared_impl/dictionary_var.h index 06f9502..d6b610a 100644 --- a/ppapi/shared_impl/dictionary_var.h +++ b/ppapi/shared_impl/dictionary_var.h @@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/ppapi_shared_export.h" #include "ppapi/shared_impl/scoped_pp_var.h" diff --git a/ppapi/shared_impl/file_io_state_manager.h b/ppapi/shared_impl/file_io_state_manager.h index 1c4fa1a..8e1e978 100644 --- a/ppapi/shared_impl/file_io_state_manager.h +++ b/ppapi/shared_impl/file_io_state_manager.h @@ -5,8 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_FILE_IO_STATE_MANAGER_H_ #define PPAPI_SHARED_IMPL_FILE_IO_STATE_MANAGER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/file_ref_create_info.cc b/ppapi/shared_impl/file_ref_create_info.cc index 7d975b7..f4b78c1 100644 --- a/ppapi/shared_impl/file_ref_create_info.cc +++ b/ppapi/shared_impl/file_ref_create_info.cc @@ -4,8 +4,11 @@ #include "ppapi/shared_impl/file_ref_create_info.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ppapi/c/pp_file_info.h" namespace ppapi { diff --git a/ppapi/shared_impl/file_ref_util.cc b/ppapi/shared_impl/file_ref_util.cc index a5523cb..d111f69 100644 --- a/ppapi/shared_impl/file_ref_util.cc +++ b/ppapi/shared_impl/file_ref_util.cc @@ -4,9 +4,12 @@ #include "ppapi/shared_impl/file_ref_util.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" namespace ppapi { diff --git a/ppapi/shared_impl/flash_clipboard_format_registry.cc b/ppapi/shared_impl/flash_clipboard_format_registry.cc index fa43478..16da30c 100644 --- a/ppapi/shared_impl/flash_clipboard_format_registry.cc +++ b/ppapi/shared_impl/flash_clipboard_format_registry.cc @@ -4,8 +4,11 @@ #include "ppapi/shared_impl/flash_clipboard_format_registry.h" +#include <stddef.h> + #include <cctype> +#include "base/macros.h" #include "base/numerics/safe_conversions.h" namespace ppapi { diff --git a/ppapi/shared_impl/flash_clipboard_format_registry.h b/ppapi/shared_impl/flash_clipboard_format_registry.h index 9e9ae30..1d6a3ef 100644 --- a/ppapi/shared_impl/flash_clipboard_format_registry.h +++ b/ppapi/shared_impl/flash_clipboard_format_registry.h @@ -5,10 +5,12 @@ #ifndef PPAPI_SHARED_IMPL_FLASH_CLIPBOARD_FORMAT_REGISTRY_H_ #define PPAPI_SHARED_IMPL_FLASH_CLIPBOARD_FORMAT_REGISTRY_H_ +#include <stdint.h> + #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/id_assignment.h b/ppapi/shared_impl/id_assignment.h index 4ca8cd1..1444f2f 100644 --- a/ppapi/shared_impl/id_assignment.h +++ b/ppapi/shared_impl/id_assignment.h @@ -5,9 +5,10 @@ #ifndef PPAPI_SHARED_IMPL_ID_ASSIGNMENT_H_ #define PPAPI_SHARED_IMPL_ID_ASSIGNMENT_H_ +#include <stdint.h> + #include <limits> -#include "base/basictypes.h" #include "ppapi/shared_impl/ppapi_shared_export.h" namespace ppapi { @@ -24,7 +25,7 @@ enum PPIdType { PPAPI_SHARED_EXPORT extern const unsigned int kPPIdTypeBits; -extern const int32 kMaxPPId; +extern const int32_t kMaxPPId; // The least significant bits are the type, the rest are the value. template <typename T> diff --git a/ppapi/shared_impl/media_stream_audio_track_shared.h b/ppapi/shared_impl/media_stream_audio_track_shared.h index 8d9cbe5..8a7a000 100644 --- a/ppapi/shared_impl/media_stream_audio_track_shared.h +++ b/ppapi/shared_impl/media_stream_audio_track_shared.h @@ -5,6 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_AUDIO_TRACK_SHARED_H_ #define PPAPI_SHARED_IMPL_MEDIA_STREAM_AUDIO_TRACK_SHARED_H_ +#include <stdint.h> + #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/media_stream_buffer.h b/ppapi/shared_impl/media_stream_buffer.h index ddb6729..5a3b631 100644 --- a/ppapi/shared_impl/media_stream_buffer.h +++ b/ppapi/shared_impl/media_stream_buffer.h @@ -5,6 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_ #define PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_ +#include <stdint.h> + #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/c/ppb_video_frame.h" diff --git a/ppapi/shared_impl/media_stream_buffer_manager.cc b/ppapi/shared_impl/media_stream_buffer_manager.cc index b1b6516..db97263 100644 --- a/ppapi/shared_impl/media_stream_buffer_manager.cc +++ b/ppapi/shared_impl/media_stream_buffer_manager.cc @@ -4,6 +4,8 @@ #include "ppapi/shared_impl/media_stream_buffer_manager.h" +#include <stddef.h> + #include <utility> #include "base/logging.h" diff --git a/ppapi/shared_impl/media_stream_buffer_manager.h b/ppapi/shared_impl/media_stream_buffer_manager.h index 7633624..d965b11 100644 --- a/ppapi/shared_impl/media_stream_buffer_manager.h +++ b/ppapi/shared_impl/media_stream_buffer_manager.h @@ -5,10 +5,13 @@ #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_MANAGER_H_ #define PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_MANAGER_H_ +#include <stdint.h> + #include <deque> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc index dfe35d1..4bb250a 100644 --- a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc +++ b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc @@ -4,6 +4,8 @@ #include "ppapi/shared_impl/media_stream_buffer_manager.h" +#include <stdint.h> + #include <utility> #include "base/memory/scoped_ptr.h" diff --git a/ppapi/shared_impl/media_stream_video_track_shared.h b/ppapi/shared_impl/media_stream_video_track_shared.h index 75e32b8..14aa29f 100644 --- a/ppapi/shared_impl/media_stream_video_track_shared.h +++ b/ppapi/shared_impl/media_stream_video_track_shared.h @@ -5,6 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_VIDEO_TRACK_SHARED_H_ #define PPAPI_SHARED_IMPL_MEDIA_STREAM_VIDEO_TRACK_SHARED_H_ +#include <stdint.h> + #include "ppapi/c/ppb_video_frame.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc b/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc index 55b0119..684d434 100644 --- a/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc +++ b/ppapi/shared_impl/media_stream_video_track_shared_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 "ppapi/shared_impl/media_stream_video_track_shared.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ppapi/shared_impl/platform_file.cc b/ppapi/shared_impl/platform_file.cc index 0bdd5db..68afe97 100644 --- a/ppapi/shared_impl/platform_file.cc +++ b/ppapi/shared_impl/platform_file.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 "ppapi/shared_impl/platform_file.h" namespace ppapi { diff --git a/ppapi/shared_impl/ppapi_constants.h b/ppapi/shared_impl/ppapi_constants.h index d5b71aa..118db25 100644 --- a/ppapi/shared_impl/ppapi_constants.h +++ b/ppapi/shared_impl/ppapi_constants.h @@ -5,6 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_PPAPI_CONSTANTS_H_ #define PPAPI_SHARED_IMPL_PPAPI_CONSTANTS_H_ +#include "build/build_config.h" #include "ppapi/shared_impl/ppapi_shared_export.h" namespace ppapi { diff --git a/ppapi/shared_impl/ppapi_globals.h b/ppapi/shared_impl/ppapi_globals.h index 14b386e..f069ab0 100644 --- a/ppapi/shared_impl/ppapi_globals.h +++ b/ppapi/shared_impl/ppapi_globals.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_local.h" // For testing purposes only. #include "ppapi/c/pp_instance.h" diff --git a/ppapi/shared_impl/ppapi_permissions.cc b/ppapi/shared_impl/ppapi_permissions.cc index a2d2521..cf0e90c 100644 --- a/ppapi/shared_impl/ppapi_permissions.cc +++ b/ppapi/shared_impl/ppapi_permissions.cc @@ -6,13 +6,14 @@ #include "base/command_line.h" #include "base/logging.h" +#include "build/build_config.h" #include "ppapi/shared_impl/ppapi_switches.h" namespace ppapi { PpapiPermissions::PpapiPermissions() : permissions_(0) {} -PpapiPermissions::PpapiPermissions(uint32 perms) : permissions_(perms) {} +PpapiPermissions::PpapiPermissions(uint32_t perms) : permissions_(perms) {} PpapiPermissions::~PpapiPermissions() {} @@ -22,8 +23,8 @@ PpapiPermissions PpapiPermissions::AllPermissions() { } // static -PpapiPermissions PpapiPermissions::GetForCommandLine(uint32 base_perms) { - uint32 additional_permissions = 0; +PpapiPermissions PpapiPermissions::GetForCommandLine(uint32_t base_perms) { + uint32_t additional_permissions = 0; #if !defined(OS_NACL) // Testing permissions. The testing flag implies all permissions since the @@ -41,7 +42,7 @@ bool PpapiPermissions::HasPermission(Permission perm) const { // more than one permission bit. We may want to change how permissions are // represented in the future so don't want callers making assumptions about // bits. - uint32 perm_int = static_cast<uint32>(perm); + uint32_t perm_int = static_cast<uint32_t>(perm); if (!perm_int) return true; // You always have "no permission". DCHECK((perm_int & (perm_int - 1)) == 0); diff --git a/ppapi/shared_impl/ppapi_permissions.h b/ppapi/shared_impl/ppapi_permissions.h index 8a12206b9..346959f 100644 --- a/ppapi/shared_impl/ppapi_permissions.h +++ b/ppapi/shared_impl/ppapi_permissions.h @@ -5,7 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_PPAPI_PERMISSIONS_H_ #define PPAPI_SHARED_IMPL_PPAPI_PERMISSIONS_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "ppapi/shared_impl/ppapi_shared_export.h" namespace ppapi { @@ -53,7 +54,7 @@ class PPAPI_SHARED_EXPORT PpapiPermissions { PpapiPermissions(); // Initializes with the given permissions bits set. - explicit PpapiPermissions(uint32 perms); + explicit PpapiPermissions(uint32_t perms); ~PpapiPermissions(); @@ -64,15 +65,15 @@ class PPAPI_SHARED_EXPORT PpapiPermissions { // Returns the effective permissions given the "base" permissions granted // to the given plugin and the current command line flags, which may enable // more features. - static PpapiPermissions GetForCommandLine(uint32 base_perms); + static PpapiPermissions GetForCommandLine(uint32_t base_perms); bool HasPermission(Permission perm) const; // Returns the internal permission bits. Use for serialization only. - uint32 GetBits() const { return permissions_; } + uint32_t GetBits() const { return permissions_; } private: - uint32 permissions_; + uint32_t permissions_; // Note: Copy & assign supported. }; diff --git a/ppapi/shared_impl/ppb_audio_config_shared.h b/ppapi/shared_impl/ppb_audio_config_shared.h index 5e7d359..643d1e1 100644 --- a/ppapi/shared_impl/ppb_audio_config_shared.h +++ b/ppapi/shared_impl/ppb_audio_config_shared.h @@ -5,8 +5,10 @@ #ifndef PPAPI_SHARED_IMPL_PPB_AUDIO_CONFIG_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_AUDIO_CONFIG_SHARED_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_audio_config_api.h" diff --git a/ppapi/shared_impl/ppb_audio_shared.h b/ppapi/shared_impl/ppb_audio_shared.h index 31888c8..10b0500 100644 --- a/ppapi/shared_impl/ppb_audio_shared.h +++ b/ppapi/shared_impl/ppb_audio_shared.h @@ -5,6 +5,10 @@ #ifndef PPAPI_SHARED_IMPL_PPB_AUDIO_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_AUDIO_SHARED_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/ppapi/shared_impl/ppb_crypto_shared.cc b/ppapi/shared_impl/ppb_crypto_shared.cc index f172ea7..d5fd9ce 100644 --- a/ppapi/shared_impl/ppb_crypto_shared.cc +++ b/ppapi/shared_impl/ppb_crypto_shared.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/rand_util.h" #include "ppapi/c/dev/ppb_crypto_dev.h" #include "ppapi/thunk/thunk.h" diff --git a/ppapi/shared_impl/ppb_device_ref_shared.h b/ppapi/shared_impl/ppb_device_ref_shared.h index aac1206..6a14881 100644 --- a/ppapi/shared_impl/ppb_device_ref_shared.h +++ b/ppapi/shared_impl/ppb_device_ref_shared.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_device_ref_api.h" diff --git a/ppapi/shared_impl/ppb_gamepad_shared.cc b/ppapi/shared_impl/ppb_gamepad_shared.cc index 2bf0b57..80082d0 100644 --- a/ppapi/shared_impl/ppb_gamepad_shared.cc +++ b/ppapi/shared_impl/ppb_gamepad_shared.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "base/basictypes.h" namespace ppapi { diff --git a/ppapi/shared_impl/ppb_gamepad_shared.h b/ppapi/shared_impl/ppb_gamepad_shared.h index 22b4df7..4628399 100644 --- a/ppapi/shared_impl/ppb_gamepad_shared.h +++ b/ppapi/shared_impl/ppb_gamepad_shared.h @@ -5,6 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ +#include <stddef.h> + #include "base/atomicops.h" #include "base/strings/string16.h" #include "ppapi/c/ppb_gamepad.h" diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.cc b/ppapi/shared_impl/ppb_graphics_3d_shared.cc index 3dadacb..81b8949 100644 --- a/ppapi/shared_impl/ppb_graphics_3d_shared.cc +++ b/ppapi/shared_impl/ppb_graphics_3d_shared.cc @@ -100,8 +100,8 @@ bool PPB_Graphics3D_Shared::HasPendingSwap() const { } bool PPB_Graphics3D_Shared::CreateGLES2Impl( - int32 command_buffer_size, - int32 transfer_buffer_size, + int32_t command_buffer_size, + int32_t transfer_buffer_size, gpu::gles2::GLES2Implementation* share_gles2) { gpu::CommandBuffer* command_buffer = GetCommandBuffer(); DCHECK(command_buffer); @@ -113,8 +113,8 @@ bool PPB_Graphics3D_Shared::CreateGLES2Impl( // Create a transfer buffer used to copy resources between the renderer // process and the GPU process. - const int32 kMinTransferBufferSize = 256 * 1024; - const int32 kMaxTransferBufferSize = 16 * 1024 * 1024; + const int32_t kMinTransferBufferSize = 256 * 1024; + const int32_t kMaxTransferBufferSize = 16 * 1024 * 1024; transfer_buffer_.reset(new gpu::TransferBuffer(gles2_helper_.get())); const bool bind_creates_resources = true; diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.h b/ppapi/shared_impl/ppb_graphics_3d_shared.h index 09bc0f53..3401c42 100644 --- a/ppapi/shared_impl/ppb_graphics_3d_shared.h +++ b/ppapi/shared_impl/ppb_graphics_3d_shared.h @@ -5,7 +5,9 @@ #ifndef PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_ #define PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/shared_impl/ppapi_shared_export.h" @@ -63,11 +65,11 @@ class PPAPI_SHARED_EXPORT PPB_Graphics3D_Shared virtual gpu::CommandBuffer* GetCommandBuffer() = 0; virtual gpu::GpuControl* GetGpuControl() = 0; - virtual int32 DoSwapBuffers() = 0; + virtual int32_t DoSwapBuffers() = 0; bool HasPendingSwap() const; - bool CreateGLES2Impl(int32 command_buffer_size, - int32 transfer_buffer_size, + bool CreateGLES2Impl(int32_t command_buffer_size, + int32_t transfer_buffer_size, gpu::gles2::GLES2Implementation* share_gles2); void DestroyGLES2Impl(); diff --git a/ppapi/shared_impl/ppb_input_event_shared.cc b/ppapi/shared_impl/ppb_input_event_shared.cc index 5cf83b5..c966224 100644 --- a/ppapi/shared_impl/ppb_input_event_shared.cc +++ b/ppapi/shared_impl/ppb_input_event_shared.cc @@ -4,6 +4,8 @@ #include "ppapi/shared_impl/ppb_input_event_shared.h" +#include <stddef.h> + #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var.h" diff --git a/ppapi/shared_impl/ppb_input_event_shared.h b/ppapi/shared_impl/ppb_input_event_shared.h index b3e8e61..cdebad7 100644 --- a/ppapi/shared_impl/ppb_input_event_shared.h +++ b/ppapi/shared_impl/ppb_input_event_shared.h @@ -5,11 +5,13 @@ #ifndef PPAPI_SHARED_IMPL_PPB_INPUT_EVENT_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_INPUT_EVENT_SHARED_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_input_event_api.h" diff --git a/ppapi/shared_impl/ppb_memory_shared.cc b/ppapi/shared_impl/ppb_memory_shared.cc index aaf5f36..f870b71 100644 --- a/ppapi/shared_impl/ppb_memory_shared.cc +++ b/ppapi/shared_impl/ppb_memory_shared.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 <stdint.h> #include <stdlib.h> #include "ppapi/c/dev/ppb_memory_dev.h" diff --git a/ppapi/shared_impl/ppb_message_loop_shared.h b/ppapi/shared_impl/ppb_message_loop_shared.h index d28d8be4..cd7733f 100644 --- a/ppapi/shared_impl/ppb_message_loop_shared.h +++ b/ppapi/shared_impl/ppb_message_loop_shared.h @@ -5,9 +5,11 @@ #ifndef PPAPI_SHARED_IMPL_PPB_MESSAGE_LOOP_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_MESSAGE_LOOP_SHARED_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback_forward.h" #include "base/location.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/ppapi_shared_export.h" #include "ppapi/shared_impl/resource.h" @@ -46,7 +48,7 @@ class PPAPI_SHARED_EXPORT MessageLoopShared // proxy operations (e.g., MessageLoop::QuitClosure). virtual void PostClosure(const tracked_objects::Location& from_here, const base::Closure& closure, - int64 delay_ms) = 0; + int64_t delay_ms) = 0; virtual base::SingleThreadTaskRunner* GetTaskRunner() = 0; diff --git a/ppapi/shared_impl/ppb_trace_event_impl.cc b/ppapi/shared_impl/ppb_trace_event_impl.cc index db9260b..a178726 100644 --- a/ppapi/shared_impl/ppb_trace_event_impl.cc +++ b/ppapi/shared_impl/ppb_trace_event_impl.cc @@ -4,7 +4,6 @@ #include "ppapi/shared_impl/ppb_trace_event_impl.h" -#include "base/basictypes.h" #include "base/threading/platform_thread.h" #include "base/trace_event/trace_event.h" #include "ppapi/thunk/thunk.h" diff --git a/ppapi/shared_impl/ppb_trace_event_impl.h b/ppapi/shared_impl/ppb_trace_event_impl.h index b7a5eb4..904e708 100644 --- a/ppapi/shared_impl/ppb_trace_event_impl.h +++ b/ppapi/shared_impl/ppb_trace_event_impl.h @@ -5,6 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_PPB_TRACE_EVENT_IMPL_H_ #define PPAPI_SHARED_IMPL_PPB_TRACE_EVENT_IMPL_H_ +#include <stdint.h> + #include "ppapi/c/dev/ppb_trace_event_dev.h" #include "ppapi/c/pp_bool.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/ppb_url_util_shared.h b/ppapi/shared_impl/ppb_url_util_shared.h index 907c4b8..6d81617 100644 --- a/ppapi/shared_impl/ppb_url_util_shared.h +++ b/ppapi/shared_impl/ppb_url_util_shared.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "ppapi/c/dev/ppb_url_util_dev.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.cc b/ppapi/shared_impl/ppb_video_decoder_shared.cc index 88c9ca2..a8863b8 100644 --- a/ppapi/shared_impl/ppb_video_decoder_shared.cc +++ b/ppapi/shared_impl/ppb_video_decoder_shared.cc @@ -70,23 +70,23 @@ bool PPB_VideoDecoder_Shared::SetResetCallback( } bool PPB_VideoDecoder_Shared::SetBitstreamBufferCallback( - int32 bitstream_buffer_id, + int32_t bitstream_buffer_id, scoped_refptr<TrackedCallback> callback) { return bitstream_buffer_callbacks_.insert(std::make_pair(bitstream_buffer_id, callback)).second; } -void PPB_VideoDecoder_Shared::RunFlushCallback(int32 result) { +void PPB_VideoDecoder_Shared::RunFlushCallback(int32_t result) { flush_callback_->Run(result); } -void PPB_VideoDecoder_Shared::RunResetCallback(int32 result) { +void PPB_VideoDecoder_Shared::RunResetCallback(int32_t result) { reset_callback_->Run(result); } void PPB_VideoDecoder_Shared::RunBitstreamBufferCallback( - int32 bitstream_buffer_id, - int32 result) { + int32_t bitstream_buffer_id, + int32_t result) { CallbackById::iterator it = bitstream_buffer_callbacks_.find(bitstream_buffer_id); DCHECK(it != bitstream_buffer_callbacks_.end()); diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.h b/ppapi/shared_impl/ppb_video_decoder_shared.h index 23c8608..ad431a7 100644 --- a/ppapi/shared_impl/ppb_video_decoder_shared.h +++ b/ppapi/shared_impl/ppb_video_decoder_shared.h @@ -5,11 +5,13 @@ #ifndef PPAPI_SHARED_IMPL_PPB_VIDEO_DECODER_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_VIDEO_DECODER_SHARED_H_ +#include <stdint.h> + #include <map> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/dev/ppb_video_decoder_dev.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/shared_impl/tracked_callback.h" @@ -42,12 +44,12 @@ class PPAPI_SHARED_EXPORT PPB_VideoDecoder_Shared protected: bool SetFlushCallback(scoped_refptr<TrackedCallback> callback); bool SetResetCallback(scoped_refptr<TrackedCallback> callback); - bool SetBitstreamBufferCallback(int32 bitstream_buffer_id, + bool SetBitstreamBufferCallback(int32_t bitstream_buffer_id, scoped_refptr<TrackedCallback> callback); - void RunFlushCallback(int32 result); - void RunResetCallback(int32 result); - void RunBitstreamBufferCallback(int32 bitstream_buffer_id, int32 result); + void RunFlushCallback(int32_t result); + void RunResetCallback(int32_t result); + void RunBitstreamBufferCallback(int32_t bitstream_buffer_id, int32_t result); // Tell command buffer to process all commands it has received so far. void FlushCommandBuffer(); @@ -59,7 +61,7 @@ class PPAPI_SHARED_EXPORT PPB_VideoDecoder_Shared private: // Key: bitstream_buffer_id, value: callback to run when bitstream decode is // done. - typedef std::map<int32, scoped_refptr<TrackedCallback> > CallbackById; + typedef std::map<int32_t, scoped_refptr<TrackedCallback>> CallbackById; scoped_refptr<TrackedCallback> flush_callback_; scoped_refptr<TrackedCallback> reset_callback_; diff --git a/ppapi/shared_impl/ppb_view_shared.h b/ppapi/shared_impl/ppb_view_shared.h index a0e3794..0693451 100644 --- a/ppapi/shared_impl/ppb_view_shared.h +++ b/ppapi/shared_impl/ppb_view_shared.h @@ -6,6 +6,7 @@ #define PPAPI_SHARED_IMPL_PPB_VIEW_SHARED_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_size.h" #include "ppapi/shared_impl/resource.h" diff --git a/ppapi/shared_impl/ppp_instance_combined.h b/ppapi/shared_impl/ppp_instance_combined.h index a29b1bb..7fd61f9 100644 --- a/ppapi/shared_impl/ppp_instance_combined.h +++ b/ppapi/shared_impl/ppp_instance_combined.h @@ -5,8 +5,10 @@ #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "ppapi/c/ppp_instance.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc index 7515592..07d61d7 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.cc +++ b/ppapi/shared_impl/private/net_address_private_impl.cc @@ -4,21 +4,11 @@ #include "ppapi/shared_impl/private/net_address_private_impl.h" -#if defined(OS_WIN) -#include <windows.h> -#include <winsock2.h> -#include <ws2tcpip.h> -#elif defined(OS_POSIX) && !defined(OS_NACL) -#include <arpa/inet.h> -#include <sys/socket.h> -#include <sys/types.h> -#endif - +#include <stddef.h> #include <string.h> #include <string> -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" @@ -28,6 +18,16 @@ #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/thunk.h" +#if defined(OS_WIN) +#include <windows.h> +#include <winsock2.h> +#include <ws2tcpip.h> +#elif defined(OS_POSIX) && !defined(OS_NACL) +#include <arpa/inet.h> +#include <sys/socket.h> +#include <sys/types.h> +#endif + #if defined(OS_MACOSX) // This is a bit evil, but it's standard operating procedure for |s6_addr|.... #define s6_addr16 __u6_addr.__u6_addr16 @@ -54,7 +54,7 @@ namespace { // Define our own net-host-net conversion, rather than reuse the one in // base/sys_byteorder.h, to simplify the NaCl port. NaCl has no byte swap // primitives. -uint16 ConvertFromNetEndian16(uint16 x) { +uint16_t ConvertFromNetEndian16(uint16_t x) { #if defined(ARCH_CPU_LITTLE_ENDIAN) return (x << 8) | (x >> 8); #else @@ -62,7 +62,7 @@ uint16 ConvertFromNetEndian16(uint16 x) { #endif } -uint16 ConvertToNetEndian16(uint16 x) { +uint16_t ConvertToNetEndian16(uint16_t x) { #if defined(ARCH_CPU_LITTLE_ENDIAN) return (x << 8) | (x >> 8); #else @@ -451,7 +451,7 @@ bool NetAddressPrivateImpl::SockaddrToNetAddress( // static bool NetAddressPrivateImpl::IPEndPointToNetAddress( const std::vector<unsigned char>& address, - uint16 port, + uint16_t port, PP_NetAddress_Private* addr) { if (!addr) return false; @@ -484,7 +484,7 @@ bool NetAddressPrivateImpl::IPEndPointToNetAddress( bool NetAddressPrivateImpl::NetAddressToIPEndPoint( const PP_NetAddress_Private& addr, std::vector<unsigned char>* address, - uint16* port) { + uint16_t* port) { if (!address || !port) return false; diff --git a/ppapi/shared_impl/private/net_address_private_impl.h b/ppapi/shared_impl/private/net_address_private_impl.h index 814633b..a7867dd 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.h +++ b/ppapi/shared_impl/private/net_address_private_impl.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/ppb_net_address.h" #include "ppapi/shared_impl/ppapi_shared_export.h" @@ -27,12 +27,12 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl { PP_NetAddress_Private* net_addr); static bool IPEndPointToNetAddress(const std::vector<unsigned char>& address, - uint16 port, + uint16_t port, PP_NetAddress_Private* net_addr); static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr, std::vector<unsigned char>* address, - uint16* port); + uint16_t* port); static std::string DescribeNetAddress(const PP_NetAddress_Private& addr, bool include_port); diff --git a/ppapi/shared_impl/private/net_address_private_impl_constants.cc b/ppapi/shared_impl/private/net_address_private_impl_constants.cc index 44cc4d3..46e7686 100644 --- a/ppapi/shared_impl/private/net_address_private_impl_constants.cc +++ b/ppapi/shared_impl/private/net_address_private_impl_constants.cc @@ -4,6 +4,7 @@ #include "ppapi/shared_impl/private/net_address_private_impl.h" +#include "build/build_config.h" #include "ppapi/c/private/ppb_net_address_private.h" namespace ppapi { diff --git a/ppapi/shared_impl/private/ppb_char_set_shared.h b/ppapi/shared_impl/private/ppb_char_set_shared.h index 96c3ba2..b277c20 100644 --- a/ppapi/shared_impl/private/ppb_char_set_shared.h +++ b/ppapi/shared_impl/private/ppb_char_set_shared.h @@ -5,7 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_ #define PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "ppapi/c/dev/ppb_char_set_dev.h" #include "ppapi/c/trusted/ppb_char_set_trusted.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h index 1eaedbb..61a49d1 100644 --- a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h +++ b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h @@ -5,8 +5,11 @@ #ifndef PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_IMPL_H_ #define PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_IMPL_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "ppapi/c/private/ppb_x509_certificate_private.h" diff --git a/ppapi/shared_impl/proxy_lock.h b/ppapi/shared_impl/proxy_lock.h index 274dcef..8c7bc83 100644 --- a/ppapi/shared_impl/proxy_lock.h +++ b/ppapi/shared_impl/proxy_lock.h @@ -7,9 +7,9 @@ #include <utility> -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/proxy_lock_unittest.cc b/ppapi/shared_impl/proxy_lock_unittest.cc index 425a00d..02a8d4b 100644 --- a/ppapi/shared_impl/proxy_lock_unittest.cc +++ b/ppapi/shared_impl/proxy_lock_unittest.cc @@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/ppapi/shared_impl/resource.h b/ppapi/shared_impl/resource.h index 025ea3b..f5a8b79 100644 --- a/ppapi/shared_impl/resource.h +++ b/ppapi/shared_impl/resource.h @@ -9,7 +9,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/shared_impl/resource_tracker.cc b/ppapi/shared_impl/resource_tracker.cc index 208212c..adadbe1 100644 --- a/ppapi/shared_impl/resource_tracker.cc +++ b/ppapi/shared_impl/resource_tracker.cc @@ -233,7 +233,7 @@ void ResourceTracker::LastPluginRefWasDeleted(Resource* object) { object->NotifyLastPluginRefWasDeleted(); } -int32 ResourceTracker::GetNextResourceValue() { +int32_t ResourceTracker::GetNextResourceValue() { #if defined(NDEBUG) return ++last_resource_value_; #else diff --git a/ppapi/shared_impl/resource_tracker.h b/ppapi/shared_impl/resource_tracker.h index f22f948..2351405 100644 --- a/ppapi/shared_impl/resource_tracker.h +++ b/ppapi/shared_impl/resource_tracker.h @@ -5,10 +5,12 @@ #ifndef PPAPI_SHARED_IMPL_RESOURCE_TRACKER_H_ #define PPAPI_SHARED_IMPL_RESOURCE_TRACKER_H_ +#include <stdint.h> + #include <set> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -92,7 +94,7 @@ class PPAPI_SHARED_EXPORT ResourceTracker { // cancels pending callbacks for the resource. void LastPluginRefWasDeleted(Resource* object); - int32 GetNextResourceValue(); + int32_t GetNextResourceValue(); // In debug mode, checks whether |res| comes from the same resource tracker. bool CanOperateOnResource(PP_Resource res); @@ -121,7 +123,7 @@ class PPAPI_SHARED_EXPORT ResourceTracker { typedef base::hash_map<PP_Resource, ResourceAndRefCount> ResourceMap; ResourceMap live_resources_; - int32 last_resource_value_; + int32_t last_resource_value_; // On the host side, we want to check that we are only called on the main // thread. This is to protect us from accidentally using the tracker from diff --git a/ppapi/shared_impl/resource_var.h b/ppapi/shared_impl/resource_var.h index 0696d57..fe48120 100644 --- a/ppapi/shared_impl/resource_var.h +++ b/ppapi/shared_impl/resource_var.h @@ -5,6 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_RESOURCE_VAR_H_ #define PPAPI_SHARED_IMPL_RESOURCE_VAR_H_ +#include "base/macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/scoped_pp_var.cc b/ppapi/shared_impl/scoped_pp_var.cc index a6d1aa3..caa0c51 100644 --- a/ppapi/shared_impl/scoped_pp_var.cc +++ b/ppapi/shared_impl/scoped_pp_var.cc @@ -4,6 +4,8 @@ #include "ppapi/shared_impl/scoped_pp_var.h" +#include <stdint.h> + #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var_tracker.h" diff --git a/ppapi/shared_impl/scoped_pp_var.h b/ppapi/shared_impl/scoped_pp_var.h index e55674c..a88e417 100644 --- a/ppapi/shared_impl/scoped_pp_var.h +++ b/ppapi/shared_impl/scoped_pp_var.h @@ -5,6 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_SCOPED_PP_VAR_H_ #define PPAPI_SHARED_IMPL_SCOPED_PP_VAR_H_ +#include <stddef.h> #include <stdlib.h> #include "base/macros.h" diff --git a/ppapi/shared_impl/test_globals.h b/ppapi/shared_impl/test_globals.h index fba9a57..e961767 100644 --- a/ppapi/shared_impl/test_globals.h +++ b/ppapi/shared_impl/test_globals.h @@ -5,7 +5,10 @@ #ifndef PPAPI_SHARED_IMPL_TEST_GLOBALS_H_ #define PPAPI_SHARED_IMPL_TEST_GLOBALS_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "ppapi/shared_impl/callback_tracker.h" #include "ppapi/shared_impl/ppapi_globals.h" @@ -28,24 +31,24 @@ class TestVarTracker : public VarTracker { ResourceVar* MakeResourceVar(PP_Resource pp_resource) override { return NULL; } - ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) override { + ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) override { return NULL; } ArrayBufferVar* CreateShmArrayBuffer( - uint32 size_in_bytes, + uint32_t size_in_bytes, base::SharedMemoryHandle handle) override { return NULL; } void DidDeleteInstance(PP_Instance instance) override {} int TrackSharedMemoryHandle(PP_Instance instance, base::SharedMemoryHandle handle, - uint32 size_in_bytes) override { + uint32_t size_in_bytes) override { return -1; } bool StopTrackingSharedMemoryHandle(int id, PP_Instance instance, base::SharedMemoryHandle* handle, - uint32* size_in_bytes) override { + uint32_t* size_in_bytes) override { return false; } }; diff --git a/ppapi/shared_impl/test_utils.cc b/ppapi/shared_impl/test_utils.cc index 6f85fce..2ab8c5a 100644 --- a/ppapi/shared_impl/test_utils.cc +++ b/ppapi/shared_impl/test_utils.cc @@ -4,6 +4,9 @@ #include "ppapi/shared_impl/test_utils.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include "base/containers/hash_tables.h" diff --git a/ppapi/shared_impl/thread_aware_callback.h b/ppapi/shared_impl/thread_aware_callback.h index 92284678..e65acca 100644 --- a/ppapi/shared_impl/thread_aware_callback.h +++ b/ppapi/shared_impl/thread_aware_callback.h @@ -5,8 +5,8 @@ #ifndef PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_ #define PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_ -#include "base/basictypes.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/shared_impl/ppapi_shared_export.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h index 8bf7a4b..b80e680 100644 --- a/ppapi/shared_impl/tracked_callback.h +++ b/ppapi/shared_impl/tracked_callback.h @@ -5,11 +5,13 @@ #ifndef PPAPI_SHARED_IMPL_TRACKED_CALLBACK_H_ #define PPAPI_SHARED_IMPL_TRACKED_CALLBACK_H_ +#include <stdint.h> + #include <map> #include <set> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/condition_variable.h" diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc index 98c762a..941109f 100644 --- a/ppapi/shared_impl/var.cc +++ b/ppapi/shared_impl/var.cc @@ -4,6 +4,8 @@ #include "ppapi/shared_impl/var.h" +#include <stddef.h> + #include <limits> #include "base/logging.h" @@ -90,7 +92,7 @@ DictionaryVar* Var::AsDictionaryVar() { return NULL; } ResourceVar* Var::AsResourceVar() { return NULL; } PP_Var Var::GetPPVar() { - int32 id = GetOrCreateVarID(); + int32_t id = GetOrCreateVarID(); if (!id) return PP_MakeNull(); @@ -101,13 +103,15 @@ PP_Var Var::GetPPVar() { return result; } -int32 Var::GetExistingVarID() const { return var_id_; } +int32_t Var::GetExistingVarID() const { + return var_id_; +} Var::Var() : var_id_(0) {} Var::~Var() {} -int32 Var::GetOrCreateVarID() { +int32_t Var::GetOrCreateVarID() { VarTracker* tracker = PpapiGlobals::Get()->GetVarTracker(); if (var_id_) { if (!tracker->AddRefVar(var_id_)) @@ -120,7 +124,7 @@ int32 Var::GetOrCreateVarID() { return var_id_; } -void Var::AssignVarID(int32 id) { +void Var::AssignVarID(int32_t id) { DCHECK(!var_id_); // Must not have already been generated. var_id_ = id; } @@ -131,7 +135,7 @@ StringVar::StringVar() {} StringVar::StringVar(const std::string& str) : value_(str) {} -StringVar::StringVar(const char* str, uint32 len) : value_(str, len) {} +StringVar::StringVar(const char* str, uint32_t len) : value_(str, len) {} StringVar::~StringVar() {} @@ -141,11 +145,11 @@ PP_VarType StringVar::GetType() const { return PP_VARTYPE_STRING; } // static PP_Var StringVar::StringToPPVar(const std::string& var) { - return StringToPPVar(var.c_str(), static_cast<uint32>(var.size())); + return StringToPPVar(var.c_str(), static_cast<uint32_t>(var.size())); } // static -PP_Var StringVar::StringToPPVar(const char* data, uint32 len) { +PP_Var StringVar::StringToPPVar(const char* data, uint32_t len) { scoped_refptr<StringVar> str(new StringVar(data, len)); if (!str.get() || !base::IsStringUTF8(str->value())) return PP_MakeNull(); diff --git a/ppapi/shared_impl/var.h b/ppapi/shared_impl/var.h index 5e46864..3c3e150 100644 --- a/ppapi/shared_impl/var.h +++ b/ppapi/shared_impl/var.h @@ -5,9 +5,12 @@ #ifndef PPAPI_SHARED_IMPL_VAR_H_ #define PPAPI_SHARED_IMPL_VAR_H_ +#include <stdint.h> + #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/shared_memory.h" #include "ppapi/c/pp_var.h" @@ -54,7 +57,7 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> { // // Contrast to GetOrCreateVarID which creates the ID and a ref on behalf of // the plugin. - int32 GetExistingVarID() const; + int32_t GetExistingVarID() const; protected: friend class base::RefCounted<Var>; @@ -69,18 +72,18 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> { // // This function will take a reference to the var that will be passed to the // caller. - int32 GetOrCreateVarID(); + int32_t GetOrCreateVarID(); // Sets the internal object ID. This assumes that the ID hasn't been set // before. This is used in cases where the ID is generated externally. - void AssignVarID(int32 id); + void AssignVarID(int32_t id); // Reset the assigned object ID. void ResetVarID() { var_id_ = 0; } private: // This will be 0 if no ID has been assigned (this happens lazily). - int32 var_id_; + int32_t var_id_; DISALLOW_COPY_AND_ASSIGN(Var); }; @@ -100,7 +103,7 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> { class PPAPI_SHARED_EXPORT StringVar : public Var { public: explicit StringVar(const std::string& str); - StringVar(const char* str, uint32 len); + StringVar(const char* str, uint32_t len); ~StringVar() override; const std::string& value() const { return value_; } @@ -122,7 +125,7 @@ class PPAPI_SHARED_EXPORT StringVar : public Var { // The return value will have a reference count of 1. Internally, this will // create a StringVar and return the reference to it in the var. static PP_Var StringToPPVar(const std::string& str); - static PP_Var StringToPPVar(const char* str, uint32 len); + static PP_Var StringToPPVar(const char* str, uint32_t len); // Same as StringToPPVar but avoids a copy by destructively swapping the // given string into the newly created StringVar. The string must already be @@ -162,7 +165,7 @@ class PPAPI_SHARED_EXPORT ArrayBufferVar : public Var { virtual void* Map() = 0; virtual void Unmap() = 0; - virtual uint32 ByteLength() = 0; + virtual uint32_t ByteLength() = 0; // Creates a new shared memory region, and copies the data in the // ArrayBufferVar into it. On the plugin side, host_shm_handle_id will be set diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc index 7fabb80..eddceee 100644 --- a/ppapi/shared_impl/var_tracker.cc +++ b/ppapi/shared_impl/var_tracker.cc @@ -38,13 +38,13 @@ void VarTracker::CheckThreadingPreconditions() const { #endif } -int32 VarTracker::AddVar(Var* var) { +int32_t VarTracker::AddVar(Var* var) { CheckThreadingPreconditions(); return AddVarInternal(var, ADD_VAR_TAKE_ONE_REFERENCE); } -Var* VarTracker::GetVar(int32 var_id) const { +Var* VarTracker::GetVar(int32_t var_id) const { CheckThreadingPreconditions(); VarMap::const_iterator result = live_vars_.find(var_id); @@ -58,10 +58,10 @@ Var* VarTracker::GetVar(const PP_Var& var) const { if (!IsVarTypeRefcounted(var.type)) return NULL; - return GetVar(static_cast<int32>(var.value.as_id)); + return GetVar(static_cast<int32_t>(var.value.as_id)); } -bool VarTracker::AddRefVar(int32 var_id) { +bool VarTracker::AddRefVar(int32_t var_id) { CheckThreadingPreconditions(); DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR)) @@ -91,10 +91,10 @@ bool VarTracker::AddRefVar(const PP_Var& var) { if (!IsVarTypeRefcounted(var.type)) return true; - return AddRefVar(static_cast<int32>(var.value.as_id)); + return AddRefVar(static_cast<int32_t>(var.value.as_id)); } -bool VarTracker::ReleaseVar(int32 var_id) { +bool VarTracker::ReleaseVar(int32_t var_id) { CheckThreadingPreconditions(); DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR)) @@ -134,15 +134,15 @@ bool VarTracker::ReleaseVar(const PP_Var& var) { if (!IsVarTypeRefcounted(var.type)) return false; - return ReleaseVar(static_cast<int32>(var.value.as_id)); + return ReleaseVar(static_cast<int32_t>(var.value.as_id)); } -int32 VarTracker::AddVarInternal(Var* var, AddVarRefMode mode) { +int32_t VarTracker::AddVarInternal(Var* var, AddVarRefMode mode) { // If the plugin manages to create millions of strings. - if (last_var_id_ == std::numeric_limits<int32>::max() >> kPPIdTypeBits) + if (last_var_id_ == std::numeric_limits<int32_t>::max() >> kPPIdTypeBits) return 0; - int32 new_id = MakeTypedId(++last_var_id_, PP_ID_TYPE_VAR); + int32_t new_id = MakeTypedId(++last_var_id_, PP_ID_TYPE_VAR); std::pair<VarMap::iterator, bool> was_inserted = live_vars_.insert(std::make_pair( new_id, VarInfo(var, mode == ADD_VAR_TAKE_ONE_REFERENCE ? 1 : 0))); @@ -152,7 +152,7 @@ int32 VarTracker::AddVarInternal(Var* var, AddVarRefMode mode) { return new_id; } -VarTracker::VarMap::iterator VarTracker::GetLiveVar(int32 id) { +VarTracker::VarMap::iterator VarTracker::GetLiveVar(int32_t id) { return live_vars_.find(id); } @@ -181,15 +181,15 @@ bool VarTracker::IsVarTypeRefcounted(PP_VarType type) { } VarTracker::VarMap::iterator VarTracker::GetLiveVar(const PP_Var& var) { - return live_vars_.find(static_cast<int32>(var.value.as_id)); + return live_vars_.find(static_cast<int32_t>(var.value.as_id)); } VarTracker::VarMap::const_iterator VarTracker::GetLiveVar(const PP_Var& var) const { - return live_vars_.find(static_cast<int32>(var.value.as_id)); + return live_vars_.find(static_cast<int32_t>(var.value.as_id)); } -PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) { +PP_Var VarTracker::MakeArrayBufferPPVar(uint32_t size_in_bytes) { CheckThreadingPreconditions(); scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes)); @@ -198,7 +198,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) { return array_buffer->GetPPVar(); } -PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes, +PP_Var VarTracker::MakeArrayBufferPPVar(uint32_t size_in_bytes, const void* data) { CheckThreadingPreconditions(); @@ -206,7 +206,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes, return array_buffer ? array_buffer->GetPPVar() : PP_MakeNull(); } -ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes, +ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32_t size_in_bytes, const void* data) { CheckThreadingPreconditions(); @@ -217,7 +217,7 @@ ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes, return array_buffer; } -PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes, +PP_Var VarTracker::MakeArrayBufferPPVar(uint32_t size_in_bytes, base::SharedMemoryHandle handle) { CheckThreadingPreconditions(); diff --git a/ppapi/shared_impl/var_tracker.h b/ppapi/shared_impl/var_tracker.h index 814b58c..6ef9fc8 100644 --- a/ppapi/shared_impl/var_tracker.h +++ b/ppapi/shared_impl/var_tracker.h @@ -5,10 +5,12 @@ #ifndef PPAPI_SHARED_IMPL_VAR_TRACKER_H_ #define PPAPI_SHARED_IMPL_VAR_TRACKER_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" @@ -52,41 +54,42 @@ class PPAPI_SHARED_EXPORT VarTracker { virtual ~VarTracker(); // Called by the Var object to add a new var to the tracker. - int32 AddVar(Var* var); + int32_t AddVar(Var* var); // Looks up a given var and returns a reference to the Var if it exists. // Returns NULL if the var type is not an object we track (POD) or is // invalid. - Var* GetVar(int32 var_id) const; + Var* GetVar(int32_t var_id) const; Var* GetVar(const PP_Var& var) const; // Increases a previously-known Var ID's refcount, returning true on success, // false if the ID is invalid. The PP_Var version returns true and does // nothing for non-refcounted type vars. - bool AddRefVar(int32 var_id); + bool AddRefVar(int32_t var_id); bool AddRefVar(const PP_Var& var); // Decreases the given Var ID's refcount, returning true on success, false if // the ID is invalid or if the refcount was already 0. The PP_Var version // returns true and does nothing for non-refcounted type vars. The var will // be deleted if there are no more refs to it. - bool ReleaseVar(int32 var_id); + bool ReleaseVar(int32_t var_id); bool ReleaseVar(const PP_Var& var); // Create a new array buffer of size |size_in_bytes|. Return a PP_Var that // that references it and has an initial reference-count of 1. - PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes); + PP_Var MakeArrayBufferPPVar(uint32_t size_in_bytes); // Same as above, but copy the contents of |data| in to the new array buffer. - PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes, const void* data); + PP_Var MakeArrayBufferPPVar(uint32_t size_in_bytes, const void* data); // Same as above, but copy the contents of the shared memory in |h| // into the new array buffer. - PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes, base::SharedMemoryHandle h); + PP_Var MakeArrayBufferPPVar(uint32_t size_in_bytes, + base::SharedMemoryHandle h); // Create an ArrayBuffer and copy the contents of |data| in to it. The // returned object has 0 reference count in the tracker, and like all // RefCounted objects, has a 0 initial internal reference count. (You should // usually immediately put this in a scoped_refptr). - ArrayBufferVar* MakeArrayBufferVar(uint32 size_in_bytes, const void* data); + ArrayBufferVar* MakeArrayBufferVar(uint32_t size_in_bytes, const void* data); // Creates a new resource var from a resource creation message. Returns a // PP_Var that references a new PP_Resource, both with an initial reference @@ -137,7 +140,7 @@ class PPAPI_SHARED_EXPORT VarTracker { // host. Not implemented on the plugin side. virtual int TrackSharedMemoryHandle(PP_Instance instance, base::SharedMemoryHandle handle, - uint32 size_in_bytes) = 0; + uint32_t size_in_bytes) = 0; // Resolves an "id" generated by TrackSharedMemoryHandle back into // a SharedMemory handle and its size on the host. @@ -145,7 +148,7 @@ class PPAPI_SHARED_EXPORT VarTracker { virtual bool StopTrackingSharedMemoryHandle(int id, PP_Instance instance, base::SharedMemoryHandle* handle, - uint32* size_in_bytes) = 0; + uint32_t* size_in_bytes) = 0; protected: struct PPAPI_SHARED_EXPORT VarInfo { @@ -170,7 +173,7 @@ class PPAPI_SHARED_EXPORT VarTracker { // we know when we can stop tracking this object. int track_with_no_reference_count; }; - typedef base::hash_map<int32, VarInfo> VarMap; + typedef base::hash_map<int32_t, VarInfo> VarMap; // Specifies what should happen with the refcount when calling AddVarInternal. enum AddVarRefMode { @@ -186,10 +189,10 @@ class PPAPI_SHARED_EXPORT VarTracker { // initial refcount of the added object will be 0 or 1. // // Overridden in the plugin proxy to do additional object tracking. - virtual int32 AddVarInternal(Var* var, AddVarRefMode mode); + virtual int32_t AddVarInternal(Var* var, AddVarRefMode mode); // Convenience functions for doing lookups into the live_vars_ map. - VarMap::iterator GetLiveVar(int32 id); + VarMap::iterator GetLiveVar(int32_t id); VarMap::iterator GetLiveVar(const PP_Var& var); VarMap::const_iterator GetLiveVar(const PP_Var& var) const; @@ -217,15 +220,15 @@ class PPAPI_SHARED_EXPORT VarTracker { VarMap live_vars_; // Last assigned var ID. - int32 last_var_id_; + int32_t last_var_id_; private: // Create and return a new ArrayBufferVar size_in_bytes bytes long. This is // implemented by the Host and Plugin tracker separately, so that it can be // a real WebKit ArrayBuffer on the host side. - virtual ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) = 0; + virtual ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) = 0; virtual ArrayBufferVar* CreateShmArrayBuffer( - uint32 size_in_bytes, + uint32_t size_in_bytes, base::SharedMemoryHandle handle) = 0; // On the host side, we want to check that we are only called on the main diff --git a/ppapi/tests/blink_test_plugin.cc b/ppapi/tests/blink_test_plugin.cc index 91de50b..945989d 100644 --- a/ppapi/tests/blink_test_plugin.cc +++ b/ppapi/tests/blink_test_plugin.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 <sstream> #include <utility> diff --git a/ppapi/tests/extensions/background_keepalive/background.cc b/ppapi/tests/extensions/background_keepalive/background.cc index f4b3b7a..27c4761 100644 --- a/ppapi/tests/extensions/background_keepalive/background.cc +++ b/ppapi/tests/extensions/background_keepalive/background.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 <cstdio> #include <string> diff --git a/ppapi/tests/extensions/media_galleries/test_galleries.cc b/ppapi/tests/extensions/media_galleries/test_galleries.cc index 69b3ef9..10c4b98 100644 --- a/ppapi/tests/extensions/media_galleries/test_galleries.cc +++ b/ppapi/tests/extensions/media_galleries/test_galleries.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 <string> #include "ppapi/c/ppb_file_io.h" diff --git a/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.cc b/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.cc index 6f97378..34aeade 100644 --- a/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.cc +++ b/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.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 "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.cc b/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.cc index 0e284ea..d0e392e 100644 --- a/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.cc +++ b/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.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 "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/tests/extensions/packaged_app/test_packaged_app.cc b/ppapi/tests/extensions/packaged_app/test_packaged_app.cc index 5062b5a..4d17aab 100644 --- a/ppapi/tests/extensions/packaged_app/test_packaged_app.cc +++ b/ppapi/tests/extensions/packaged_app/test_packaged_app.cc @@ -3,6 +3,8 @@ // found in the LICENSE file. #include <pthread.h> +#include <stddef.h> +#include <stdint.h> #include <unistd.h> #include <sstream> diff --git a/ppapi/tests/extensions/socket_permissions/test_socket_permissions.cc b/ppapi/tests/extensions/socket_permissions/test_socket_permissions.cc index e01a8d6..da1b583 100644 --- a/ppapi/tests/extensions/socket_permissions/test_socket_permissions.cc +++ b/ppapi/tests/extensions/socket_permissions/test_socket_permissions.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 "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/tests/manual/delete_plugin.cc b/ppapi/tests/manual/delete_plugin.cc index 788100b..1753cdc 100644 --- a/ppapi/tests/manual/delete_plugin.cc +++ b/ppapi/tests/manual/delete_plugin.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 "ppapi/c/pp_errors.h" #include "ppapi/c/pp_input_event.h" #include "ppapi/c/ppb_var.h" diff --git a/ppapi/tests/power_saver_test_plugin.cc b/ppapi/tests/power_saver_test_plugin.cc index a3d85d9..f319649 100644 --- a/ppapi/tests/power_saver_test_plugin.cc +++ b/ppapi/tests/power_saver_test_plugin.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 <algorithm> #include "ppapi/cpp/graphics_2d.h" diff --git a/ppapi/tests/test_audio.cc b/ppapi/tests/test_audio.cc index 1c1c9b5..cbd8d5c 100644 --- a/ppapi/tests/test_audio.cc +++ b/ppapi/tests/test_audio.cc @@ -4,13 +4,14 @@ #include "ppapi/tests/test_audio.h" +#include <stddef.h> #include <string.h> -#include "ppapi/c/ppb_audio_config.h" #include "ppapi/c/ppb_audio.h" +#include "ppapi/c/ppb_audio_config.h" #include "ppapi/cpp/module.h" -#include "ppapi/tests/testing_instance.h" #include "ppapi/tests/test_utils.h" +#include "ppapi/tests/testing_instance.h" #if defined(__native_client__) #include "native_client/src/untrusted/irt/irt.h" diff --git a/ppapi/tests/test_audio.h b/ppapi/tests/test_audio.h index 63e06f4..972aea8 100644 --- a/ppapi/tests/test_audio.h +++ b/ppapi/tests/test_audio.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_AUDIO_H_ #define PAPPI_TESTS_TEST_AUDIO_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/ppb_audio.h" diff --git a/ppapi/tests/test_audio_config.cc b/ppapi/tests/test_audio_config.cc index 279852f..17ff356 100644 --- a/ppapi/tests/test_audio_config.cc +++ b/ppapi/tests/test_audio_config.cc @@ -4,6 +4,9 @@ #include "ppapi/tests/test_audio_config.h" +#include <stddef.h> +#include <stdint.h> + #include "ppapi/c/ppb_audio_config.h" #include "ppapi/cpp/module.h" #include "ppapi/tests/testing_instance.h" diff --git a/ppapi/tests/test_broker.cc b/ppapi/tests/test_broker.cc index 54b4671..40ac5b5 100644 --- a/ppapi/tests/test_broker.cc +++ b/ppapi/tests/test_broker.cc @@ -13,14 +13,17 @@ #include <unistd.h> #endif +#include <stddef.h> +#include <stdint.h> + #include <cstdio> #include <cstring> #include <fstream> #include <limits> #include "ppapi/c/pp_errors.h" -#include "ppapi/c/trusted/ppp_broker.h" #include "ppapi/c/trusted/ppb_broker_trusted.h" +#include "ppapi/c/trusted/ppp_broker.h" #include "ppapi/tests/test_utils.h" #include "ppapi/tests/testing_instance.h" diff --git a/ppapi/tests/test_browser_font.cc b/ppapi/tests/test_browser_font.cc index 689b421..84fd7c1 100644 --- a/ppapi/tests/test_browser_font.cc +++ b/ppapi/tests/test_browser_font.cc @@ -4,12 +4,13 @@ #include "ppapi/tests/test_browser_font.h" +#include <stdint.h> #include <string.h> -#include "ppapi/tests/test_utils.h" -#include "ppapi/tests/testing_instance.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/trusted/browser_font_trusted.h" +#include "ppapi/tests/test_utils.h" +#include "ppapi/tests/testing_instance.h" REGISTER_TEST_CASE(BrowserFont); diff --git a/ppapi/tests/test_buffer.cc b/ppapi/tests/test_buffer.cc index d143043..13e4253 100644 --- a/ppapi/tests/test_buffer.cc +++ b/ppapi/tests/test_buffer.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_buffer.h" +#include <stdint.h> + #include "ppapi/c/dev/ppb_buffer_dev.h" #include "ppapi/cpp/dev/buffer_dev.h" #include "ppapi/cpp/graphics_2d.h" diff --git a/ppapi/tests/test_case.cc b/ppapi/tests/test_case.cc index 307dd38..cdf7710 100644 --- a/ppapi/tests/test_case.cc +++ b/ppapi/tests/test_case.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_case.h" +#include <stddef.h> #include <string.h> #include <algorithm> diff --git a/ppapi/tests/test_case.h b/ppapi/tests/test_case.h index 42470f5..a198953 100644 --- a/ppapi/tests/test_case.h +++ b/ppapi/tests/test_case.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_CASE_H_ #define PPAPI_TESTS_TEST_CASE_H_ +#include <stdint.h> + #include <cmath> #include <limits> #include <map> diff --git a/ppapi/tests/test_char_set.h b/ppapi/tests/test_char_set.h index ad2c5f1..1094e49 100644 --- a/ppapi/tests/test_char_set.h +++ b/ppapi/tests/test_char_set.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_CHAR_SET_H_ #define PPAPI_TESTS_TEST_CHAR_SET_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/tests/test_compositor.h b/ppapi/tests/test_compositor.h index 6287e6d..5e418a9 100644 --- a/ppapi/tests/test_compositor.h +++ b/ppapi/tests/test_compositor.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_COMPOSITOR_H_ #define PAPPI_TESTS_TEST_COMPOSITOR_H_ +#include <stdint.h> + #include <set> #include <string> diff --git a/ppapi/tests/test_file_chooser.cc b/ppapi/tests/test_file_chooser.cc index 1e00f04..58addc5 100644 --- a/ppapi/tests/test_file_chooser.cc +++ b/ppapi/tests/test_file_chooser.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_file_chooser.h" +#include <stddef.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" #include "ppapi/cpp/dev/file_chooser_dev.h" diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc index cf2d226..eaafc7f 100644 --- a/ppapi/tests/test_file_io.cc +++ b/ppapi/tests/test_file_io.cc @@ -6,6 +6,7 @@ #include <errno.h> #include <fcntl.h> +#include <stddef.h> #include <stdio.h> #include <string.h> #include <sys/stat.h> diff --git a/ppapi/tests/test_file_io.h b/ppapi/tests/test_file_io.h index e01abcf..c7fc08f 100644 --- a/ppapi/tests/test_file_io.h +++ b/ppapi/tests/test_file_io.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_FILE_IO_H_ #define PAPPI_TESTS_TEST_FILE_IO_H_ +#include <stdint.h> + #include <string> #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_file_ref.cc b/ppapi/tests/test_file_ref.cc index 015f54c..3baef73 100644 --- a/ppapi/tests/test_file_ref.cc +++ b/ppapi/tests/test_file_ref.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_file_ref.h" +#include <stddef.h> #include <stdio.h> #include <sstream> diff --git a/ppapi/tests/test_file_ref.h b/ppapi/tests/test_file_ref.h index ff91215..3265698 100644 --- a/ppapi/tests/test_file_ref.h +++ b/ppapi/tests/test_file_ref.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_FILE_REF_H_ #define PAPPI_TESTS_TEST_FILE_REF_H_ +#include <stdint.h> + #include <string> #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_file_system.cc b/ppapi/tests/test_file_system.cc index 858e2e3..b3440fa 100644 --- a/ppapi/tests/test_file_system.cc +++ b/ppapi/tests/test_file_system.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_file_system.h" +#include <stdint.h> #include <string.h> #include "ppapi/c/pp_errors.h" diff --git a/ppapi/tests/test_flash_clipboard.h b/ppapi/tests/test_flash_clipboard.h index 824386c..a59c8e8 100644 --- a/ppapi/tests/test_flash_clipboard.h +++ b/ppapi/tests/test_flash_clipboard.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_FLASH_CLIPBOARD_H_ #define PPAPI_TESTS_TEST_FLASH_CLIPBOARD_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/private/ppb_flash_clipboard.h" diff --git a/ppapi/tests/test_flash_drm.cc b/ppapi/tests/test_flash_drm.cc index d76c640..b6bc6a7 100644 --- a/ppapi/tests/test_flash_drm.cc +++ b/ppapi/tests/test_flash_drm.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_flash_drm.h" +#include <stdint.h> + #if defined(PPAPI_OS_WIN) #include <Windows.h> #endif diff --git a/ppapi/tests/test_flash_file.h b/ppapi/tests/test_flash_file.h index fd62dd6..ab0bde9 100644 --- a/ppapi/tests/test_flash_file.h +++ b/ppapi/tests/test_flash_file.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_FLASH_FILE_H_ #define PPAPI_TESTS_TEST_FLASH_FILE_H_ +#include <stddef.h> + #include <string> #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_flash_fullscreen_for_browser_ui.h b/ppapi/tests/test_flash_fullscreen_for_browser_ui.h index de5d2e6..9bb80a4 100644 --- a/ppapi/tests/test_flash_fullscreen_for_browser_ui.h +++ b/ppapi/tests/test_flash_fullscreen_for_browser_ui.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_FLASH_FULLSCREEN_FOR_BROWSER_UI_H_ #define PPAPI_TESTS_TEST_FLASH_FULLSCREEN_FOR_BROWSER_UI_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/compositor.h" diff --git a/ppapi/tests/test_fullscreen.h b/ppapi/tests/test_fullscreen.h index bfe2e27..6324d3c 100644 --- a/ppapi/tests/test_fullscreen.h +++ b/ppapi/tests/test_fullscreen.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_FULLSCREEN_H_ #define PAPPI_TESTS_TEST_FULLSCREEN_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/fullscreen.h" diff --git a/ppapi/tests/test_graphics_3d.h b/ppapi/tests/test_graphics_3d.h index 2914f96..ec456ae 100644 --- a/ppapi/tests/test_graphics_3d.h +++ b/ppapi/tests/test_graphics_3d.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_GRAPHICS_3D_H_ #define PAPPI_TESTS_TEST_GRAPHICS_3D_H_ +#include <stdint.h> + #include <string> #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_host_resolver.cc b/ppapi/tests/test_host_resolver.cc index 27ecae1..3bdbdc3 100644 --- a/ppapi/tests/test_host_resolver.cc +++ b/ppapi/tests/test_host_resolver.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_host_resolver.h" +#include <stddef.h> + #include "ppapi/cpp/host_resolver.h" #include "ppapi/cpp/net_address.h" #include "ppapi/cpp/tcp_socket.h" diff --git a/ppapi/tests/test_host_resolver.h b/ppapi/tests/test_host_resolver.h index 5587c20..202371b 100644 --- a/ppapi/tests/test_host_resolver.h +++ b/ppapi/tests/test_host_resolver.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_HOST_RESOLVER_H_ #define PPAPI_TESTS_TEST_HOST_RESOLVER_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/ppb_host_resolver.h" diff --git a/ppapi/tests/test_host_resolver_private.cc b/ppapi/tests/test_host_resolver_private.cc index e13cb99..16cfd22 100644 --- a/ppapi/tests/test_host_resolver_private.cc +++ b/ppapi/tests/test_host_resolver_private.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_host_resolver_private.h" +#include <stddef.h> + #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/cpp/module_impl.h" #include "ppapi/cpp/private/host_resolver_private.h" diff --git a/ppapi/tests/test_host_resolver_private.h b/ppapi/tests/test_host_resolver_private.h index 52f1f27..927f0735 100644 --- a/ppapi/tests/test_host_resolver_private.h +++ b/ppapi/tests/test_host_resolver_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_H_ #define PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_H_ +#include <stdint.h> + #include <string> #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_host_resolver_private_disallowed.h b/ppapi/tests/test_host_resolver_private_disallowed.h index 564c858..5187b5a 100644 --- a/ppapi/tests/test_host_resolver_private_disallowed.h +++ b/ppapi/tests/test_host_resolver_private_disallowed.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_DISALLOWED_H_ #define PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_DISALLOWED_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/private/host_resolver_private.h" diff --git a/ppapi/tests/test_image_data.cc b/ppapi/tests/test_image_data.cc index 856eaa3..2bba061 100644 --- a/ppapi/tests/test_image_data.cc +++ b/ppapi/tests/test_image_data.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_image_data.h" +#include <stdint.h> + #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/tests/test_ime_input_event.h b/ppapi/tests/test_ime_input_event.h index db92935..2228015 100644 --- a/ppapi/tests/test_ime_input_event.h +++ b/ppapi/tests/test_ime_input_event.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_IME_INPUT_EVENT_H_ #define PPAPI_TESTS_TEST_IME_INPUT_EVENT_H_ +#include <stdint.h> + #include <string> #include <utility> #include <vector> diff --git a/ppapi/tests/test_input_event.h b/ppapi/tests/test_input_event.h index 88e7388..bc05fd0 100644 --- a/ppapi/tests/test_input_event.h +++ b/ppapi/tests/test_input_event.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_INPUT_EVENT_H_ #define PPAPI_TESTS_TEST_INPUT_EVENT_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/tests/test_media_stream_audio_track.cc b/ppapi/tests/test_media_stream_audio_track.cc index 6509f2a..3833aaa 100644 --- a/ppapi/tests/test_media_stream_audio_track.cc +++ b/ppapi/tests/test_media_stream_audio_track.cc @@ -9,6 +9,7 @@ // For MSVC. #define _USE_MATH_DEFINES #include <math.h> +#include <stddef.h> #include <stdint.h> #include <algorithm> diff --git a/ppapi/tests/test_media_stream_audio_track.h b/ppapi/tests/test_media_stream_audio_track.h index 1dcb3f3..291c865 100644 --- a/ppapi/tests/test_media_stream_audio_track.h +++ b/ppapi/tests/test_media_stream_audio_track.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_MEDIA_STREAM_AUDIO_TRACK_H_ #define PPAPI_TESTS_TEST_MEDIA_STREAM_AUDIO_TRACK_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/media_stream_audio_track.h" diff --git a/ppapi/tests/test_media_stream_video_track.cc b/ppapi/tests/test_media_stream_video_track.cc index b4f0186..91813a8 100644 --- a/ppapi/tests/test_media_stream_video_track.cc +++ b/ppapi/tests/test_media_stream_video_track.cc @@ -6,6 +6,9 @@ #include "ppapi/tests/test_media_stream_video_track.h" +#include <stddef.h> +#include <stdint.h> + #include "ppapi/c/private/ppb_testing_private.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/tests/test_memory.cc b/ppapi/tests/test_memory.cc index d4db7c2..612ab4e 100644 --- a/ppapi/tests/test_memory.cc +++ b/ppapi/tests/test_memory.cc @@ -4,6 +4,9 @@ #include "ppapi/tests/test_memory.h" +#include <stddef.h> +#include <stdint.h> + #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/tests/test_message_handler.cc b/ppapi/tests/test_message_handler.cc index bfb3be3..6fa1c13 100644 --- a/ppapi/tests/test_message_handler.cc +++ b/ppapi/tests/test_message_handler.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_message_handler.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <algorithm> #include <map> diff --git a/ppapi/tests/test_nacl_irt_stack_alignment.cc b/ppapi/tests/test_nacl_irt_stack_alignment.cc index 5b379c4..11b9173 100644 --- a/ppapi/tests/test_nacl_irt_stack_alignment.cc +++ b/ppapi/tests/test_nacl_irt_stack_alignment.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_nacl_irt_stack_alignment.h" +#include <stddef.h> + #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_var.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/tests/test_net_address.cc b/ppapi/tests/test_net_address.cc index f719ba5..ba0f28f 100644 --- a/ppapi/tests/test_net_address.cc +++ b/ppapi/tests/test_net_address.cc @@ -4,6 +4,9 @@ #include "ppapi/tests/test_net_address.h" +#include <stddef.h> +#include <stdint.h> + #include <cstring> #include "ppapi/cpp/net_address.h" diff --git a/ppapi/tests/test_net_address_private.cc b/ppapi/tests/test_net_address_private.cc index 00ba3da..82b9c37 100644 --- a/ppapi/tests/test_net_address_private.cc +++ b/ppapi/tests/test_net_address_private.cc @@ -4,10 +4,12 @@ #include "ppapi/tests/test_net_address_private.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> -#include "ppapi/cpp/private/net_address_private.h" #include "ppapi/c/private/ppb_net_address_private.h" +#include "ppapi/cpp/private/net_address_private.h" #include "ppapi/tests/test_utils.h" #include "ppapi/tests/testing_instance.h" diff --git a/ppapi/tests/test_net_address_private_untrusted.h b/ppapi/tests/test_net_address_private_untrusted.h index f1f0462..2f47f94 100644 --- a/ppapi/tests/test_net_address_private_untrusted.h +++ b/ppapi/tests/test_net_address_private_untrusted.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_ #define PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_ +#include <stdint.h> + #include <string> #include "ppapi/cpp/private/tcp_socket_private.h" diff --git a/ppapi/tests/test_network_monitor.cc b/ppapi/tests/test_network_monitor.cc index dcb712c..bee986c 100644 --- a/ppapi/tests/test_network_monitor.cc +++ b/ppapi/tests/test_network_monitor.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_network_monitor.h" +#include <stddef.h> #include <string.h> #include "ppapi/cpp/completion_callback.h" diff --git a/ppapi/tests/test_output_protection_private.cc b/ppapi/tests/test_output_protection_private.cc index 49a44ae..298d009 100644 --- a/ppapi/tests/test_output_protection_private.cc +++ b/ppapi/tests/test_output_protection_private.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_output_protection_private.h" +#include <stdint.h> + #include "ppapi/tests/testing_instance.h" REGISTER_TEST_CASE(OutputProtectionPrivate); diff --git a/ppapi/tests/test_platform_verification_private.cc b/ppapi/tests/test_platform_verification_private.cc index 922552a..422fe9f 100644 --- a/ppapi/tests/test_platform_verification_private.cc +++ b/ppapi/tests/test_platform_verification_private.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_platform_verification_private.h" +#include <stdint.h> + #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/private/platform_verification.h" diff --git a/ppapi/tests/test_post_message.cc b/ppapi/tests/test_post_message.cc index da560cf..6cc9d0b 100644 --- a/ppapi/tests/test_post_message.cc +++ b/ppapi/tests/test_post_message.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_post_message.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <algorithm> #include <map> diff --git a/ppapi/tests/test_printing.h b/ppapi/tests/test_printing.h index ceb0983..b076157 100644 --- a/ppapi/tests/test_printing.h +++ b/ppapi/tests/test_printing.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_PRINTING_H_ #define PPAPI_TESTS_TEST_PRINTING_H_ +#include <stdint.h> + #include <string> #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_tcp_server_socket_private.h b/ppapi/tests/test_tcp_server_socket_private.h index 1e25381..e54c788 100644 --- a/ppapi/tests/test_tcp_server_socket_private.h +++ b/ppapi/tests/test_tcp_server_socket_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_TCP_SERVER_SOCKET_PRIVATE_H_ #define PPAPI_TESTS_TEST_TCP_SERVER_SOCKET_PRIVATE_H_ +#include <stddef.h> + #include <cstddef> #include <string> diff --git a/ppapi/tests/test_tcp_socket.h b/ppapi/tests/test_tcp_socket.h index 8f7e2f4..92fe2ae 100644 --- a/ppapi/tests/test_tcp_socket.h +++ b/ppapi/tests/test_tcp_socket.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_TCP_SOCKET_H_ #define PAPPI_TESTS_TEST_TCP_SOCKET_H_ +#include <stddef.h> + #include <string> #include "ppapi/c/pp_stdint.h" diff --git a/ppapi/tests/test_tcp_socket_private.cc b/ppapi/tests/test_tcp_socket_private.cc index 0d43a76..ae7b472 100644 --- a/ppapi/tests/test_tcp_socket_private.cc +++ b/ppapi/tests/test_tcp_socket_private.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_tcp_socket_private.h" +#include <stddef.h> #include <stdlib.h> #include <new> diff --git a/ppapi/tests/test_test_internals.cc b/ppapi/tests/test_test_internals.cc index 7f78ca4..d1097bf 100644 --- a/ppapi/tests/test_test_internals.cc +++ b/ppapi/tests/test_test_internals.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_test_internals.h" +#include <stdint.h> + #include <vector> namespace { diff --git a/ppapi/tests/test_trace_event.cc b/ppapi/tests/test_trace_event.cc index 58f23a6..85004cc 100644 --- a/ppapi/tests/test_trace_event.cc +++ b/ppapi/tests/test_trace_event.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_trace_event.h" +#include <stdint.h> + #include "ppapi/cpp/module.h" #include "ppapi/tests/testing_instance.h" diff --git a/ppapi/tests/test_truetype_font.cc b/ppapi/tests/test_truetype_font.cc index 2295fe0..24c081b 100644 --- a/ppapi/tests/test_truetype_font.cc +++ b/ppapi/tests/test_truetype_font.cc @@ -6,6 +6,8 @@ #include "ppapi/tests/test_truetype_font.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <algorithm> #include <limits> diff --git a/ppapi/tests/test_udp_socket.h b/ppapi/tests/test_udp_socket.h index ee3e672..5307b39 100644 --- a/ppapi/tests/test_udp_socket.h +++ b/ppapi/tests/test_udp_socket.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_UDP_SOCKET_H_ #define PPAPI_TESTS_TEST_UDP_SOCKET_H_ +#include <stddef.h> + #include <string> #include "ppapi/c/pp_stdint.h" diff --git a/ppapi/tests/test_udp_socket_private.h b/ppapi/tests/test_udp_socket_private.h index e4a23c9..8ba4f00 100644 --- a/ppapi/tests/test_udp_socket_private.h +++ b/ppapi/tests/test_udp_socket_private.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_H_ #define PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_H_ +#include <stddef.h> + #include <string> #include "ppapi/c/pp_stdint.h" diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc index d3a210e..ab5c28a 100644 --- a/ppapi/tests/test_url_loader.cc +++ b/ppapi/tests/test_url_loader.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_url_loader.h" +#include <stddef.h> #include <stdio.h> #include <string.h> #include <string> diff --git a/ppapi/tests/test_url_loader.h b/ppapi/tests/test_url_loader.h index 76fd3a5..bea7401 100644 --- a/ppapi/tests/test_url_loader.h +++ b/ppapi/tests/test_url_loader.h @@ -5,6 +5,8 @@ #ifndef PAPPI_TESTS_TEST_URL_LOADER_H_ #define PAPPI_TESTS_TEST_URL_LOADER_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/private/ppb_file_io_private.h" diff --git a/ppapi/tests/test_url_request.cc b/ppapi/tests/test_url_request.cc index 7c9847b..891626f 100644 --- a/ppapi/tests/test_url_request.cc +++ b/ppapi/tests/test_url_request.cc @@ -6,6 +6,8 @@ #include "ppapi/tests/test_url_request.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <string> diff --git a/ppapi/tests/test_var.cc b/ppapi/tests/test_var.cc index f7de608..08fc833 100644 --- a/ppapi/tests/test_var.cc +++ b/ppapi/tests/test_var.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_var.h" +#include <stdint.h> #include <string.h> #include <limits> diff --git a/ppapi/tests/test_var_deprecated.cc b/ppapi/tests/test_var_deprecated.cc index d82cba1..3140457 100644 --- a/ppapi/tests/test_var_deprecated.cc +++ b/ppapi/tests/test_var_deprecated.cc @@ -4,12 +4,13 @@ #include "ppapi/tests/test_var_deprecated.h" +#include <stdint.h> #include <string.h> #include <limits> -#include "ppapi/c/pp_var.h" #include "ppapi/c/dev/ppb_var_deprecated.h" +#include "ppapi/c/pp_var.h" #include "ppapi/cpp/dev/scriptable_object_deprecated.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" diff --git a/ppapi/tests/test_var_resource.cc b/ppapi/tests/test_var_resource.cc index 5f185cc..c52280e 100644 --- a/ppapi/tests/test_var_resource.cc +++ b/ppapi/tests/test_var_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_var_resource.h" +#include <stdint.h> + #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/tests/test_view.cc b/ppapi/tests/test_view.cc index f8c20d8..bca172c 100644 --- a/ppapi/tests/test_view.cc +++ b/ppapi/tests/test_view.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/test_view.h" +#include <stddef.h> + #include <sstream> #include "ppapi/c/pp_time.h" diff --git a/ppapi/tests/test_view.h b/ppapi/tests/test_view.h index 06da974..6d4d2d6 100644 --- a/ppapi/tests/test_view.h +++ b/ppapi/tests/test_view.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TEST_TEST_VIEW_H_ #define PPAPI_TEST_TEST_VIEW_H_ +#include <stdint.h> + #include "ppapi/cpp/view.h" #include "ppapi/tests/test_case.h" diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc index 91046f2..98ef8bb 100644 --- a/ppapi/tests/test_websocket.cc +++ b/ppapi/tests/test_websocket.cc @@ -4,6 +4,7 @@ #include "ppapi/tests/test_websocket.h" +#include <stddef.h> #include <stdio.h> #include <string.h> diff --git a/ppapi/tests/test_websocket.h b/ppapi/tests/test_websocket.h index eff0a5e..7eed525 100644 --- a/ppapi/tests/test_websocket.h +++ b/ppapi/tests/test_websocket.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TEST_WEBSOCKET_H_ #define PPAPI_TESTS_TEST_WEBSOCKET_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/tests/test_x509_certificate_private.cc b/ppapi/tests/test_x509_certificate_private.cc index fab2f21..9a456f8 100644 --- a/ppapi/tests/test_x509_certificate_private.cc +++ b/ppapi/tests/test_x509_certificate_private.cc @@ -4,12 +4,14 @@ #include "ppapi/tests/test_x509_certificate_private.h" +#include <stdint.h> + #include <cmath> #include <limits> #include "ppapi/cpp/private/x509_certificate_private.h" -#include "ppapi/cpp/var_array_buffer.h" #include "ppapi/cpp/var.h" +#include "ppapi/cpp/var_array_buffer.h" #include "ppapi/tests/testing_instance.h" REGISTER_TEST_CASE(X509CertificatePrivate); diff --git a/ppapi/tests/testing_instance.cc b/ppapi/tests/testing_instance.cc index 71851f98..5c393d8 100644 --- a/ppapi/tests/testing_instance.cc +++ b/ppapi/tests/testing_instance.cc @@ -4,6 +4,8 @@ #include "ppapi/tests/testing_instance.h" +#include <stddef.h> + #include <algorithm> #include <cstring> #include <iomanip> diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h index 2b306a5..34de3f7 100644 --- a/ppapi/tests/testing_instance.h +++ b/ppapi/tests/testing_instance.h @@ -5,6 +5,8 @@ #ifndef PPAPI_TESTS_TESTING_INSTANCE_H_ #define PPAPI_TESTS_TESTING_INSTANCE_H_ +#include <stdint.h> + #include <string> #include "ppapi/utility/completion_callback_factory.h" diff --git a/ppapi/thunk/enter.h b/ppapi/thunk/enter.h index 4641cbb..307b446 100644 --- a/ppapi/thunk/enter.h +++ b/ppapi/thunk/enter.h @@ -5,9 +5,11 @@ #ifndef PPAPI_THUNK_ENTER_H_ #define PPAPI_THUNK_ENTER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_resource.h" diff --git a/ppapi/thunk/ppb_audio_api.h b/ppapi/thunk/ppb_audio_api.h index 892027c..e73f061 100644 --- a/ppapi/thunk/ppb_audio_api.h +++ b/ppapi/thunk/ppb_audio_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_AUDIO_API_H_ #define PPAPI_THUNK_PPB_AUDIO_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/ppb_audio.h" diff --git a/ppapi/thunk/ppb_audio_buffer_api.h b/ppapi/thunk/ppb_audio_buffer_api.h index 7c37e65..7be9220 100644 --- a/ppapi/thunk/ppb_audio_buffer_api.h +++ b/ppapi/thunk/ppb_audio_buffer_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_AUDIO_BUFFER_API_H_ #define PPAPI_THUNK_PPB_AUDIO_BUFFER_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_audio_buffer_thunk.cc b/ppapi/thunk/ppb_audio_buffer_thunk.cc index 178da8e..75e0f80 100644 --- a/ppapi/thunk/ppb_audio_buffer_thunk.cc +++ b/ppapi/thunk/ppb_audio_buffer_thunk.cc @@ -4,6 +4,8 @@ // From ppb_audio_buffer.idl modified Thu May 15 17:11:43 2014. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_audio_buffer.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_audio_config_api.h b/ppapi/thunk/ppb_audio_config_api.h index 17542fa..5faa6c4 100644 --- a/ppapi/thunk/ppb_audio_config_api.h +++ b/ppapi/thunk/ppb_audio_config_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_AUDIO_CONFIG_API_H_ #define PPAPI_THUNK_AUDIO_CONFIG_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_audio_config.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_audio_config_thunk.cc b/ppapi/thunk/ppb_audio_config_thunk.cc index b06affd..68d09f5 100644 --- a/ppapi/thunk/ppb_audio_config_thunk.cc +++ b/ppapi/thunk/ppb_audio_config_thunk.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "ppapi/shared_impl/ppb_audio_config_shared.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_audio_config_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_audio_encoder_api.h b/ppapi/thunk/ppb_audio_encoder_api.h index 68e1378..ee660fd 100644 --- a/ppapi/thunk/ppb_audio_encoder_api.h +++ b/ppapi/thunk/ppb_audio_encoder_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_AUDIO_ENCODER_API_H_ #define PPAPI_THUNK_AUDIO_ENCODER_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_audio_encoder.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_audio_encoder_thunk.cc b/ppapi/thunk/ppb_audio_encoder_thunk.cc index 25f8907..f8355bb 100644 --- a/ppapi/thunk/ppb_audio_encoder_thunk.cc +++ b/ppapi/thunk/ppb_audio_encoder_thunk.cc @@ -4,6 +4,8 @@ // From ppb_audio_encoder.idl modified Mon Sep 7 10:17:53 2015. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_audio_encoder.h" diff --git a/ppapi/thunk/ppb_audio_input_api.h b/ppapi/thunk/ppb_audio_input_api.h index 706417e..196a386 100644 --- a/ppapi/thunk/ppb_audio_input_api.h +++ b/ppapi/thunk/ppb_audio_input_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_AUDIO_INPUT_API_H_ #define PPAPI_THUNK_AUDIO_INPUT_API_H_ +#include <stdint.h> + #include <string> #include "base/memory/ref_counted.h" diff --git a/ppapi/thunk/ppb_audio_input_dev_thunk.cc b/ppapi/thunk/ppb_audio_input_dev_thunk.cc index 7d44a03..1115f53b 100644 --- a/ppapi/thunk/ppb_audio_input_dev_thunk.cc +++ b/ppapi/thunk/ppb_audio_input_dev_thunk.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 "ppapi/c/dev/ppb_audio_input_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/thunk/ppb_broker_thunk.cc b/ppapi/thunk/ppb_broker_thunk.cc index 0f2f1c9..43a82f3 100644 --- a/ppapi/thunk/ppb_broker_thunk.cc +++ b/ppapi/thunk/ppb_broker_thunk.cc @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/c/trusted/ppb_broker_trusted.h" +#include <stdint.h> + #include "ppapi/c/pp_errors.h" +#include "ppapi/c/trusted/ppb_broker_trusted.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/ppb_broker_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_browser_font_trusted_api.h b/ppapi/thunk/ppb_browser_font_trusted_api.h index 85c188a..7177002 100644 --- a/ppapi/thunk/ppb_browser_font_trusted_api.h +++ b/ppapi/thunk/ppb_browser_font_trusted_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_BROWSER_FONT_TRUSTED_API_H_ #define PPAPI_THUNK_PPB_BROWSER_FONT_TRUSTED_API_H_ +#include <stdint.h> + #include "ppapi/c/trusted/ppb_browser_font_trusted.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_browser_font_trusted_thunk.cc b/ppapi/thunk/ppb_browser_font_trusted_thunk.cc index db39982..ad1d017 100644 --- a/ppapi/thunk/ppb_browser_font_trusted_thunk.cc +++ b/ppapi/thunk/ppb_browser_font_trusted_thunk.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/thunk/thunk.h" +#include <stdint.h> + #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_browser_font_singleton_api.h" #include "ppapi/thunk/ppb_browser_font_trusted_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_buffer_thunk.cc b/ppapi/thunk/ppb_buffer_thunk.cc index 9c6698d..e09326d 100644 --- a/ppapi/thunk/ppb_buffer_thunk.cc +++ b/ppapi/thunk/ppb_buffer_thunk.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "ppapi/c/dev/ppb_buffer_dev.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_buffer_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_camera_capabilities_api.h b/ppapi/thunk/ppb_camera_capabilities_api.h index 34d5127..0adb22d 100644 --- a/ppapi/thunk/ppb_camera_capabilities_api.h +++ b/ppapi/thunk/ppb_camera_capabilities_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_CAMERA_CAPABILITIES_API_H_ #define PPAPI_THUNK_PPB_CAMERA_CAPABILITIES_API_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_camera_capabilities_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc b/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc index 85a64bb..3bfdd4c 100644 --- a/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc +++ b/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc @@ -5,6 +5,8 @@ // From private/ppb_camera_capabilities_private.idl modified Thu Feb 19 09:06:18 // 2015. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_camera_capabilities_private.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_camera_device_api.h b/ppapi/thunk/ppb_camera_device_api.h index 29e6a27..05924ec 100644 --- a/ppapi/thunk/ppb_camera_device_api.h +++ b/ppapi/thunk/ppb_camera_device_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_CAMERA_DEVICE_API_H_ #define PPAPI_THUNK_PPB_CAMERA_DEVICE_API_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/private/ppb_camera_device_private.h" diff --git a/ppapi/thunk/ppb_camera_device_private_thunk.cc b/ppapi/thunk/ppb_camera_device_private_thunk.cc index 94b3129..207d92f 100644 --- a/ppapi/thunk/ppb_camera_device_private_thunk.cc +++ b/ppapi/thunk/ppb_camera_device_private_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_camera_device_private.idl modified Wed Feb 18 16:44:52 2015. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_camera_device_private.h" diff --git a/ppapi/thunk/ppb_char_set_thunk.cc b/ppapi/thunk/ppb_char_set_thunk.cc index a663c55..bca66f7 100644 --- a/ppapi/thunk/ppb_char_set_thunk.cc +++ b/ppapi/thunk/ppb_char_set_thunk.cc @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/private/ppb_char_set_shared.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_compositor_api.h b/ppapi/thunk/ppb_compositor_api.h index 78a40ff..895f8f2 100644 --- a/ppapi/thunk/ppb_compositor_api.h +++ b/ppapi/thunk/ppb_compositor_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_COMPOSITOR_API_H_ #define PPAPI_THUNK_PPB_COMPOSITOR_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_compositor.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_compositor_layer_api.h b/ppapi/thunk/ppb_compositor_layer_api.h index 23635f3..392a2d7 100644 --- a/ppapi/thunk/ppb_compositor_layer_api.h +++ b/ppapi/thunk/ppb_compositor_layer_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_COMPOSITOR_LAYER_API_H_ #define PPAPI_THUNK_PPB_COMPOSITOR_LAYER_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_compositor_layer.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_compositor_layer_thunk.cc b/ppapi/thunk/ppb_compositor_layer_thunk.cc index 03afa5f..32d966c 100644 --- a/ppapi/thunk/ppb_compositor_layer_thunk.cc +++ b/ppapi/thunk/ppb_compositor_layer_thunk.cc @@ -4,6 +4,8 @@ // From ppb_compositor_layer.idl modified Thu Jan 29 16:28:15 2015. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_compositor_layer.h" diff --git a/ppapi/thunk/ppb_compositor_thunk.cc b/ppapi/thunk/ppb_compositor_thunk.cc index ffd9b8f..b640787 100644 --- a/ppapi/thunk/ppb_compositor_thunk.cc +++ b/ppapi/thunk/ppb_compositor_thunk.cc @@ -4,6 +4,8 @@ // From ppb_compositor.idl modified Thu Sep 18 11:36:39 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_compositor.h" diff --git a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc index abce20b..522d2c6 100644 --- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc +++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc @@ -5,6 +5,8 @@ // From private/ppb_content_decryptor_private.idl modified Mon Mar 30 22:35:33 // 2015. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_content_decryptor_private.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_display_color_profile_private_thunk.cc b/ppapi/thunk/ppb_display_color_profile_private_thunk.cc index 65e66bc..96f398e 100644 --- a/ppapi/thunk/ppb_display_color_profile_private_thunk.cc +++ b/ppapi/thunk/ppb_display_color_profile_private_thunk.cc @@ -5,6 +5,8 @@ // From private/ppb_display_color_profile_private.idl modified Mon Apr 7 // 08:56:43 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_display_color_profile_private.h" diff --git a/ppapi/thunk/ppb_ext_crx_file_system_private_thunk.cc b/ppapi/thunk/ppb_ext_crx_file_system_private_thunk.cc index 67f0ec8..48239f6 100644 --- a/ppapi/thunk/ppb_ext_crx_file_system_private_thunk.cc +++ b/ppapi/thunk/ppb_ext_crx_file_system_private_thunk.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 "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_ext_crx_file_system_private.h" diff --git a/ppapi/thunk/ppb_file_chooser_api.h b/ppapi/thunk/ppb_file_chooser_api.h index 15cc9e4..6832186 100644 --- a/ppapi/thunk/ppb_file_chooser_api.h +++ b/ppapi/thunk/ppb_file_chooser_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FILE_CHOOSER_API_H_ #define PPAPI_THUNK_PPB_FILE_CHOOSER_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/dev/ppb_file_chooser_dev.h" diff --git a/ppapi/thunk/ppb_file_chooser_dev_thunk.cc b/ppapi/thunk/ppb_file_chooser_dev_thunk.cc index d41d87b..88594df 100644 --- a/ppapi/thunk/ppb_file_chooser_dev_thunk.cc +++ b/ppapi/thunk/ppb_file_chooser_dev_thunk.cc @@ -4,6 +4,8 @@ // From dev/ppb_file_chooser_dev.idl modified Fri Feb 7 08:29:41 2014. +#include <stdint.h> + #include "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc b/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc index 2d95be6..b01bfbc 100644 --- a/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc +++ b/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc @@ -4,6 +4,8 @@ // From trusted/ppb_file_chooser_trusted.idl modified Fri Feb 7 08:29:41 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" diff --git a/ppapi/thunk/ppb_file_io_api.h b/ppapi/thunk/ppb_file_io_api.h index c1e78d4..42d4bd8 100644 --- a/ppapi/thunk/ppb_file_io_api.h +++ b/ppapi/thunk/ppb_file_io_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FILE_IO_API_H_ #define PPAPI_THUNK_PPB_FILE_IO_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_file_io.h" #include "ppapi/c/private/pp_file_handle.h" diff --git a/ppapi/thunk/ppb_file_io_private_thunk.cc b/ppapi/thunk/ppb_file_io_private_thunk.cc index 20c7971..34e855d 100644 --- a/ppapi/thunk/ppb_file_io_private_thunk.cc +++ b/ppapi/thunk/ppb_file_io_private_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_file_io_private.idl modified Tue Mar 26 15:29:46 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_file_io_private.h" diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc index 50f302e..6c23a2f 100644 --- a/ppapi/thunk/ppb_file_io_thunk.cc +++ b/ppapi/thunk/ppb_file_io_thunk.cc @@ -4,6 +4,8 @@ // From ppb_file_io.idl modified Mon Nov 11 16:02:07 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" diff --git a/ppapi/thunk/ppb_file_ref_api.h b/ppapi/thunk/ppb_file_ref_api.h index 2a27af5e8..b6dfa77 100644 --- a/ppapi/thunk/ppb_file_ref_api.h +++ b/ppapi/thunk/ppb_file_ref_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FILE_REF_API_H_ #define PPAPI_THUNK_PPB_FILE_REF_API_H_ +#include <stdint.h> + #include <vector> #include "base/memory/linked_ptr.h" diff --git a/ppapi/thunk/ppb_file_ref_thunk.cc b/ppapi/thunk/ppb_file_ref_thunk.cc index ef31e922..86e472d 100644 --- a/ppapi/thunk/ppb_file_ref_thunk.cc +++ b/ppapi/thunk/ppb_file_ref_thunk.cc @@ -2,19 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/c/pp_file_info.h" -#include "ppapi/c/ppb_file_ref.h" +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/pp_file_info.h" +#include "ppapi/c/ppb_file_ref.h" #include "ppapi/c/private/ppb_file_ref_private.h" #include "ppapi/shared_impl/file_ref_create_info.h" #include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/ppb_file_ref_api.h" #include "ppapi/thunk/ppb_file_system_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_file_system_api.h b/ppapi/thunk/ppb_file_system_api.h index 0351bde..76e31b7 100644 --- a/ppapi/thunk/ppb_file_system_api.h +++ b/ppapi/thunk/ppb_file_system_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FILE_SYSTEM_API_H_ #define PPAPI_THUNK_PPB_FILE_SYSTEM_API_H_ +#include <stdint.h> + #include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_file_system.h" diff --git a/ppapi/thunk/ppb_file_system_thunk.cc b/ppapi/thunk/ppb_file_system_thunk.cc index 9a3dfd5..e8b5ff0 100644 --- a/ppapi/thunk/ppb_file_system_thunk.cc +++ b/ppapi/thunk/ppb_file_system_thunk.cc @@ -4,6 +4,8 @@ // From ppb_file_system.idl modified Wed May 15 13:57:07 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_system.h" diff --git a/ppapi/thunk/ppb_find_private_thunk.cc b/ppapi/thunk/ppb_find_private_thunk.cc index 0bd37d6..0766b84 100644 --- a/ppapi/thunk/ppb_find_private_thunk.cc +++ b/ppapi/thunk/ppb_find_private_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_find_private.idl modified Mon Apr 7 08:56:43 2014. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_find_private.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_flash_clipboard_api.h b/ppapi/thunk/ppb_flash_clipboard_api.h index 6d39bbe..96614b6 100644 --- a/ppapi/thunk/ppb_flash_clipboard_api.h +++ b/ppapi/thunk/ppb_flash_clipboard_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FLASH_CLIPBOARD_API_H_ #define PPAPI_THUNK_PPB_FLASH_CLIPBOARD_API_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/shared_impl/singleton_resource_id.h" diff --git a/ppapi/thunk/ppb_flash_clipboard_thunk.cc b/ppapi/thunk/ppb_flash_clipboard_thunk.cc index 95e4ba5..8c925e7 100644 --- a/ppapi/thunk/ppb_flash_clipboard_thunk.cc +++ b/ppapi/thunk/ppb_flash_clipboard_thunk.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/memory/scoped_ptr.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_clipboard.h" diff --git a/ppapi/thunk/ppb_flash_device_id_thunk.cc b/ppapi/thunk/ppb_flash_device_id_thunk.cc index 43432a0..cf4c33c 100644 --- a/ppapi/thunk/ppb_flash_device_id_thunk.cc +++ b/ppapi/thunk/ppb_flash_device_id_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_flash_device_id.idl modified Thu Dec 20 13:10:26 2012. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_device_id.h" diff --git a/ppapi/thunk/ppb_flash_drm_api.h b/ppapi/thunk/ppb_flash_drm_api.h index 9937bef..95bb354 100644 --- a/ppapi/thunk/ppb_flash_drm_api.h +++ b/ppapi/thunk/ppb_flash_drm_api.h @@ -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/memory/ref_counted.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_flash_drm_thunk.cc b/ppapi/thunk/ppb_flash_drm_thunk.cc index 7f9026d..d80e3b8 100644 --- a/ppapi/thunk/ppb_flash_drm_thunk.cc +++ b/ppapi/thunk/ppb_flash_drm_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_flash_drm.idl modified Mon Apr 7 08:56:43 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_drm.h" diff --git a/ppapi/thunk/ppb_flash_file_fileref_thunk.cc b/ppapi/thunk/ppb_flash_file_fileref_thunk.cc index 8ea0f24..b37e391 100644 --- a/ppapi/thunk/ppb_flash_file_fileref_thunk.cc +++ b/ppapi/thunk/ppb_flash_file_fileref_thunk.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 "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/thunk/ppb_flash_file_modulelocal_thunk.cc b/ppapi/thunk/ppb_flash_file_modulelocal_thunk.cc index 11962e4..bc0ed8b 100644 --- a/ppapi/thunk/ppb_flash_file_modulelocal_thunk.cc +++ b/ppapi/thunk/ppb_flash_file_modulelocal_thunk.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 "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/thunk/ppb_flash_font_file_thunk.cc b/ppapi/thunk/ppb_flash_font_file_thunk.cc index aaa81fa..ea732cd 100644 --- a/ppapi/thunk/ppb_flash_font_file_thunk.cc +++ b/ppapi/thunk/ppb_flash_font_file_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_flash_font_file.idl modified Thu Oct 22 22:02:40 2015. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_font_file.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_flash_functions_api.h b/ppapi/thunk/ppb_flash_functions_api.h index b746243..ddc94b0 100644 --- a/ppapi/thunk/ppb_flash_functions_api.h +++ b/ppapi/thunk/ppb_flash_functions_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FLASH_FUNCTIONS_API_H_ #define PPAPI_THUNK_PPB_FLASH_FUNCTIONS_API_H_ +#include <stdint.h> + #include <string> #include "ppapi/c/private/ppb_flash.h" diff --git a/ppapi/thunk/ppb_flash_menu_api.h b/ppapi/thunk/ppb_flash_menu_api.h index 410bda5..e25074d 100644 --- a/ppapi/thunk/ppb_flash_menu_api.h +++ b/ppapi/thunk/ppb_flash_menu_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FLASH_MENU_API_H_ #define PPAPI_THUNK_PPB_FLASH_MENU_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_flash_menu.h" diff --git a/ppapi/thunk/ppb_flash_menu_thunk.cc b/ppapi/thunk/ppb_flash_menu_thunk.cc index e0d190d..57af470 100644 --- a/ppapi/thunk/ppb_flash_menu_thunk.cc +++ b/ppapi/thunk/ppb_flash_menu_thunk.cc @@ -2,14 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/c/private/ppb_flash_menu.h" +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/private/ppb_flash_menu.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/ppb_flash_menu_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_flash_message_loop_api.h b/ppapi/thunk/ppb_flash_message_loop_api.h index 618eace..e9520e3 100644 --- a/ppapi/thunk/ppb_flash_message_loop_api.h +++ b/ppapi/thunk/ppb_flash_message_loop_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_FLASH_MESSAGE_LOOP_API_H_ #define PPAPI_THUNK_PPB_FLASH_MESSAGE_LOOP_API_H_ +#include <stdint.h> + #include "base/callback_forward.h" #include "ppapi/c/private/ppb_flash_message_loop.h" diff --git a/ppapi/thunk/ppb_flash_message_loop_thunk.cc b/ppapi/thunk/ppb_flash_message_loop_thunk.cc index 583bc49..1b075a2 100644 --- a/ppapi/thunk/ppb_flash_message_loop_thunk.cc +++ b/ppapi/thunk/ppb_flash_message_loop_thunk.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 "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc index 574df87..0f23551 100644 --- a/ppapi/thunk/ppb_flash_thunk.cc +++ b/ppapi/thunk/ppb_flash_thunk.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/logging.h" #include "ppapi/c/pp_array_output.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/thunk/ppb_graphics_2d_api.h b/ppapi/thunk/ppb_graphics_2d_api.h index cdb07cc..164072f 100644 --- a/ppapi/thunk/ppb_graphics_2d_api.h +++ b/ppapi/thunk/ppb_graphics_2d_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_GRAPHICS_2D_API_H_ #define PPAPI_THUNK_PPB_GRAPHICS_2D_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" diff --git a/ppapi/thunk/ppb_graphics_2d_thunk.cc b/ppapi/thunk/ppb_graphics_2d_thunk.cc index 9602239..7ecbb35 100644 --- a/ppapi/thunk/ppb_graphics_2d_thunk.cc +++ b/ppapi/thunk/ppb_graphics_2d_thunk.cc @@ -4,6 +4,7 @@ // From ppb_graphics_2d.idl modified Wed May 15 13:57:07 2013. +#include <stdint.h> #include <string.h> #include "ppapi/c/pp_completion_callback.h" diff --git a/ppapi/thunk/ppb_graphics_3d_api.h b/ppapi/thunk/ppb_graphics_3d_api.h index f75f660..a75efa1 100644 --- a/ppapi/thunk/ppb_graphics_3d_api.h +++ b/ppapi/thunk/ppb_graphics_3d_api.h @@ -5,10 +5,12 @@ #ifndef PPAPI_THUNK_PPB_GRAPHICS_3D_API_H_ #define PPAPI_THUNK_PPB_GRAPHICS_3D_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "gpu/command_buffer/common/command_buffer.h" -#include "ppapi/c/ppb_graphics_3d.h" #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" +#include "ppapi/c/ppb_graphics_3d.h" #include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { diff --git a/ppapi/thunk/ppb_graphics_3d_thunk.cc b/ppapi/thunk/ppb_graphics_3d_thunk.cc index 92f9886..437ad44 100644 --- a/ppapi/thunk/ppb_graphics_3d_thunk.cc +++ b/ppapi/thunk/ppb_graphics_3d_thunk.cc @@ -4,6 +4,8 @@ // From ppb_graphics_3d.idl modified Fri Nov 1 16:12:12 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_graphics_3d.h" diff --git a/ppapi/thunk/ppb_host_resolver_api.h b/ppapi/thunk/ppb_host_resolver_api.h index f2acde2..c64b05b 100644 --- a/ppapi/thunk/ppb_host_resolver_api.h +++ b/ppapi/thunk/ppb_host_resolver_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_HOST_RESOLVER_API_H_ #define PPAPI_THUNK_PPB_HOST_RESOLVER_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_host_resolver.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_host_resolver_private_api.h b/ppapi/thunk/ppb_host_resolver_private_api.h index 446ab20..92e0ac7 100644 --- a/ppapi/thunk/ppb_host_resolver_private_api.h +++ b/ppapi/thunk/ppb_host_resolver_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_HOST_RESOLVER_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_HOST_RESOLVER_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_host_resolver_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_host_resolver_private_thunk.cc b/ppapi/thunk/ppb_host_resolver_private_thunk.cc index 9da6656..b07a1f7 100644 --- a/ppapi/thunk/ppb_host_resolver_private_thunk.cc +++ b/ppapi/thunk/ppb_host_resolver_private_thunk.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 "ppapi/c/pp_var.h" #include "ppapi/c/private/ppb_host_resolver_private.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_host_resolver_thunk.cc b/ppapi/thunk/ppb_host_resolver_thunk.cc index 47d9ad0..08e2aa2 100644 --- a/ppapi/thunk/ppb_host_resolver_thunk.cc +++ b/ppapi/thunk/ppb_host_resolver_thunk.cc @@ -4,6 +4,8 @@ // From ppb_host_resolver.idl modified Mon Jun 24 15:10:54 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_host_resolver.h" diff --git a/ppapi/thunk/ppb_image_data_api.h b/ppapi/thunk/ppb_image_data_api.h index 5428ded..ec2a716 100644 --- a/ppapi/thunk/ppb_image_data_api.h +++ b/ppapi/thunk/ppb_image_data_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_IMAGE_DATA_API_H_ #define PPAPI_THUNK_PPB_IMAGE_DATA_API_H_ +#include <stdint.h> + #include "ppapi/c/pp_bool.h" #include "ppapi/c/ppb_image_data.h" diff --git a/ppapi/thunk/ppb_input_event_api.h b/ppapi/thunk/ppb_input_event_api.h index 00627353..c2e7d0f 100644 --- a/ppapi/thunk/ppb_input_event_api.h +++ b/ppapi/thunk/ppb_input_event_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_INPUT_EVENT_API_H_ #define PPAPI_THUNK_PPB_INPUT_EVENT_API_H_ +#include <stdint.h> + #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc index c29b56c..f77dd9f 100644 --- a/ppapi/thunk/ppb_input_event_thunk.cc +++ b/ppapi/thunk/ppb_input_event_thunk.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 "ppapi/c/pp_errors.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_input_event_api.h" diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h index f4c9d0d..3657c87 100644 --- a/ppapi/thunk/ppb_instance_api.h +++ b/ppapi/thunk/ppb_instance_api.h @@ -5,8 +5,11 @@ #ifndef PPAPI_THUNK_INSTANCE_API_H_ #define PPAPI_THUNK_INSTANCE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "ppapi/c/dev/ppb_url_util_dev.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" @@ -148,14 +151,14 @@ class PPB_Instance_API { PP_URLComponents_Dev* components) = 0; #if !defined(OS_NACL) // Content Decryptor. - virtual void PromiseResolved(PP_Instance instance, uint32 promise_id) = 0; + virtual void PromiseResolved(PP_Instance instance, uint32_t promise_id) = 0; virtual void PromiseResolvedWithSession(PP_Instance instance, - uint32 promise_id, + uint32_t promise_id, PP_Var session_id_var) = 0; virtual 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) = 0; virtual void SessionMessage(PP_Instance instance, PP_Var session_id_var, @@ -175,7 +178,7 @@ class PPB_Instance_API { virtual 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) = 0; virtual void DeliverBlock(PP_Instance instance, PP_Resource decrypted_block, diff --git a/ppapi/thunk/ppb_isolated_file_system_private_api.h b/ppapi/thunk/ppb_isolated_file_system_private_api.h index bca2332..d5593760 100644 --- a/ppapi/thunk/ppb_isolated_file_system_private_api.h +++ b/ppapi/thunk/ppb_isolated_file_system_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_ISOLATED_FILE_SYSTEM_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_ISOLATED_FILE_SYSTEM_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h" #include "ppapi/shared_impl/singleton_resource_id.h" diff --git a/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc b/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc index 4e1940a..480c34a 100644 --- a/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc +++ b/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc @@ -5,6 +5,8 @@ // From private/ppb_isolated_file_system_private.idl modified Tue Dec 3 // 11:01:20 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h" diff --git a/ppapi/thunk/ppb_media_stream_audio_track_api.h b/ppapi/thunk/ppb_media_stream_audio_track_api.h index 2c43136..323b654 100644 --- a/ppapi/thunk/ppb_media_stream_audio_track_api.h +++ b/ppapi/thunk/ppb_media_stream_audio_track_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_MEDIA_STREAM_AUDIO_TRACK_API_H_ #define PPAPI_THUNK_PPB_MEDIA_STREAM_AUDIO_TRACK_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_media_stream_audio_track.h" namespace ppapi { diff --git a/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc b/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc index c63cfe9..fcdb4c4 100644 --- a/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc +++ b/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc @@ -4,6 +4,8 @@ // From ppb_media_stream_audio_track.idl modified Thu Sep 18 11:36:39 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_media_stream_audio_track.h" diff --git a/ppapi/thunk/ppb_media_stream_video_track_api.h b/ppapi/thunk/ppb_media_stream_video_track_api.h index 6cee06a..a1489e6 100644 --- a/ppapi/thunk/ppb_media_stream_video_track_api.h +++ b/ppapi/thunk/ppb_media_stream_video_track_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_MEDIA_STREAM_VIDEO_TRACK_API_H_ #define PPAPI_THUNK_PPB_MEDIA_STREAM_VIDEO_TRACK_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_media_stream_video_track.h" namespace ppapi { diff --git a/ppapi/thunk/ppb_media_stream_video_track_thunk.cc b/ppapi/thunk/ppb_media_stream_video_track_thunk.cc index d8ee921..2d640c2 100644 --- a/ppapi/thunk/ppb_media_stream_video_track_thunk.cc +++ b/ppapi/thunk/ppb_media_stream_video_track_thunk.cc @@ -4,6 +4,8 @@ // From ppb_media_stream_video_track.idl modified Thu Sep 18 11:36:39 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_media_stream_video_track.h" diff --git a/ppapi/thunk/ppb_messaging_thunk.cc b/ppapi/thunk/ppb_messaging_thunk.cc index 94ba4aa..a8b3c1a 100644 --- a/ppapi/thunk/ppb_messaging_thunk.cc +++ b/ppapi/thunk/ppb_messaging_thunk.cc @@ -4,6 +4,8 @@ // From ppb_messaging.idl modified Tue Mar 24 16:53:47 2015. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_messaging.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_mouse_lock_thunk.cc b/ppapi/thunk/ppb_mouse_lock_thunk.cc index 65126d8..ec1a29e 100644 --- a/ppapi/thunk/ppb_mouse_lock_thunk.cc +++ b/ppapi/thunk/ppb_mouse_lock_thunk.cc @@ -4,6 +4,8 @@ // From ppb_mouse_lock.idl modified Wed May 15 13:57:07 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_mouse_lock.h" diff --git a/ppapi/thunk/ppb_network_list_api.h b/ppapi/thunk/ppb_network_list_api.h index df27a20..10b4046 100644 --- a/ppapi/thunk/ppb_network_list_api.h +++ b/ppapi/thunk/ppb_network_list_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_NETWORK_LIST_API_H_ #define PPAPI_THUNK_PPB_NETWORK_LIST_API_H_ +#include <stdint.h> + #include <vector> #include "ppapi/c/ppb_network_list.h" diff --git a/ppapi/thunk/ppb_network_list_thunk.cc b/ppapi/thunk/ppb_network_list_thunk.cc index 5a10810..42df315 100644 --- a/ppapi/thunk/ppb_network_list_thunk.cc +++ b/ppapi/thunk/ppb_network_list_thunk.cc @@ -4,6 +4,8 @@ // From ppb_network_list.idl modified Fri Nov 1 16:12:12 2013. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_network_list.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_network_monitor_api.h b/ppapi/thunk/ppb_network_monitor_api.h index c787324..63e22e2 100644 --- a/ppapi/thunk/ppb_network_monitor_api.h +++ b/ppapi/thunk/ppb_network_monitor_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_NETWORK_MONITOR_API_H_ #define PPAPI_THUNK_PPB_NETWORK_MONITOR_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_network_monitor.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_network_monitor_thunk.cc b/ppapi/thunk/ppb_network_monitor_thunk.cc index adc75d6..7d37ac5 100644 --- a/ppapi/thunk/ppb_network_monitor_thunk.cc +++ b/ppapi/thunk/ppb_network_monitor_thunk.cc @@ -4,6 +4,8 @@ // From ppb_network_monitor.idl modified Fri Nov 1 16:12:12 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_network_monitor.h" diff --git a/ppapi/thunk/ppb_network_proxy_api.h b/ppapi/thunk/ppb_network_proxy_api.h index 3cefaa0..9f33e31 100644 --- a/ppapi/thunk/ppb_network_proxy_api.h +++ b/ppapi/thunk/ppb_network_proxy_api.h @@ -5,7 +5,8 @@ #ifndef PPAPI_THUNK_PPB_NETWORK_PROXY_API_H_ #define PPAPI_THUNK_PPB_NETWORK_PROXY_API_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/singleton_resource_id.h" diff --git a/ppapi/thunk/ppb_network_proxy_thunk.cc b/ppapi/thunk/ppb_network_proxy_thunk.cc index 4fffe7f..e14ab0d 100644 --- a/ppapi/thunk/ppb_network_proxy_thunk.cc +++ b/ppapi/thunk/ppb_network_proxy_thunk.cc @@ -4,6 +4,8 @@ // From ppb_network_proxy.idl modified Tue Jun 25 15:45:53 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_network_proxy.h" diff --git a/ppapi/thunk/ppb_output_protection_api.h b/ppapi/thunk/ppb_output_protection_api.h index 8a12090..a139a73 100644 --- a/ppapi/thunk/ppb_output_protection_api.h +++ b/ppapi/thunk/ppb_output_protection_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_OUTPUT_PROTECTION_API_H_ #define PPAPI_THUNK_OUTPUT_PROTECTION_API_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_output_protection_private.h" namespace ppapi { diff --git a/ppapi/thunk/ppb_output_protection_private_thunk.cc b/ppapi/thunk/ppb_output_protection_private_thunk.cc index 8b5ab5b..c92885a 100644 --- a/ppapi/thunk/ppb_output_protection_private_thunk.cc +++ b/ppapi/thunk/ppb_output_protection_private_thunk.cc @@ -5,6 +5,8 @@ // From private/ppb_output_protection_private.idl modified Fri Nov 1 16:12:12 // 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_output_protection_private.h" diff --git a/ppapi/thunk/ppb_pdf_thunk.cc b/ppapi/thunk/ppb_pdf_thunk.cc index 8c44784..4966bd4 100644 --- a/ppapi/thunk/ppb_pdf_thunk.cc +++ b/ppapi/thunk/ppb_pdf_thunk.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/logging.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_pdf.h" diff --git a/ppapi/thunk/ppb_platform_verification_api.h b/ppapi/thunk/ppb_platform_verification_api.h index 3f7f188..2a12e296 100644 --- a/ppapi/thunk/ppb_platform_verification_api.h +++ b/ppapi/thunk/ppb_platform_verification_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_PLATFORM_VERIFICATION_API_H_ #define PPAPI_THUNK_PPB_PLATFORM_VERIFICATION_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_platform_verification_private_thunk.cc b/ppapi/thunk/ppb_platform_verification_private_thunk.cc index 817df16..d751cd3 100644 --- a/ppapi/thunk/ppb_platform_verification_private_thunk.cc +++ b/ppapi/thunk/ppb_platform_verification_private_thunk.cc @@ -5,6 +5,8 @@ // From private/ppb_platform_verification_private.idl modified Fri Nov 1 // 16:12:12 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_platform_verification_private.h" diff --git a/ppapi/thunk/ppb_printing_api.h b/ppapi/thunk/ppb_printing_api.h index ac604ef..8a7a9a7 100644 --- a/ppapi/thunk/ppb_printing_api.h +++ b/ppapi/thunk/ppb_printing_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_PRINTING_API_H_ #define PPAPI_THUNK_PPB_PRINTING_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/dev/ppb_printing_dev.h" diff --git a/ppapi/thunk/ppb_printing_dev_thunk.cc b/ppapi/thunk/ppb_printing_dev_thunk.cc index 5dffc7c..88bca98 100644 --- a/ppapi/thunk/ppb_printing_dev_thunk.cc +++ b/ppapi/thunk/ppb_printing_dev_thunk.cc @@ -4,6 +4,8 @@ // From dev/ppb_printing_dev.idl modified Tue May 7 14:43:00 2013. +#include <stdint.h> + #include "ppapi/c/dev/ppb_printing_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/thunk/ppb_tcp_server_socket_private_api.h b/ppapi/thunk/ppb_tcp_server_socket_private_api.h index 0ca23d1..90a18db 100644 --- a/ppapi/thunk/ppb_tcp_server_socket_private_api.h +++ b/ppapi/thunk/ppb_tcp_server_socket_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_TCP_SERVER_SOCKET_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_TCP_SERVER_SOCKET_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_tcp_server_socket_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_tcp_server_socket_private_thunk.cc b/ppapi/thunk/ppb_tcp_server_socket_private_thunk.cc index bbfe16d..a335fd7 100644 --- a/ppapi/thunk/ppb_tcp_server_socket_private_thunk.cc +++ b/ppapi/thunk/ppb_tcp_server_socket_private_thunk.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 "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_tcp_server_socket_private.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_tcp_socket_api.h b/ppapi/thunk/ppb_tcp_socket_api.h index a3cefed..e2c8d33 100644 --- a/ppapi/thunk/ppb_tcp_socket_api.h +++ b/ppapi/thunk/ppb_tcp_socket_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_TCP_SOCKET_API_H_ #define PPAPI_THUNK_PPB_TCP_SOCKET_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_tcp_socket.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_tcp_socket_private_api.h b/ppapi/thunk/ppb_tcp_socket_private_api.h index ebc8070..b6c8ee5 100644 --- a/ppapi/thunk/ppb_tcp_socket_private_api.h +++ b/ppapi/thunk/ppb_tcp_socket_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_TCP_SOCKET_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_TCP_SOCKET_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_tcp_socket_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc index 928f073..5c677b4 100644 --- a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc +++ b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc @@ -2,14 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_tcp_socket_private.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/ppb_tcp_socket_private_api.h" #include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { diff --git a/ppapi/thunk/ppb_tcp_socket_thunk.cc b/ppapi/thunk/ppb_tcp_socket_thunk.cc index c73e593..dc2c59e 100644 --- a/ppapi/thunk/ppb_tcp_socket_thunk.cc +++ b/ppapi/thunk/ppb_tcp_socket_thunk.cc @@ -4,6 +4,8 @@ // From ppb_tcp_socket.idl modified Sun Sep 15 16:14:21 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_tcp_socket.h" diff --git a/ppapi/thunk/ppb_text_input_thunk.cc b/ppapi/thunk/ppb_text_input_thunk.cc index 06c9cd6..030a7f5 100644 --- a/ppapi/thunk/ppb_text_input_thunk.cc +++ b/ppapi/thunk/ppb_text_input_thunk.cc @@ -2,7 +2,8 @@ // 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 <stdint.h> + #include "ppapi/c/dev/ppb_text_input_dev.h" #include "ppapi/c/ppb_text_input_controller.h" #include "ppapi/shared_impl/var.h" diff --git a/ppapi/thunk/ppb_truetype_font_api.h b/ppapi/thunk/ppb_truetype_font_api.h index 9df6c98..6c1f745 100644 --- a/ppapi/thunk/ppb_truetype_font_api.h +++ b/ppapi/thunk/ppb_truetype_font_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_TRUETYPE_FONT_API_H_ #define PPAPI_THUNK_PPB_TRUETYPE_FONT_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/dev/ppb_truetype_font_dev.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_truetype_font_dev_thunk.cc b/ppapi/thunk/ppb_truetype_font_dev_thunk.cc index e784269..8437c75 100644 --- a/ppapi/thunk/ppb_truetype_font_dev_thunk.cc +++ b/ppapi/thunk/ppb_truetype_font_dev_thunk.cc @@ -4,6 +4,8 @@ // From dev/ppb_truetype_font_dev.idl modified Fri Nov 1 16:12:12 2013. +#include <stdint.h> + #include "ppapi/c/dev/ppb_truetype_font_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/thunk/ppb_truetype_font_singleton_api.h b/ppapi/thunk/ppb_truetype_font_singleton_api.h index 97c727d..dadfd7d 100644 --- a/ppapi/thunk/ppb_truetype_font_singleton_api.h +++ b/ppapi/thunk/ppb_truetype_font_singleton_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_TRUETYPE_FONT_SINGLETON_API_H_ #define PPAPI_THUNK_PPB_TRUETYPE_FONT_SINGLETON_API_H_ +#include <stdint.h> + #include "ppapi/c/pp_array_output.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" diff --git a/ppapi/thunk/ppb_udp_socket_api.h b/ppapi/thunk/ppb_udp_socket_api.h index 028c562..5b96c8e 100644 --- a/ppapi/thunk/ppb_udp_socket_api.h +++ b/ppapi/thunk/ppb_udp_socket_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_UDP_SOCKET_API_H_ #define PPAPI_THUNK_PPB_UDP_SOCKET_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_udp_socket.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_udp_socket_private_api.h b/ppapi/thunk/ppb_udp_socket_private_api.h index 9c403a0..2366d18 100644 --- a/ppapi/thunk/ppb_udp_socket_private_api.h +++ b/ppapi/thunk/ppb_udp_socket_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_UDP_SOCKET_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_UDP_SOCKET_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/private/ppb_udp_socket_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_udp_socket_private_thunk.cc b/ppapi/thunk/ppb_udp_socket_private_thunk.cc index a493666..d0ebf0e 100644 --- a/ppapi/thunk/ppb_udp_socket_private_thunk.cc +++ b/ppapi/thunk/ppb_udp_socket_private_thunk.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 "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_udp_socket_private.h" diff --git a/ppapi/thunk/ppb_udp_socket_thunk.cc b/ppapi/thunk/ppb_udp_socket_thunk.cc index f0d3cee..3df936e 100644 --- a/ppapi/thunk/ppb_udp_socket_thunk.cc +++ b/ppapi/thunk/ppb_udp_socket_thunk.cc @@ -4,6 +4,8 @@ // From ppb_udp_socket.idl modified Fri Mar 13 17:49:57 2015. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_udp_socket.h" diff --git a/ppapi/thunk/ppb_uma_private_thunk.cc b/ppapi/thunk/ppb_uma_private_thunk.cc index 3003092..0e1a0b9 100644 --- a/ppapi/thunk/ppb_uma_private_thunk.cc +++ b/ppapi/thunk/ppb_uma_private_thunk.cc @@ -4,6 +4,8 @@ // From private/ppb_uma_private.idl modified Mon Apr 7 08:56:43 2014. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_uma_private.h" diff --git a/ppapi/thunk/ppb_uma_singleton_api.h b/ppapi/thunk/ppb_uma_singleton_api.h index f8414b9..86e1976 100644 --- a/ppapi/thunk/ppb_uma_singleton_api.h +++ b/ppapi/thunk/ppb_uma_singleton_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_ +#include <stdint.h> + #include "ppapi/shared_impl/singleton_resource_id.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_url_loader_api.h b/ppapi/thunk/ppb_url_loader_api.h index df9b6aa..8998bed 100644 --- a/ppapi/thunk/ppb_url_loader_api.h +++ b/ppapi/thunk/ppb_url_loader_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_URL_LOADER_API_H_ #define PPAPI_THUNK_URL_LOADER_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_url_loader.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h" diff --git a/ppapi/thunk/ppb_url_loader_thunk.cc b/ppapi/thunk/ppb_url_loader_thunk.cc index 4f19505..c0b92fa 100644 --- a/ppapi/thunk/ppb_url_loader_thunk.cc +++ b/ppapi/thunk/ppb_url_loader_thunk.cc @@ -4,6 +4,7 @@ // From ppb_url_loader.idl modified Tue May 7 14:43:00 2013. +#include <stdint.h> #include <string.h> #include "ppapi/c/pp_completion_callback.h" diff --git a/ppapi/thunk/ppb_url_request_info_api.h b/ppapi/thunk/ppb_url_request_info_api.h index d9fc8c3..0e22aec 100644 --- a/ppapi/thunk/ppb_url_request_info_api.h +++ b/ppapi/thunk/ppb_url_request_info_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_URL_REQUEST_INFO_API_H_ #define PPAPI_THUNK_URL_REQUEST_INFO_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_url_request_info_thunk.cc b/ppapi/thunk/ppb_url_request_info_thunk.cc index aa546ba..3ec617f 100644 --- a/ppapi/thunk/ppb_url_request_info_thunk.cc +++ b/ppapi/thunk/ppb_url_request_info_thunk.cc @@ -4,6 +4,8 @@ // From ppb_url_request_info.idl modified Mon May 6 10:11:29 2013. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_var_array_thunk.cc b/ppapi/thunk/ppb_var_array_thunk.cc index 9ab52ac..57d5a97 100644 --- a/ppapi/thunk/ppb_var_array_thunk.cc +++ b/ppapi/thunk/ppb_var_array_thunk.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 "ppapi/c/ppb_var_array.h" #include "ppapi/shared_impl/array_var.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/ppapi/thunk/ppb_video_capture_api.h b/ppapi/thunk/ppb_video_capture_api.h index 2c0089e..911c855 100644 --- a/ppapi/thunk/ppb_video_capture_api.h +++ b/ppapi/thunk/ppb_video_capture_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_VIDEO_CAPTURE_API_H_ #define PPAPI_THUNK_VIDEO_CAPTURE_API_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ppapi/thunk/ppb_video_capture_thunk.cc b/ppapi/thunk/ppb_video_capture_thunk.cc index 83772a5..1822682 100644 --- a/ppapi/thunk/ppb_video_capture_thunk.cc +++ b/ppapi/thunk/ppb_video_capture_thunk.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 "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/ppb_device_ref_shared.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_video_decoder_api.h b/ppapi/thunk/ppb_video_decoder_api.h index 1a132d2..9c2ac9e 100644 --- a/ppapi/thunk/ppb_video_decoder_api.h +++ b/ppapi/thunk/ppb_video_decoder_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_ #define PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_ +#include <stdint.h> + #include "ppapi/c/pp_codecs.h" #include "ppapi/c/ppb_video_decoder.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_video_decoder_dev_api.h b/ppapi/thunk/ppb_video_decoder_dev_api.h index d652f5f..1ddf0fd 100644 --- a/ppapi/thunk/ppb_video_decoder_dev_api.h +++ b/ppapi/thunk/ppb_video_decoder_dev_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_ #define PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/dev/ppb_video_decoder_dev.h" diff --git a/ppapi/thunk/ppb_video_decoder_dev_thunk.cc b/ppapi/thunk/ppb_video_decoder_dev_thunk.cc index bf15dd8..b5375ec 100644 --- a/ppapi/thunk/ppb_video_decoder_dev_thunk.cc +++ b/ppapi/thunk/ppb_video_decoder_dev_thunk.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 "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc index 4039c3e..2c2a7d8 100644 --- a/ppapi/thunk/ppb_video_decoder_thunk.cc +++ b/ppapi/thunk/ppb_video_decoder_thunk.cc @@ -4,6 +4,8 @@ // From ppb_video_decoder.idl modified Wed Aug 12 17:59:47 2015. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_video_decoder.h" diff --git a/ppapi/thunk/ppb_video_destination_private_api.h b/ppapi/thunk/ppb_video_destination_private_api.h index 49a696a..08b8cb7 100644 --- a/ppapi/thunk/ppb_video_destination_private_api.h +++ b/ppapi/thunk/ppb_video_destination_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_VIDEO_DESTINATION_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_VIDEO_DESTINATION_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_video_destination_private_thunk.cc b/ppapi/thunk/ppb_video_destination_private_thunk.cc index 325f0bc..78c38ad 100644 --- a/ppapi/thunk/ppb_video_destination_private_thunk.cc +++ b/ppapi/thunk/ppb_video_destination_private_thunk.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 "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/pp_video_frame_private.h" diff --git a/ppapi/thunk/ppb_video_encoder_api.h b/ppapi/thunk/ppb_video_encoder_api.h index cf9b9fa..9362bd1 100644 --- a/ppapi/thunk/ppb_video_encoder_api.h +++ b/ppapi/thunk/ppb_video_encoder_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_VIDEO_ENCODER_API_H_ #define PPAPI_THUNK_PPB_VIDEO_ENCODER_API_H_ +#include <stdint.h> + #include "ppapi/c/pp_codecs.h" #include "ppapi/c/ppb_video_encoder.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_video_encoder_thunk.cc b/ppapi/thunk/ppb_video_encoder_thunk.cc index a53f269..ad2c616 100644 --- a/ppapi/thunk/ppb_video_encoder_thunk.cc +++ b/ppapi/thunk/ppb_video_encoder_thunk.cc @@ -4,6 +4,8 @@ // From ppb_video_encoder.idl modified Mon May 18 12:43:25 2015. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_video_encoder.h" diff --git a/ppapi/thunk/ppb_video_frame_api.h b/ppapi/thunk/ppb_video_frame_api.h index 105d72b..44e062e 100644 --- a/ppapi/thunk/ppb_video_frame_api.h +++ b/ppapi/thunk/ppb_video_frame_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_VIDEO_FRAME_API_H_ #define PPAPI_THUNK_PPB_VIDEO_FRAME_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_video_frame.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_video_frame_thunk.cc b/ppapi/thunk/ppb_video_frame_thunk.cc index 46b6275..96e023a 100644 --- a/ppapi/thunk/ppb_video_frame_thunk.cc +++ b/ppapi/thunk/ppb_video_frame_thunk.cc @@ -4,6 +4,8 @@ // From ppb_video_frame.idl modified Mon Apr 7 08:56:43 2014. +#include <stdint.h> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_video_frame.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/thunk/ppb_video_source_private_api.h b/ppapi/thunk/ppb_video_source_private_api.h index c732051..3726030 100644 --- a/ppapi/thunk/ppb_video_source_private_api.h +++ b/ppapi/thunk/ppb_video_source_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_VIDEO_SOURCE_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_VIDEO_SOURCE_PRIVATE_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_video_source_private_thunk.cc b/ppapi/thunk/ppb_video_source_private_thunk.cc index a2910a5..c507ab8 100644 --- a/ppapi/thunk/ppb_video_source_private_thunk.cc +++ b/ppapi/thunk/ppb_video_source_private_thunk.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 "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/pp_video_frame_private.h" diff --git a/ppapi/thunk/ppb_websocket_api.h b/ppapi/thunk/ppb_websocket_api.h index 546ed99..f0e3e6a 100644 --- a/ppapi/thunk/ppb_websocket_api.h +++ b/ppapi/thunk/ppb_websocket_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_WEBSOCKET_API_H_ #define PPAPI_THUNK_WEBSOCKET_API_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/ppb_websocket.h" diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc index a632305..f7354ba 100644 --- a/ppapi/thunk/ppb_websocket_thunk.cc +++ b/ppapi/thunk/ppb_websocket_thunk.cc @@ -4,6 +4,8 @@ // From ppb_websocket.idl modified Mon May 6 10:11:29 2013. +#include <stdint.h> + #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_websocket.h" diff --git a/ppapi/thunk/ppb_x509_certificate_private_api.h b/ppapi/thunk/ppb_x509_certificate_private_api.h index 00d0cfd..8a01e37 100644 --- a/ppapi/thunk/ppb_x509_certificate_private_api.h +++ b/ppapi/thunk/ppb_x509_certificate_private_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_THUNK_PPB_X509_CERTIFICATE_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_X509_CERTIFICATE_PRIVATE_API_H_ +#include <stdint.h> + #include "ppapi/c/private/ppb_x509_certificate_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" diff --git a/ppapi/thunk/ppb_x509_certificate_private_thunk.cc b/ppapi/thunk/ppb_x509_certificate_private_thunk.cc index 50e0708..d1222eb 100644 --- a/ppapi/thunk/ppb_x509_certificate_private_thunk.cc +++ b/ppapi/thunk/ppb_x509_certificate_private_thunk.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 "ppapi/c/private/ppb_x509_certificate_private.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_x509_certificate_private_api.h" diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h index 3115521..e9ca691 100644 --- a/ppapi/thunk/resource_creation_api.h +++ b/ppapi/thunk/resource_creation_api.h @@ -5,7 +5,10 @@ #ifndef PPAPI_THUNK_RESOURCE_CREATION_API_H_ #define PPAPI_THUNK_RESOURCE_CREATION_API_H_ +#include <stdint.h> + #include "base/memory/shared_memory.h" +#include "build/build_config.h" #include "ppapi/c/dev/pp_video_dev.h" #include "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/dev/ppb_truetype_font_dev.h" diff --git a/ppapi/tools/pepper_hash_for_uma.cc b/ppapi/tools/pepper_hash_for_uma.cc index 7c006a8..588ae46 100644 --- a/ppapi/tools/pepper_hash_for_uma.cc +++ b/ppapi/tools/pepper_hash_for_uma.cc @@ -16,6 +16,7 @@ // can be compared to tools/metrics/histograms/histograms.xml to determine if // any interfaces have been left out. +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -35,9 +36,9 @@ int main(int argc, char **argv) { argv[0]); return 1; } - std::vector<std::pair<uint32, char*>> hashes; + std::vector<std::pair<uint32_t, char*>> hashes; for (int i = 1; i < argc; i++) { - uint32 data = base::Hash(argv[i], strlen(argv[i])); + uint32_t data = base::Hash(argv[i], strlen(argv[i])); // Strip off the signed bit because UMA doesn't support negative values, // but takes a signed int as input. diff --git a/ppapi/utility/completion_callback_factory.h b/ppapi/utility/completion_callback_factory.h index f755c5c..973aae1 100644 --- a/ppapi/utility/completion_callback_factory.h +++ b/ppapi/utility/completion_callback_factory.h @@ -5,6 +5,8 @@ #ifndef PPAPI_UTILITY_COMPLETION_CALLBACK_FACTORY_H_ #define PPAPI_UTILITY_COMPLETION_CALLBACK_FACTORY_H_ +#include <stdint.h> + #include "ppapi/cpp/completion_callback.h" #include "ppapi/utility/completion_callback_factory_thread_traits.h" diff --git a/ppapi/utility/completion_callback_factory_thread_traits.h b/ppapi/utility/completion_callback_factory_thread_traits.h index 34c5300..a1dbc64 100644 --- a/ppapi/utility/completion_callback_factory_thread_traits.h +++ b/ppapi/utility/completion_callback_factory_thread_traits.h @@ -5,6 +5,8 @@ #ifndef PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_ #define PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_ +#include <stdint.h> + #include "ppapi/cpp/logging.h" #include "ppapi/cpp/module.h" #include "ppapi/utility/threading/lock.h" diff --git a/ppapi/utility/graphics/paint_aggregator.cc b/ppapi/utility/graphics/paint_aggregator.cc index d4fc721..c95b3ae 100644 --- a/ppapi/utility/graphics/paint_aggregator.cc +++ b/ppapi/utility/graphics/paint_aggregator.cc @@ -4,6 +4,8 @@ #include "ppapi/utility/graphics/paint_aggregator.h" +#include <stdint.h> + #include <algorithm> #include "ppapi/cpp/logging.h" diff --git a/ppapi/utility/graphics/paint_manager.h b/ppapi/utility/graphics/paint_manager.h index 366b73d..bfe7536 100644 --- a/ppapi/utility/graphics/paint_manager.h +++ b/ppapi/utility/graphics/paint_manager.h @@ -5,6 +5,9 @@ #ifndef PPAPI_UTILITY_GRAPHICS_PAINT_MANAGER_H_ #define PPAPI_UTILITY_GRAPHICS_PAINT_MANAGER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "ppapi/cpp/graphics_2d.h" diff --git a/ppapi/utility/threading/simple_thread.h b/ppapi/utility/threading/simple_thread.h index 5410cf8..b4d7114 100644 --- a/ppapi/utility/threading/simple_thread.h +++ b/ppapi/utility/threading/simple_thread.h @@ -5,6 +5,7 @@ #ifndef PPAPI_UTILITY_THREADING_SIMPLE_THREAD_H_ #define PPAPI_UTILITY_THREADING_SIMPLE_THREAD_H_ +#include <stddef.h> #ifdef WIN32 #include <windows.h> #else diff --git a/ppapi/utility/websocket/websocket_api.h b/ppapi/utility/websocket/websocket_api.h index f733b1c..a8ec4b5 100644 --- a/ppapi/utility/websocket/websocket_api.h +++ b/ppapi/utility/websocket/websocket_api.h @@ -5,6 +5,8 @@ #ifndef PPAPI_UTILITY_WEBSOCKET_WEBSOCKET_API_H_ #define PPAPI_UTILITY_WEBSOCKET_WEBSOCKET_API_H_ +#include <stdint.h> + #include "ppapi/c/ppb_websocket.h" /// @file |