diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/ppapi/proxy | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ppapi/proxy')
207 files changed, 1647 insertions, 704 deletions
diff --git a/chromium/ppapi/proxy/BUILD.gn b/chromium/ppapi/proxy/BUILD.gn index e3bd8c5439c..9167f8826e9 100644 --- a/chromium/ppapi/proxy/BUILD.gn +++ b/chromium/ppapi/proxy/BUILD.gn @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/nacl/config.gni") + config("proxy_implementation") { defines = [ "PPAPI_PROXY_IMPLEMENTATION" ] } @@ -207,8 +209,6 @@ component("proxy") { "../nacl_irt/irt_start.cc", "../nacl_irt/manifest_service.cc", "../nacl_irt/manifest_service.h", - "../nacl_irt/plugin_main.cc", - "../nacl_irt/plugin_main.h", "../nacl_irt/plugin_startup.cc", "../nacl_irt/plugin_startup.h", "../nacl_irt/ppapi_dispatcher.cc", @@ -272,6 +272,10 @@ component("proxy") { "//build/config:precompiled_headers", ] + public_deps = [ + "//ppapi/proxy:ipc_sources", + ] + deps = [ "//base", "//gpu/command_buffer/client:gles2_implementation", @@ -279,9 +283,7 @@ component("proxy") { "//ipc", "//media:shared_memory_support", "//ppapi/c", - "//ppapi/proxy:ipc_sources", "//ppapi/shared_impl", - "//third_party/icu", ] if (!is_nacl) { @@ -293,6 +295,10 @@ component("proxy") { "//ui/surface", ] } + + if (!is_nacl_nonsfi) { + deps += [ "//third_party/icu" ] + } } group("ipc") { diff --git a/chromium/ppapi/proxy/OWNERS b/chromium/ppapi/proxy/OWNERS index aabe8bb4ff0..8d323232836 100644 --- a/chromium/ppapi/proxy/OWNERS +++ b/chromium/ppapi/proxy/OWNERS @@ -13,3 +13,15 @@ per-file *_messages*.h=nasko@chromium.org per-file *_messages*.h=palmer@chromium.org per-file *_messages*.h=tsepez@chromium.org per-file *_messages*.h=wfh@chromium.org + +per-file *_param_traits.*=set noparent +per-file *_param_traits.*=dcheng@chromium.org +per-file *_param_traits.*=inferno@chromium.org +per-file *_param_traits.*=jln@chromium.org +per-file *_param_traits.*=jschuh@chromium.org +per-file *_param_traits.*=kenrb@chromium.org +per-file *_param_traits.*=mkwst@chromium.org +per-file *_param_traits.*=nasko@chromium.org +per-file *_param_traits.*=palmer@chromium.org +per-file *_param_traits.*=tsepez@chromium.org +per-file *_param_traits.*=wfh@chromium.org diff --git a/chromium/ppapi/proxy/audio_buffer_resource.h b/chromium/ppapi/proxy/audio_buffer_resource.h index 8f1e22ff6ef..e447917b78c 100644 --- a/chromium/ppapi/proxy/audio_buffer_resource.h +++ b/chromium/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/chromium/ppapi/proxy/audio_encoder_resource.cc b/chromium/ppapi/proxy/audio_encoder_resource.cc index d1576fb616b..233af5a2c2b 100644 --- a/chromium/ppapi/proxy/audio_encoder_resource.cc +++ b/chromium/ppapi/proxy/audio_encoder_resource.cc @@ -2,14 +2,39 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/shared_memory.h" +#include "ppapi/c/pp_array_output.h" +#include "ppapi/c/pp_codecs.h" +#include "ppapi/proxy/audio_buffer_resource.h" #include "ppapi/proxy/audio_encoder_resource.h" +#include "ppapi/proxy/ppapi_messages.h" +#include "ppapi/shared_impl/array_writer.h" +#include "ppapi/shared_impl/media_stream_buffer.h" +#include "ppapi/thunk/enter.h" namespace ppapi { namespace proxy { +namespace { + +void RunCallback(scoped_refptr<TrackedCallback>* callback, int32_t error) { + if (TrackedCallback::IsPending(*callback)) { + scoped_refptr<TrackedCallback> temp; + callback->swap(temp); + temp->Run(error); + } +} + +} // namespace + AudioEncoderResource::AudioEncoderResource(Connection connection, PP_Instance instance) - : PluginResource(connection, instance) { + : PluginResource(connection, instance), + encoder_last_error_(PP_ERROR_FAILED), + initialized_(false), + audio_buffer_manager_(this), + bitstream_buffer_manager_(this) { + SendCreate(RENDERER, PpapiHostMsg_AudioEncoder_Create()); } AudioEncoderResource::~AudioEncoderResource() { @@ -22,7 +47,15 @@ thunk::PPB_AudioEncoder_API* AudioEncoderResource::AsPPB_AudioEncoder_API() { int32_t AudioEncoderResource::GetSupportedProfiles( const PP_ArrayOutput& output, const scoped_refptr<TrackedCallback>& callback) { - return PP_ERROR_NOTSUPPORTED; + if (TrackedCallback::IsPending(get_supported_profiles_callback_)) + return PP_ERROR_INPROGRESS; + + get_supported_profiles_callback_ = callback; + Call<PpapiPluginMsg_AudioEncoder_GetSupportedProfilesReply>( + RENDERER, PpapiHostMsg_AudioEncoder_GetSupportedProfiles(), + base::Bind(&AudioEncoderResource::OnPluginMsgGetSupportedProfilesReply, + this, output)); + return PP_OK_COMPLETIONPENDING; } int32_t AudioEncoderResource::Initialize( @@ -33,39 +66,292 @@ int32_t AudioEncoderResource::Initialize( uint32_t initial_bitrate, PP_HardwareAcceleration acceleration, const scoped_refptr<TrackedCallback>& callback) { - return PP_ERROR_NOTSUPPORTED; + if (initialized_) + return PP_ERROR_FAILED; + if (TrackedCallback::IsPending(initialize_callback_)) + return PP_ERROR_INPROGRESS; + + initialize_callback_ = callback; + + PPB_AudioEncodeParameters parameters; + parameters.channels = channels; + parameters.input_sample_rate = input_sample_rate; + parameters.input_sample_size = input_sample_size; + parameters.output_profile = output_profile; + parameters.initial_bitrate = initial_bitrate; + parameters.acceleration = acceleration; + + Call<PpapiPluginMsg_AudioEncoder_InitializeReply>( + RENDERER, PpapiHostMsg_AudioEncoder_Initialize(parameters), + base::Bind(&AudioEncoderResource::OnPluginMsgInitializeReply, this)); + return PP_OK_COMPLETIONPENDING; } int32_t AudioEncoderResource::GetNumberOfSamples() { - return PP_ERROR_NOTSUPPORTED; + if (encoder_last_error_) + return encoder_last_error_; + return number_of_samples_; } int32_t AudioEncoderResource::GetBuffer( PP_Resource* audio_buffer, const scoped_refptr<TrackedCallback>& callback) { - return PP_ERROR_NOTSUPPORTED; + if (encoder_last_error_) + return encoder_last_error_; + if (TrackedCallback::IsPending(get_buffer_callback_)) + return PP_ERROR_INPROGRESS; + + get_buffer_data_ = audio_buffer; + get_buffer_callback_ = callback; + + TryGetAudioBuffer(); + + return PP_OK_COMPLETIONPENDING; } int32_t AudioEncoderResource::Encode( PP_Resource audio_buffer, const scoped_refptr<TrackedCallback>& callback) { - return PP_ERROR_NOTSUPPORTED; + if (encoder_last_error_) + return encoder_last_error_; + + AudioBufferMap::iterator it = audio_buffers_.find(audio_buffer); + if (it == audio_buffers_.end()) + // TODO(llandwerlin): accept MediaStreamAudioTrack's audio buffers. + return PP_ERROR_BADRESOURCE; + + scoped_refptr<AudioBufferResource> buffer_resource = it->second; + + encode_callbacks_.insert( + std::make_pair(buffer_resource->GetBufferIndex(), callback)); + + Post(RENDERER, + PpapiHostMsg_AudioEncoder_Encode(buffer_resource->GetBufferIndex())); + + // Invalidate the buffer to prevent a CHECK failure when the + // AudioBufferResource is destructed. + buffer_resource->Invalidate(); + audio_buffers_.erase(it); + + return PP_OK_COMPLETIONPENDING; } int32_t AudioEncoderResource::GetBitstreamBuffer( PP_AudioBitstreamBuffer* bitstream_buffer, const scoped_refptr<TrackedCallback>& callback) { - return PP_ERROR_NOTSUPPORTED; + if (encoder_last_error_) + return encoder_last_error_; + if (TrackedCallback::IsPending(get_bitstream_buffer_callback_)) + return PP_ERROR_INPROGRESS; + + get_bitstream_buffer_callback_ = callback; + get_bitstream_buffer_data_ = bitstream_buffer; + + TryWriteBitstreamBuffer(); + + return PP_OK_COMPLETIONPENDING; } void AudioEncoderResource::RecycleBitstreamBuffer( const PP_AudioBitstreamBuffer* bitstream_buffer) { + if (encoder_last_error_) + return; + + BufferMap::const_iterator it = + bitstream_buffer_map_.find(bitstream_buffer->buffer); + if (it != bitstream_buffer_map_.end()) + Post(RENDERER, + PpapiHostMsg_AudioEncoder_RecycleBitstreamBuffer(it->second)); } void AudioEncoderResource::RequestBitrateChange(uint32_t bitrate) { + if (encoder_last_error_) + return; + Post(RENDERER, PpapiHostMsg_AudioEncoder_RequestBitrateChange(bitrate)); } void AudioEncoderResource::Close() { + if (encoder_last_error_) + return; + Post(RENDERER, PpapiHostMsg_AudioEncoder_Close()); + if (!encoder_last_error_ || !initialized_) + NotifyError(PP_ERROR_ABORTED); + ReleaseBuffers(); +} + +void AudioEncoderResource::OnReplyReceived( + const ResourceMessageReplyParams& params, + const IPC::Message& msg) { + PPAPI_BEGIN_MESSAGE_MAP(AudioEncoderResource, msg) + PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL( + PpapiPluginMsg_AudioEncoder_BitstreamBufferReady, + OnPluginMsgBitstreamBufferReady) + PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL(PpapiPluginMsg_AudioEncoder_EncodeReply, + OnPluginMsgEncodeReply) + PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL(PpapiPluginMsg_AudioEncoder_NotifyError, + OnPluginMsgNotifyError) + PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL_UNHANDLED( + PluginResource::OnReplyReceived(params, msg)) + PPAPI_END_MESSAGE_MAP() +} + +void AudioEncoderResource::OnPluginMsgGetSupportedProfilesReply( + const PP_ArrayOutput& output, + const ResourceMessageReplyParams& params, + const std::vector<PP_AudioProfileDescription>& profiles) { + ArrayWriter writer(output); + if (params.result() != PP_OK || !writer.is_valid() || + !writer.StoreVector(profiles)) { + RunCallback(&get_supported_profiles_callback_, PP_ERROR_FAILED); + return; + } + + RunCallback(&get_supported_profiles_callback_, + base::checked_cast<int32_t>(profiles.size())); +} + +void AudioEncoderResource::OnPluginMsgInitializeReply( + const ResourceMessageReplyParams& params, + int32_t number_of_samples, + int32_t audio_buffer_count, + int32_t audio_buffer_size, + int32_t bitstream_buffer_count, + int32_t bitstream_buffer_size) { + DCHECK(!initialized_); + + int32_t error = params.result(); + if (error) { + RunCallback(&initialize_callback_, error); + return; + } + + // Get audio buffers shared memory buffer. + base::SharedMemoryHandle buffer_handle; + if (!params.TakeSharedMemoryHandleAtIndex(0, &buffer_handle) || + !audio_buffer_manager_.SetBuffers( + audio_buffer_count, audio_buffer_size, + make_scoped_ptr(new base::SharedMemory(buffer_handle, false)), + true)) { + RunCallback(&initialize_callback_, PP_ERROR_NOMEMORY); + return; + } + + // Get bitstream buffers shared memory buffer. + if (!params.TakeSharedMemoryHandleAtIndex(1, &buffer_handle) || + !bitstream_buffer_manager_.SetBuffers( + bitstream_buffer_count, bitstream_buffer_size, + make_scoped_ptr(new base::SharedMemory(buffer_handle, false)), + false)) { + RunCallback(&initialize_callback_, PP_ERROR_NOMEMORY); + return; + } + + for (int32_t i = 0; i < bitstream_buffer_manager_.number_of_buffers(); i++) + bitstream_buffer_map_.insert(std::make_pair( + bitstream_buffer_manager_.GetBufferPointer(i)->bitstream.data, i)); + + encoder_last_error_ = PP_OK; + number_of_samples_ = number_of_samples; + initialized_ = true; + + RunCallback(&initialize_callback_, PP_OK); +} + +void AudioEncoderResource::OnPluginMsgEncodeReply( + const ResourceMessageReplyParams& params, + int32_t buffer_id) { + // We need to ensure there are still callbacks to be called before + // processing this message. We might receive an EncodeReply message after + // having sent a Close message to the renderer. In this case, we don't + // have any callback left to call. + if (encode_callbacks_.empty()) + return; + + EncodeMap::iterator it = encode_callbacks_.find(buffer_id); + DCHECK(encode_callbacks_.end() != it); + + scoped_refptr<TrackedCallback> callback = it->second; + encode_callbacks_.erase(it); + RunCallback(&callback, encoder_last_error_); + + audio_buffer_manager_.EnqueueBuffer(buffer_id); + // If the plugin is waiting for an audio buffer, we can give the one + // that just became available again. + if (TrackedCallback::IsPending(get_buffer_callback_)) + TryGetAudioBuffer(); +} + +void AudioEncoderResource::OnPluginMsgBitstreamBufferReady( + const ResourceMessageReplyParams& params, + int32_t buffer_id) { + bitstream_buffer_manager_.EnqueueBuffer(buffer_id); + + if (TrackedCallback::IsPending(get_bitstream_buffer_callback_)) + TryWriteBitstreamBuffer(); +} + +void AudioEncoderResource::OnPluginMsgNotifyError( + const ResourceMessageReplyParams& params, + int32_t error) { + NotifyError(error); +} + +void AudioEncoderResource::NotifyError(int32_t error) { + DCHECK(error); + + encoder_last_error_ = error; + RunCallback(&get_supported_profiles_callback_, error); + RunCallback(&initialize_callback_, error); + RunCallback(&get_buffer_callback_, error); + get_buffer_data_ = nullptr; + RunCallback(&get_bitstream_buffer_callback_, error); + get_bitstream_buffer_data_ = nullptr; + for (EncodeMap::iterator it = encode_callbacks_.begin(); + it != encode_callbacks_.end(); ++it) + RunCallback(&it->second, error); + encode_callbacks_.clear(); +} + +void AudioEncoderResource::TryGetAudioBuffer() { + DCHECK(TrackedCallback::IsPending(get_buffer_callback_)); + + if (!audio_buffer_manager_.HasAvailableBuffer()) + return; + + int32_t buffer_id = audio_buffer_manager_.DequeueBuffer(); + scoped_refptr<AudioBufferResource> resource = new AudioBufferResource( + pp_instance(), buffer_id, + audio_buffer_manager_.GetBufferPointer(buffer_id)); + audio_buffers_.insert( + AudioBufferMap::value_type(resource->pp_resource(), resource)); + + // Take a reference for the plugin. + *get_buffer_data_ = resource->GetReference(); + get_buffer_data_ = nullptr; + RunCallback(&get_buffer_callback_, PP_OK); +} + +void AudioEncoderResource::TryWriteBitstreamBuffer() { + DCHECK(TrackedCallback::IsPending(get_bitstream_buffer_callback_)); + + if (!bitstream_buffer_manager_.HasAvailableBuffer()) + return; + + int32_t buffer_id = bitstream_buffer_manager_.DequeueBuffer(); + MediaStreamBuffer* buffer = + bitstream_buffer_manager_.GetBufferPointer(buffer_id); + + get_bitstream_buffer_data_->buffer = buffer->bitstream.data; + get_bitstream_buffer_data_->size = buffer->bitstream.data_size; + get_bitstream_buffer_data_ = nullptr; + RunCallback(&get_bitstream_buffer_callback_, PP_OK); +} + +void AudioEncoderResource::ReleaseBuffers() { + for (AudioBufferMap::iterator it = audio_buffers_.begin(); + it != audio_buffers_.end(); ++it) + it->second->Invalidate(); + audio_buffers_.clear(); } } // namespace proxy diff --git a/chromium/ppapi/proxy/audio_encoder_resource.h b/chromium/ppapi/proxy/audio_encoder_resource.h index 23fcee2cdc2..f1ba9f3d1de 100644 --- a/chromium/ppapi/proxy/audio_encoder_resource.h +++ b/chromium/ppapi/proxy/audio_encoder_resource.h @@ -5,12 +5,15 @@ #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" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource.h" +#include "ppapi/shared_impl/media_stream_buffer_manager.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_audio_encoder_api.h" @@ -20,12 +23,12 @@ class TrackedCallback; namespace proxy { -class SerializedHandle; -class VideoFrameResource; +class AudioBufferResource; class PPAPI_PROXY_EXPORT AudioEncoderResource : public PluginResource, - public thunk::PPB_AudioEncoder_API { + public thunk::PPB_AudioEncoder_API, + public ppapi::MediaStreamBufferManager::Delegate { public: AudioEncoderResource(Connection connection, PP_Instance instance); ~AudioEncoderResource() override; @@ -33,7 +36,10 @@ class PPAPI_PROXY_EXPORT AudioEncoderResource thunk::PPB_AudioEncoder_API* AsPPB_AudioEncoder_API() override; private: - // PPB_AduioEncoder_API implementation. + // MediaStreamBufferManager::Delegate implementation. + void OnNewBufferEnqueued() override {} + + // PPB_AudioEncoder_API implementation. int32_t GetSupportedProfiles( const PP_ArrayOutput& output, const scoped_refptr<TrackedCallback>& callback) override; @@ -57,6 +63,62 @@ class PPAPI_PROXY_EXPORT AudioEncoderResource void RequestBitrateChange(uint32_t bitrate) override; void Close() override; + // PluginResource implementation. + void OnReplyReceived(const ResourceMessageReplyParams& params, + const IPC::Message& msg) override; + + // Message handlers for the host's messages. + void OnPluginMsgGetSupportedProfilesReply( + const PP_ArrayOutput& output, + const ResourceMessageReplyParams& params, + const std::vector<PP_AudioProfileDescription>& profiles); + void OnPluginMsgInitializeReply(const ResourceMessageReplyParams& params, + int32_t number_of_samples, + int32_t audio_buffer_count, + int32_t audio_buffer_size, + int32_t bitstream_buffer_count, + int32_t bitstream_buffer_size); + void OnPluginMsgEncodeReply(const ResourceMessageReplyParams& params, + int32_t buffer_id); + void OnPluginMsgBitstreamBufferReady(const ResourceMessageReplyParams& params, + int32_t buffer_id); + void OnPluginMsgNotifyError(const ResourceMessageReplyParams& params, + int32_t error); + + // Internal utility functions. + void NotifyError(int32_t error); + void TryGetAudioBuffer(); + void TryWriteBitstreamBuffer(); + void ReleaseBuffers(); + + int32_t encoder_last_error_; + + bool initialized_; + + uint32_t number_of_samples_; + + using AudioBufferMap = + std::map<PP_Resource, scoped_refptr<AudioBufferResource>>; + AudioBufferMap audio_buffers_; + + scoped_refptr<TrackedCallback> get_supported_profiles_callback_; + scoped_refptr<TrackedCallback> initialize_callback_; + scoped_refptr<TrackedCallback> get_buffer_callback_; + PP_Resource* get_buffer_data_; + + using EncodeMap = std::map<int32_t, scoped_refptr<TrackedCallback>>; + EncodeMap encode_callbacks_; + + scoped_refptr<TrackedCallback> get_bitstream_buffer_callback_; + PP_AudioBitstreamBuffer* get_bitstream_buffer_data_; + + MediaStreamBufferManager audio_buffer_manager_; + MediaStreamBufferManager bitstream_buffer_manager_; + + // Map of bitstream buffer pointers to buffer ids. + using BufferMap = std::map<void*, int32_t>; + BufferMap bitstream_buffer_map_; + DISALLOW_COPY_AND_ASSIGN(AudioEncoderResource); }; diff --git a/chromium/ppapi/proxy/audio_input_resource.cc b/chromium/ppapi/proxy/audio_input_resource.cc index f17dd0af765..7d25a7190e4 100644 --- a/chromium/ppapi/proxy/audio_input_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/audio_input_resource.h b/chromium/ppapi/proxy/audio_input_resource.h index a94ff9c5e3e..3a3b40b7f98 100644 --- a/chromium/ppapi/proxy/audio_input_resource.h +++ b/chromium/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/chromium/ppapi/proxy/broker_dispatcher.h b/chromium/ppapi/proxy/broker_dispatcher.h index 828dac63666..5b3d586c2b6 100644 --- a/chromium/ppapi/proxy/broker_dispatcher.h +++ b/chromium/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/chromium/ppapi/proxy/broker_resource.cc b/chromium/ppapi/proxy/broker_resource.cc index 4fac07e54c3..18273cd93d3 100644 --- a/chromium/ppapi/proxy/broker_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/broker_resource.h b/chromium/ppapi/proxy/broker_resource.h index 23310934545..60f6fdb2a54 100644 --- a/chromium/ppapi/proxy/broker_resource.h +++ b/chromium/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/chromium/ppapi/proxy/browser_font_singleton_resource.h b/chromium/ppapi/proxy/browser_font_singleton_resource.h index ddbb690a638..bc332dbf993 100644 --- a/chromium/ppapi/proxy/browser_font_singleton_resource.h +++ b/chromium/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/chromium/ppapi/proxy/camera_capabilities_resource.h b/chromium/ppapi/proxy/camera_capabilities_resource.h index 82e8df86275..14431ce16fe 100644 --- a/chromium/ppapi/proxy/camera_capabilities_resource.h +++ b/chromium/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/chromium/ppapi/proxy/camera_device_resource.h b/chromium/ppapi/proxy/camera_device_resource.h index 93878fe37df..d6ff4b7846a 100644 --- a/chromium/ppapi/proxy/camera_device_resource.h +++ b/chromium/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/chromium/ppapi/proxy/compositor_layer_resource.cc b/chromium/ppapi/proxy/compositor_layer_resource.cc index c42776eb293..fc88f6a5f01 100644 --- a/chromium/ppapi/proxy/compositor_layer_resource.cc +++ b/chromium/ppapi/proxy/compositor_layer_resource.cc @@ -10,6 +10,7 @@ #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/common/mailbox.h" +#include "gpu/command_buffer/common/sync_token.h" #include "ppapi/proxy/compositor_resource.h" #include "ppapi/shared_impl/ppb_graphics_3d_shared.h" #include "ppapi/thunk/enter.h" @@ -30,14 +31,13 @@ float clamp(float value) { return std::min(std::max(value, 0.0f), 1.0f); } -void OnTextureReleased( - const ScopedPPResource& layer, - const ScopedPPResource& context, - uint32_t texture, - const scoped_refptr<TrackedCallback>& release_callback, - int32_t result, - uint32_t sync_point, - bool is_lost) { +void OnTextureReleased(const ScopedPPResource& layer, + const ScopedPPResource& context, + uint32_t texture, + const scoped_refptr<TrackedCallback>& release_callback, + int32_t result, + const gpu::SyncToken& sync_token, + bool is_lost) { if (!TrackedCallback::IsPending(release_callback)) return; @@ -47,7 +47,7 @@ void OnTextureReleased( } do { - if (!sync_point) + if (!sync_token.HasData()) break; EnterResourceNoLock<PPB_Graphics3D_API> enter(context.get(), true); @@ -58,19 +58,18 @@ void OnTextureReleased( static_cast<PPB_Graphics3D_Shared*>(enter.object()); GLES2Implementation* gl = graphics->gles2_impl(); - gl->WaitSyncPointCHROMIUM(sync_point); + gl->WaitSyncTokenCHROMIUM(sync_token.GetConstData()); } while (false); release_callback->Run(is_lost ? PP_ERROR_FAILED : PP_OK); } -void OnImageReleased( - const ScopedPPResource& layer, - const ScopedPPResource& image, - const scoped_refptr<TrackedCallback>& release_callback, - int32_t result, - uint32_t sync_point, - bool is_lost) { +void OnImageReleased(const ScopedPPResource& layer, + const ScopedPPResource& image, + const scoped_refptr<TrackedCallback>& release_callback, + int32_t result, + const gpu::SyncToken& sync_token, + bool is_lost) { if (!TrackedCallback::IsPending(release_callback)) return; release_callback->Run(result); @@ -175,10 +174,14 @@ int32_t CompositorLayerResource::SetTexture( data_.common.size = *size; data_.common.resource_id = compositor_->GenerateResourceId(); data_.texture->target = target; - data_.texture->sync_point = gl->InsertSyncPointCHROMIUM(); data_.texture->source_rect.point = PP_MakeFloatPoint(0.0f, 0.0f); data_.texture->source_rect.size = source_size_; + const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); + gl->OrderingBarrierCHROMIUM(); + gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, + data_.texture->sync_token.GetData()); + // If the PP_Resource of this layer is released by the plugin, the // release_callback will be aborted immediately, but the texture or image // in this layer may still being used by chromium compositor. So we have to diff --git a/chromium/ppapi/proxy/compositor_layer_resource.h b/chromium/ppapi/proxy/compositor_layer_resource.h index dc6024fe159..7bc330a156e 100644 --- a/chromium/ppapi/proxy/compositor_layer_resource.h +++ b/chromium/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" @@ -12,6 +15,10 @@ #include "ppapi/shared_impl/scoped_pp_resource.h" #include "ppapi/thunk/ppb_compositor_layer_api.h" +namespace gpu { +struct SyncToken; +} + namespace ppapi { namespace proxy { @@ -22,7 +29,8 @@ class PPAPI_PROXY_EXPORT CompositorLayerResource public thunk::PPB_CompositorLayer_API { public: // Release callback for texture or image layer. - typedef base::Callback<void(int32_t, uint32_t, bool)> ReleaseCallback; + typedef base::Callback<void(int32_t, const gpu::SyncToken&, bool)> + ReleaseCallback; CompositorLayerResource(Connection connection, PP_Instance instance, diff --git a/chromium/ppapi/proxy/compositor_resource.cc b/chromium/ppapi/proxy/compositor_resource.cc index 443d7a949e9..f15e4024f77 100644 --- a/chromium/ppapi/proxy/compositor_resource.cc +++ b/chromium/ppapi/proxy/compositor_resource.cc @@ -36,7 +36,7 @@ CompositorResource::~CompositorResource() { for (ReleaseCallbackMap::iterator it = release_callback_map_.begin(); it != release_callback_map_.end(); ++it) { if (!it->second.is_null()) - it->second.Run(PP_ERROR_ABORTED, 0, false); + it->second.Run(PP_ERROR_ABORTED, gpu::SyncToken(), false); } } @@ -126,12 +126,12 @@ void CompositorResource::OnPluginMsgCommitLayersReply( void CompositorResource::OnPluginMsgReleaseResource( const ResourceMessageReplyParams& params, int32_t id, - uint32_t sync_point, + const gpu::SyncToken& sync_token, bool is_lost) { ReleaseCallbackMap::iterator it = release_callback_map_.find(id); DCHECK(it != release_callback_map_.end()) << "Can not found release_callback_ by id(" << id << ")!"; - it->second.Run(PP_OK, sync_point, is_lost); + it->second.Run(PP_OK, sync_token, is_lost); release_callback_map_.erase(it); } @@ -140,7 +140,8 @@ void CompositorResource::ResetLayersInternal(bool is_aborted) { it != layers_.end(); ++it) { ReleaseCallback release_callback = (*it)->release_callback(); if (!release_callback.is_null()) { - release_callback.Run(is_aborted ? PP_ERROR_ABORTED : PP_OK, 0, false); + release_callback.Run(is_aborted ? PP_ERROR_ABORTED : PP_OK, + gpu::SyncToken(), false); (*it)->ResetReleaseCallback(); } (*it)->Invalidate(); diff --git a/chromium/ppapi/proxy/compositor_resource.h b/chromium/ppapi/proxy/compositor_resource.h index 0d3161ddeda..366e3e7bd0b 100644 --- a/chromium/ppapi/proxy/compositor_resource.h +++ b/chromium/ppapi/proxy/compositor_resource.h @@ -5,14 +5,21 @@ #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" #include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/thunk/ppb_compositor_api.h" +namespace gpu { +struct SyncToken; +} + namespace ppapi { namespace proxy { @@ -44,11 +51,10 @@ class PPAPI_PROXY_EXPORT CompositorResource // IPC msg handlers: void OnPluginMsgCommitLayersReply(const ResourceMessageReplyParams& params); - void OnPluginMsgReleaseResource( - const ResourceMessageReplyParams& params, - int32_t id, - uint32_t sync_point, - bool is_lost); + void OnPluginMsgReleaseResource(const ResourceMessageReplyParams& params, + int32_t id, + const gpu::SyncToken& sync_token, + bool is_lost); void ResetLayersInternal(bool is_aborted); diff --git a/chromium/ppapi/proxy/device_enumeration_resource_helper.cc b/chromium/ppapi/proxy/device_enumeration_resource_helper.cc index 32a4e1db984..45eee0e7cd1 100644 --- a/chromium/ppapi/proxy/device_enumeration_resource_helper.cc +++ b/chromium/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/chromium/ppapi/proxy/device_enumeration_resource_helper.h b/chromium/ppapi/proxy/device_enumeration_resource_helper.h index cea31537df2..ea96ea2ba71 100644 --- a/chromium/ppapi/proxy/device_enumeration_resource_helper.h +++ b/chromium/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/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc b/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc index 32bc68a0dde..288942f0e01 100644 --- a/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/dispatcher.h b/chromium/ppapi/proxy/dispatcher.h index 302884150e4..a00c550b424 100644 --- a/chromium/ppapi/proxy/dispatcher.h +++ b/chromium/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/chromium/ppapi/proxy/enter_proxy.h b/chromium/ppapi/proxy/enter_proxy.h index 4ad67b136c3..b7dbef288c6 100644 --- a/chromium/ppapi/proxy/enter_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/file_chooser_resource.cc b/chromium/ppapi/proxy/file_chooser_resource.cc index f1d045bac91..dc70cbde55a 100644 --- a/chromium/ppapi/proxy/file_chooser_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/file_chooser_resource.h b/chromium/ppapi/proxy/file_chooser_resource.h index 0347fb07339..05d01d3a798 100644 --- a/chromium/ppapi/proxy/file_chooser_resource.h +++ b/chromium/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/chromium/ppapi/proxy/file_chooser_resource_unittest.cc b/chromium/ppapi/proxy/file_chooser_resource_unittest.cc index a97b9c9f4a2..e6ad3ed27b2 100644 --- a/chromium/ppapi/proxy/file_chooser_resource_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/file_io_resource.cc b/chromium/ppapi/proxy/file_io_resource.cc index e119dd5c621..1279c46b363 100644 --- a/chromium/ppapi/proxy/file_io_resource.cc +++ b/chromium/ppapi/proxy/file_io_resource.cc @@ -4,6 +4,9 @@ #include "ppapi/proxy/file_io_resource.h" +#include <limits> +#include <utility> + #include "base/bind.h" #include "base/task_runner_util.h" #include "ipc/ipc_message.h" @@ -84,10 +87,9 @@ FileIOResource::WriteOp::WriteOp(scoped_refptr<FileHolder> file_holder, bool append) : file_holder_(file_holder), offset_(offset), - buffer_(buffer.Pass()), + buffer_(std::move(buffer)), bytes_to_write_(bytes_to_write), - append_(append) { -} + append_(append) {} FileIOResource::WriteOp::~WriteOp() { } @@ -289,8 +291,10 @@ int32_t FileIOResource::Write(int64_t offset, increase = bytes_to_write; } else { uint64_t max_offset = offset + bytes_to_write; - if (max_offset > static_cast<uint64_t>(kint64max)) + if (max_offset > + static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) { return PP_ERROR_FAILED; // amount calculation would overflow. + } increase = static_cast<int64_t>(max_offset) - max_written_offset_; } @@ -513,8 +517,8 @@ int32_t FileIOResource::WriteValidated( // plugin's buffer at this point. scoped_ptr<char[]> copy(new char[bytes_to_write]); memcpy(copy.get(), buffer, bytes_to_write); - scoped_refptr<WriteOp> write_op( - new WriteOp(file_holder_, offset, copy.Pass(), bytes_to_write, append)); + scoped_refptr<WriteOp> write_op(new WriteOp( + file_holder_, offset, std::move(copy), bytes_to_write, append)); base::PostTaskAndReplyWithResult( PpapiGlobals::Get()->GetFileTaskRunner(), FROM_HERE, @@ -606,7 +610,7 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0; scoped_refptr<WriteOp> write_op(new WriteOp( - file_holder_, offset, buffer.Pass(), bytes_to_write, append)); + file_holder_, offset, std::move(buffer), bytes_to_write, append)); base::PostTaskAndReplyWithResult( PpapiGlobals::Get()->GetFileTaskRunner(), FROM_HERE, diff --git a/chromium/ppapi/proxy/file_io_resource.h b/chromium/ppapi/proxy/file_io_resource.h index f32879a43a7..9834c8e76bb 100644 --- a/chromium/ppapi/proxy/file_io_resource.h +++ b/chromium/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/chromium/ppapi/proxy/file_ref_resource.cc b/chromium/ppapi/proxy/file_ref_resource.cc index ee56969cd82..79e95dce910 100644 --- a/chromium/ppapi/proxy/file_ref_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/file_ref_resource.h b/chromium/ppapi/proxy/file_ref_resource.h index 59e7b7c9684..2ed2cc7299f 100644 --- a/chromium/ppapi/proxy/file_ref_resource.h +++ b/chromium/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/chromium/ppapi/proxy/file_system_resource.h b/chromium/ppapi/proxy/file_system_resource.h index 5b35f86d7bd..c03765cd39e 100644 --- a/chromium/ppapi/proxy/file_system_resource.h +++ b/chromium/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/chromium/ppapi/proxy/file_system_resource_unittest.cc b/chromium/ppapi/proxy/file_system_resource_unittest.cc index 9b5d981242d..d8917ceb4bc 100644 --- a/chromium/ppapi/proxy/file_system_resource_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/flash_clipboard_resource.cc b/chromium/ppapi/proxy/flash_clipboard_resource.cc index 28df94cddf8..e430dfd74ad 100644 --- a/chromium/ppapi/proxy/flash_clipboard_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/flash_clipboard_resource.h b/chromium/ppapi/proxy/flash_clipboard_resource.h index cd607d62abd..ba17e41fa3c 100644 --- a/chromium/ppapi/proxy/flash_clipboard_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_drm_resource.h b/chromium/ppapi/proxy/flash_drm_resource.h index fc773c42a6c..70e0c02465f 100644 --- a/chromium/ppapi/proxy/flash_drm_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_file_resource.cc b/chromium/ppapi/proxy/flash_file_resource.cc index 6b8fc6cc796..d696e5bd8a3 100644 --- a/chromium/ppapi/proxy/flash_file_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/flash_file_resource.h b/chromium/ppapi/proxy/flash_file_resource.h index ea35152c8f6..b45fbd5aee3 100644 --- a/chromium/ppapi/proxy/flash_file_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_font_file_resource.cc b/chromium/ppapi/proxy/flash_font_file_resource.cc index 659aa652bd9..34c22eb5743 100644 --- a/chromium/ppapi/proxy/flash_font_file_resource.cc +++ b/chromium/ppapi/proxy/flash_font_file_resource.cc @@ -6,7 +6,6 @@ #include <cstring> -#include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/chromium/ppapi/proxy/flash_font_file_resource.h b/chromium/ppapi/proxy/flash_font_file_resource.h index fada61d4ffe..4694734b4c4 100644 --- a/chromium/ppapi/proxy/flash_font_file_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_fullscreen_resource.cc b/chromium/ppapi/proxy/flash_fullscreen_resource.cc index 90a68fcf6b5..feab2774a62 100644 --- a/chromium/ppapi/proxy/flash_fullscreen_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/flash_fullscreen_resource.h b/chromium/ppapi/proxy/flash_fullscreen_resource.h index b193e303b47..0c276a3c85e 100644 --- a/chromium/ppapi/proxy/flash_fullscreen_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_menu_resource.h b/chromium/ppapi/proxy/flash_menu_resource.h index 23b74876236..af0fe86fe91 100644 --- a/chromium/ppapi/proxy/flash_menu_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_resource.cc b/chromium/ppapi/proxy/flash_resource.cc index 26a80ae8222..d8ec440a566 100644 --- a/chromium/ppapi/proxy/flash_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/flash_resource.h b/chromium/ppapi/proxy/flash_resource.h index 21cdbb73bce..df2177824ff 100644 --- a/chromium/ppapi/proxy/flash_resource.h +++ b/chromium/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/chromium/ppapi/proxy/flash_resource_unittest.cc b/chromium/ppapi/proxy/flash_resource_unittest.cc index 1a5e7c644d4..a4815b70f0c 100644 --- a/chromium/ppapi/proxy/flash_resource_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/gamepad_resource.h b/chromium/ppapi/proxy/gamepad_resource.h index 4851d69cd8e..b2aeca47f32 100644 --- a/chromium/ppapi/proxy/gamepad_resource.h +++ b/chromium/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/chromium/ppapi/proxy/graphics_2d_resource.cc b/chromium/ppapi/proxy/graphics_2d_resource.cc index 0cf74657004..3b91a6a493b 100644 --- a/chromium/ppapi/proxy/graphics_2d_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/graphics_2d_resource.h b/chromium/ppapi/proxy/graphics_2d_resource.h index efd7d760877..7c8fb69b50b 100644 --- a/chromium/ppapi/proxy/graphics_2d_resource.h +++ b/chromium/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/chromium/ppapi/proxy/host_dispatcher.cc b/chromium/ppapi/proxy/host_dispatcher.cc index eb9f7ee48d7..5d61429fa4b 100644 --- a/chromium/ppapi/proxy/host_dispatcher.cc +++ b/chromium/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/chromium/ppapi/proxy/host_dispatcher.h b/chromium/ppapi/proxy/host_dispatcher.h index 8c8e9488c77..35daf564c6c 100644 --- a/chromium/ppapi/proxy/host_dispatcher.h +++ b/chromium/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/chromium/ppapi/proxy/host_resolver_private_resource.h b/chromium/ppapi/proxy/host_resolver_private_resource.h index d83b707bc65..14da8676ccf 100644 --- a/chromium/ppapi/proxy/host_resolver_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/host_resolver_resource.h b/chromium/ppapi/proxy/host_resolver_resource.h index ae6c524d3c5..034b741ee78 100644 --- a/chromium/ppapi/proxy/host_resolver_resource.h +++ b/chromium/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/chromium/ppapi/proxy/host_resolver_resource_base.h b/chromium/ppapi/proxy/host_resolver_resource_base.h index d27d9888179..2147ba9f07e 100644 --- a/chromium/ppapi/proxy/host_resolver_resource_base.h +++ b/chromium/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/chromium/ppapi/proxy/host_var_serialization_rules.h b/chromium/ppapi/proxy/host_var_serialization_rules.h index 8de6cdecf34..404312f0522 100644 --- a/chromium/ppapi/proxy/host_var_serialization_rules.h +++ b/chromium/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/chromium/ppapi/proxy/interface_list.cc b/chromium/ppapi/proxy/interface_list.cc index db7a67a9881..eca4626d596 100644 --- a/chromium/ppapi/proxy/interface_list.cc +++ b/chromium/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/chromium/ppapi/proxy/interface_list.h b/chromium/ppapi/proxy/interface_list.h index 2fec61f4926..f31724115f6 100644 --- a/chromium/ppapi/proxy/interface_list.h +++ b/chromium/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/chromium/ppapi/proxy/interface_proxy.h b/chromium/ppapi/proxy/interface_proxy.h index 099d58b5fe7..6cfd7d762fb 100644 --- a/chromium/ppapi/proxy/interface_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/isolated_file_system_private_resource.h b/chromium/ppapi/proxy/isolated_file_system_private_resource.h index 55ff23e9af7..a9e659f0de9 100644 --- a/chromium/ppapi/proxy/isolated_file_system_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/locking_resource_releaser.h b/chromium/ppapi/proxy/locking_resource_releaser.h index d390ac4426e..d770df62f9f 100644 --- a/chromium/ppapi/proxy/locking_resource_releaser.h +++ b/chromium/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/chromium/ppapi/proxy/media_stream_audio_track_resource.h b/chromium/ppapi/proxy/media_stream_audio_track_resource.h index 566f42d96ca..3c25726287d 100644 --- a/chromium/ppapi/proxy/media_stream_audio_track_resource.h +++ b/chromium/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/chromium/ppapi/proxy/media_stream_track_resource_base.cc b/chromium/ppapi/proxy/media_stream_track_resource_base.cc index 12ebdb7c4f9..16d549947a4 100644 --- a/chromium/ppapi/proxy/media_stream_track_resource_base.cc +++ b/chromium/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/chromium/ppapi/proxy/media_stream_track_resource_base.h b/chromium/ppapi/proxy/media_stream_track_resource_base.h index 0e7e9cc2854..1de5d0d9aa5 100644 --- a/chromium/ppapi/proxy/media_stream_track_resource_base.h +++ b/chromium/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/chromium/ppapi/proxy/media_stream_video_track_resource.h b/chromium/ppapi/proxy/media_stream_video_track_resource.h index b6102ecdb50..1b18cfac502 100644 --- a/chromium/ppapi/proxy/media_stream_video_track_resource.h +++ b/chromium/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/chromium/ppapi/proxy/message_handler.cc b/chromium/ppapi/proxy/message_handler.cc index 9fe95b2154e..b2f3929c248 100644 --- a/chromium/ppapi/proxy/message_handler.cc +++ b/chromium/ppapi/proxy/message_handler.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/message_handler.h" +#include <utility> + #include "base/location.h" #include "base/single_thread_task_runner.h" #include "ipc/ipc_message.h" @@ -68,25 +70,25 @@ scoped_ptr<MessageHandler> MessageHandler::Create( !handler_if->HandleBlockingMessage || !handler_if->Destroy) { *error = PP_ERROR_BADARGUMENT; - return result.Pass(); + return result; } thunk::EnterResourceNoLock<thunk::PPB_MessageLoop_API> enter_loop(message_loop, true); if (enter_loop.failed()) { *error = PP_ERROR_BADRESOURCE; - return result.Pass(); + return result; } scoped_refptr<MessageLoopResource> message_loop_resource( static_cast<MessageLoopResource*>(enter_loop.object())); if (message_loop_resource->is_main_thread_loop()) { *error = PP_ERROR_WRONG_THREAD; - return result.Pass(); + return result; } result.reset(new MessageHandler( instance, handler_if, user_data, message_loop_resource)); *error = PP_OK; - return result.Pass(); + return result; } MessageHandler::~MessageHandler() { @@ -117,7 +119,7 @@ void MessageHandler::HandleBlockingMessage(ScopedPPVar var, FROM_HERE, RunWhileLocked(base::Bind( &HandleBlockingMessageWrapper, handler_if_->HandleBlockingMessage, - instance_, user_data_, var, base::Passed(reply_msg.Pass())))); + instance_, user_data_, var, base::Passed(std::move(reply_msg))))); } MessageHandler::MessageHandler( diff --git a/chromium/ppapi/proxy/message_handler.h b/chromium/ppapi/proxy/message_handler.h index cb3c6ab8257..6a83f21c9fc 100644 --- a/chromium/ppapi/proxy/message_handler.h +++ b/chromium/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/chromium/ppapi/proxy/mock_resource.h b/chromium/ppapi/proxy/mock_resource.h index 768929da4f5..ed894bdab8e 100644 --- a/chromium/ppapi/proxy/mock_resource.h +++ b/chromium/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/chromium/ppapi/proxy/nacl_message_scanner.cc b/chromium/ppapi/proxy/nacl_message_scanner.cc index 3e522f49b00..766bc8a003e 100644 --- a/chromium/ppapi/proxy/nacl_message_scanner.cc +++ b/chromium/ppapi/proxy/nacl_message_scanner.cc @@ -4,8 +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" @@ -57,6 +62,7 @@ void WriteHandle(int handle_index, // Now write the handle itself in POSIX style. // See ParamTraits<FileDescriptor>::Read for where these values are read. msg->WriteBool(true); // valid == true + msg->WriteBool(false); // brokerable == false msg->WriteInt(handle_index); } } @@ -137,6 +143,15 @@ void ScanParam(const IPC::Message& param, ScanningResults* results) { IPC::WriteParam(results->new_msg.get(), param); } +template <class T> +void ScanParam(const std::vector<T>& vec, ScanningResults* results) { + if (results->new_msg) + IPC::WriteParam(results->new_msg.get(), static_cast<int>(vec.size())); + for (const T& element : vec) { + ScanParam(element, results); + } +} + // Overload to match all other types. If we need to rewrite the message, write // the parameter. template <class T> @@ -186,6 +201,21 @@ class MessageScannerImpl { return true; } + bool ScanSyncMessage(ScanningResults* results) { + typename base::TupleTypes<typename MessageType::Schema::SendParam> + ::ValueTuple params; + if (!MessageType::ReadSendParam(msg_, ¶ms)) + return false; + // If we need to rewrite the message, write the message id first. + if (results->new_msg) { + results->new_msg->set_sync(); + int id = IPC::SyncMessage::GetMessageId(*msg_); + results->new_msg->WriteInt(id); + } + ScanTuple(params, results); + return true; + } + bool ScanReply(ScanningResults* results) { typename base::TupleTypes<typename MessageType::Schema::ReplyParam> ::ValueTuple params; @@ -200,8 +230,6 @@ class MessageScannerImpl { ScanTuple(params, results); return true; } - // TODO(dmichael): Add ScanSyncMessage for outgoing sync messages, if we ever - // need to scan those. private: const MessageType* msg_; @@ -220,6 +248,17 @@ class MessageScannerImpl { return false; \ break; \ } +#define CASE_FOR_SYNC_MESSAGE(MESSAGE_TYPE) \ + case MESSAGE_TYPE::ID: { \ + MessageScannerImpl<MESSAGE_TYPE> scanner(&msg); \ + if (rewrite_msg) \ + results.new_msg.reset( \ + new IPC::Message(msg.routing_id(), msg.type(), \ + IPC::Message::PRIORITY_NORMAL)); \ + if (!scanner.ScanSyncMessage(&results)) \ + return false; \ + break; \ + } #define CASE_FOR_REPLY(MESSAGE_TYPE) \ case MESSAGE_TYPE::ID: { \ MessageScannerImpl<MESSAGE_TYPE> scanner(&msg); \ @@ -325,6 +364,9 @@ bool NaClMessageScanner::ScanMessage( CASE_FOR_MESSAGE(PpapiMsg_PPBAudio_NotifyAudioStreamCreated) CASE_FOR_MESSAGE(PpapiMsg_PPPMessaging_HandleMessage) CASE_FOR_MESSAGE(PpapiPluginMsg_ResourceReply) + CASE_FOR_SYNC_MESSAGE(PpapiMsg_PPPMessageHandler_HandleBlockingMessage) + CASE_FOR_SYNC_MESSAGE(PpapiMsg_PnaclTranslatorCompileInit) + CASE_FOR_SYNC_MESSAGE(PpapiMsg_PnaclTranslatorLink) CASE_FOR_REPLY(PpapiHostMsg_OpenResource) CASE_FOR_REPLY(PpapiHostMsg_PPBGraphics3D_Create) CASE_FOR_REPLY(PpapiHostMsg_PPBGraphics3D_CreateTransferBuffer) @@ -341,7 +383,7 @@ bool NaClMessageScanner::ScanMessage( // we ever add new param types that also require rewriting. if (!results.handles.empty()) { handles->swap(results.handles); - *new_msg_ptr = results.new_msg.Pass(); + *new_msg_ptr = std::move(results.new_msg); } return true; } diff --git a/chromium/ppapi/proxy/nacl_message_scanner.h b/chromium/ppapi/proxy/nacl_message_scanner.h index 6a039239cf4..8c5f7662ae7 100644 --- a/chromium/ppapi/proxy/nacl_message_scanner.h +++ b/chromium/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/chromium/ppapi/proxy/nacl_message_scanner_unittest.cc b/chromium/ppapi/proxy/nacl_message_scanner_unittest.cc index 41b1e016335..2ca5a289502 100644 --- a/chromium/ppapi/proxy/nacl_message_scanner_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/net_address_resource.h b/chromium/ppapi/proxy/net_address_resource.h index fe17ec6b6f0..f5448966544 100644 --- a/chromium/ppapi/proxy/net_address_resource.h +++ b/chromium/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/chromium/ppapi/proxy/network_list_resource.cc b/chromium/ppapi/proxy/network_list_resource.cc index 466e533daf7..f4ec7ed4059 100644 --- a/chromium/ppapi/proxy/network_list_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/network_list_resource.h b/chromium/ppapi/proxy/network_list_resource.h index 005b752bec0..66ea8aa3aee 100644 --- a/chromium/ppapi/proxy/network_list_resource.h +++ b/chromium/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/chromium/ppapi/proxy/network_monitor_resource.h b/chromium/ppapi/proxy/network_monitor_resource.h index 2fb91e753f2..77b3e614dc3 100644 --- a/chromium/ppapi/proxy/network_monitor_resource.h +++ b/chromium/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/chromium/ppapi/proxy/network_proxy_resource.h b/chromium/ppapi/proxy/network_proxy_resource.h index b48089d08ec..646e046d048 100644 --- a/chromium/ppapi/proxy/network_proxy_resource.h +++ b/chromium/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/chromium/ppapi/proxy/output_protection_resource.h b/chromium/ppapi/proxy/output_protection_resource.h index 25dcc53e0c0..b18dfc5b4f5 100644 --- a/chromium/ppapi/proxy/output_protection_resource.h +++ b/chromium/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/chromium/ppapi/proxy/pdf_resource.cc b/chromium/ppapi/proxy/pdf_resource.cc index d3aad14b355..914e6957e21 100644 --- a/chromium/ppapi/proxy/pdf_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/pdf_resource.h b/chromium/ppapi/proxy/pdf_resource.h index 253f6198607..4420cc70bd6 100644 --- a/chromium/ppapi/proxy/pdf_resource.h +++ b/chromium/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/chromium/ppapi/proxy/platform_verification_private_resource.cc b/chromium/ppapi/proxy/platform_verification_private_resource.cc index 27804d36dc9..ac709c24561 100644 --- a/chromium/ppapi/proxy/platform_verification_private_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/platform_verification_private_resource.h b/chromium/ppapi/proxy/platform_verification_private_resource.h index 072b3f8dd05..ae3cd13ed07 100644 --- a/chromium/ppapi/proxy/platform_verification_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_array_buffer_var.cc b/chromium/ppapi/proxy/plugin_array_buffer_var.cc index 7dd64d17b13..625facfa0a6 100644 --- a/chromium/ppapi/proxy/plugin_array_buffer_var.cc +++ b/chromium/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/chromium/ppapi/proxy/plugin_array_buffer_var.h b/chromium/ppapi/proxy/plugin_array_buffer_var.h index ee9b9306457..8f6fe1988ab 100644 --- a/chromium/ppapi/proxy/plugin_array_buffer_var.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_dispatcher.cc b/chromium/ppapi/proxy/plugin_dispatcher.cc index 80fec1f60fc..fd5f72cb764 100644 --- a/chromium/ppapi/proxy/plugin_dispatcher.cc +++ b/chromium/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/chromium/ppapi/proxy/plugin_dispatcher.h b/chromium/ppapi/proxy/plugin_dispatcher.h index 159e69caab2..5dc22731552 100644 --- a/chromium/ppapi/proxy/plugin_dispatcher.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_globals.cc b/chromium/ppapi/proxy/plugin_globals.cc index 64ff47b4110..765ec647897 100644 --- a/chromium/ppapi/proxy/plugin_globals.cc +++ b/chromium/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/chromium/ppapi/proxy/plugin_globals.h b/chromium/ppapi/proxy/plugin_globals.h index 28cfe486dad..5075f81f382 100644 --- a/chromium/ppapi/proxy/plugin_globals.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_resource.h b/chromium/ppapi/proxy/plugin_resource.h index 0f2124035bc..0fabab20b3d 100644 --- a/chromium/ppapi/proxy/plugin_resource.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_resource_tracker.h b/chromium/ppapi/proxy/plugin_resource_tracker.h index 7dbeb6190c3..df6e6be90d0 100644 --- a/chromium/ppapi/proxy/plugin_resource_tracker.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_resource_var.h b/chromium/ppapi/proxy/plugin_resource_var.h index 461dbfddb78..2f7d0858eea 100644 --- a/chromium/ppapi/proxy/plugin_resource_var.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_var_serialization_rules.h b/chromium/ppapi/proxy/plugin_var_serialization_rules.h index 1616a755220..1f1166955c5 100644 --- a/chromium/ppapi/proxy/plugin_var_serialization_rules.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_var_tracker.cc b/chromium/ppapi/proxy/plugin_var_tracker.cc index 81f313cafad..f7e68f8d1a2 100644 --- a/chromium/ppapi/proxy/plugin_var_tracker.cc +++ b/chromium/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/chromium/ppapi/proxy/plugin_var_tracker.h b/chromium/ppapi/proxy/plugin_var_tracker.h index 0318a4ab5a3..fa866577f93 100644 --- a/chromium/ppapi/proxy/plugin_var_tracker.h +++ b/chromium/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/chromium/ppapi/proxy/plugin_var_tracker_unittest.cc b/chromium/ppapi/proxy/plugin_var_tracker_unittest.cc index 51d50365cd3..79c124737b6 100644 --- a/chromium/ppapi/proxy/plugin_var_tracker_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc index c430c784d16..c645927e5b0 100644 --- a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc +++ b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/ppapi_command_buffer_proxy.h" +#include <utility> + #include "base/numerics/safe_conversions.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/api_id.h" @@ -22,7 +24,11 @@ PpapiCommandBufferProxy::PpapiCommandBufferProxy( : command_buffer_id_(command_buffer_id), capabilities_(capabilities), resource_(resource), - dispatcher_(dispatcher) { + dispatcher_(dispatcher), + next_fence_sync_release_(1), + pending_fence_sync_release_(0), + flushed_fence_sync_release_(0), + validated_fence_sync_release_(0) { shared_state_shm_.reset( new base::SharedMemory(shared_state.shmem(), false)); shared_state_shm_->Map(shared_state.size()); @@ -44,13 +50,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; @@ -58,19 +64,21 @@ 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; - if (flush_info_->flush_pending && flush_info_->resource != resource_) + if (flush_info_->flush_pending && flush_info_->resource != resource_) { FlushInternal(); + } flush_info_->flush_pending = true; flush_info_->resource = resource_; flush_info_->put_offset = 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) { @@ -89,7 +97,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) { @@ -108,7 +117,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)); @@ -117,7 +126,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) @@ -154,10 +163,11 @@ scoped_refptr<gpu::Buffer> PpapiCommandBufferProxy::CreateTransferBuffer( } } - return gpu::MakeBufferFromSharedMemory(shared_memory.Pass(), handle.size()); + return gpu::MakeBufferFromSharedMemory(std::move(shared_memory), + handle.size()); } -void PpapiCommandBufferProxy::DestroyTransferBuffer(int32 id) { +void PpapiCommandBufferProxy::DestroyTransferBuffer(int32_t id) { if (last_state_.error != gpu::error::kNoError) return; @@ -165,11 +175,6 @@ void PpapiCommandBufferProxy::DestroyTransferBuffer(int32 id) { ppapi::API_ID_PPB_GRAPHICS_3D, resource_, id)); } -uint32 PpapiCommandBufferProxy::CreateStreamTexture(uint32 texture_id) { - NOTREACHED(); - return 0; -} - void PpapiCommandBufferProxy::SetLock(base::Lock*) { NOTIMPLEMENTED(); } @@ -179,6 +184,13 @@ bool PpapiCommandBufferProxy::IsGpuChannelLost() { return false; } +void PpapiCommandBufferProxy::EnsureWorkVisible() { + DCHECK_GE(flushed_fence_sync_release_, validated_fence_sync_release_); + Send(new PpapiHostMsg_PPBGraphics3D_EnsureWorkVisible( + ppapi::API_ID_PPB_GRAPHICS_3D, resource_)); + validated_fence_sync_release_ = flushed_fence_sync_release_; +} + gpu::CommandBufferNamespace PpapiCommandBufferProxy::GetNamespaceID() const { return gpu::CommandBufferNamespace::GPU_IO; } @@ -187,8 +199,45 @@ uint64_t PpapiCommandBufferProxy::GetCommandBufferID() const { return command_buffer_id_; } -uint32 PpapiCommandBufferProxy::InsertSyncPoint() { - uint32 sync_point = 0; +uint64_t PpapiCommandBufferProxy::GenerateFenceSyncRelease() { + return next_fence_sync_release_++; +} + +bool PpapiCommandBufferProxy::IsFenceSyncRelease(uint64_t release) { + return release != 0 && release < next_fence_sync_release_; +} + +bool PpapiCommandBufferProxy::IsFenceSyncFlushed(uint64_t release) { + return release <= flushed_fence_sync_release_; +} + +bool PpapiCommandBufferProxy::IsFenceSyncFlushReceived(uint64_t release) { + if (!IsFenceSyncFlushed(release)) + return false; + + if (release <= validated_fence_sync_release_) + return true; + + EnsureWorkVisible(); + return release <= validated_fence_sync_release_; +} + +void PpapiCommandBufferProxy::SignalSyncToken(const gpu::SyncToken& sync_token, + const base::Closure& callback) { + NOTIMPLEMENTED(); +} + +bool PpapiCommandBufferProxy::CanWaitUnverifiedSyncToken( + const gpu::SyncToken* sync_token) { + return false; +} + +int32_t PpapiCommandBufferProxy::GetExtraCommandBufferData() const { + return 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)); @@ -196,8 +245,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)); @@ -205,44 +254,40 @@ 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(); } -void PpapiCommandBufferProxy::SetSurfaceVisible(bool visible) { - NOTREACHED(); -} - 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, @@ -294,6 +339,7 @@ void PpapiCommandBufferProxy::FlushInternal() { DCHECK(last_state_.error == gpu::error::kNoError); DCHECK(flush_info_->flush_pending); + DCHECK_GE(pending_fence_sync_release_, flushed_fence_sync_release_); IPC::Message* message = new PpapiHostMsg_PPBGraphics3D_AsyncFlush( ppapi::API_ID_PPB_GRAPHICS_3D, flush_info_->resource, @@ -307,6 +353,7 @@ void PpapiCommandBufferProxy::FlushInternal() { flush_info_->flush_pending = false; flush_info_->resource.SetHostResource(0, 0); + flushed_fence_sync_release_ = pending_fence_sync_release_; } } // namespace proxy diff --git a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h index ddb383891c1..8e3450653ac 100644 --- a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h +++ b/chromium/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,39 +41,46 @@ 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 SetSurfaceVisible(bool visible) override; - uint32 CreateStreamTexture(uint32 texture_id) override; + void SignalQuery(uint32_t query, const base::Closure& callback) override; void SetLock(base::Lock*) override; bool IsGpuChannelLost() override; + void EnsureWorkVisible() override; gpu::CommandBufferNamespace GetNamespaceID() const override; uint64_t GetCommandBufferID() const override; + uint64_t GenerateFenceSyncRelease() override; + bool IsFenceSyncRelease(uint64_t release) override; + bool IsFenceSyncFlushed(uint64_t release) override; + bool IsFenceSyncFlushReceived(uint64_t release) override; + void SignalSyncToken(const gpu::SyncToken& sync_token, + const base::Closure& callback) override; + bool CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) override; + int32_t GetExtraCommandBufferData() const override; private: bool Send(IPC::Message* msg); @@ -96,6 +107,11 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, InstanceData::FlushInfo *flush_info_; + uint64_t next_fence_sync_release_; + uint64_t pending_fence_sync_release_; + uint64_t flushed_fence_sync_release_; + uint64_t validated_fence_sync_release_; + DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy); }; diff --git a/chromium/ppapi/proxy/ppapi_message_utils.h b/chromium/ppapi/proxy/ppapi_message_utils.h index 6588a6e78a7..fbcb1057ca0 100644 --- a/chromium/ppapi/proxy/ppapi_message_utils.h +++ b/chromium/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/chromium/ppapi/proxy/ppapi_messages.h b/chromium/ppapi/proxy/ppapi_messages.h index c36ceac59be..d68f770f0f0 100644 --- a/chromium/ppapi/proxy/ppapi_messages.h +++ b/chromium/ppapi/proxy/ppapi_messages.h @@ -3,18 +3,22 @@ // 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" #include "gpu/ipc/gpu_command_buffer_traits.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" @@ -129,6 +133,7 @@ IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoFrame_Format, PP_VIDEOFRAME_FORMAT_LAST) IPC_ENUM_TRAITS_MAX_VALUE(PP_HardwareAcceleration, PP_HARDWAREACCELERATION_LAST) +IPC_ENUM_TRAITS_MAX_VALUE(PP_AudioProfile, PP_AUDIOPROFILE_MAX) IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoProfile, PP_VIDEOPROFILE_MAX) IPC_STRUCT_TRAITS_BEGIN(PP_Point) @@ -278,8 +283,8 @@ IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData::TextureLayer) IPC_STRUCT_TRAITS_MEMBER(mailbox) + IPC_STRUCT_TRAITS_MEMBER(sync_token) IPC_STRUCT_TRAITS_MEMBER(target) - IPC_STRUCT_TRAITS_MEMBER(sync_point) IPC_STRUCT_TRAITS_MEMBER(source_rect) IPC_STRUCT_TRAITS_MEMBER(premult_alpha) IPC_STRUCT_TRAITS_END() @@ -441,6 +446,14 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::PpapiNaClPluginArgs) IPC_STRUCT_TRAITS_MEMBER(switch_values) IPC_STRUCT_TRAITS_END() +IPC_STRUCT_TRAITS_BEGIN(PP_AudioProfileDescription) + IPC_STRUCT_TRAITS_MEMBER(profile) + IPC_STRUCT_TRAITS_MEMBER(max_channels) + IPC_STRUCT_TRAITS_MEMBER(sample_size) + IPC_STRUCT_TRAITS_MEMBER(sample_rate) + IPC_STRUCT_TRAITS_MEMBER(hardware_accelerated) +IPC_STRUCT_TRAITS_END() + IPC_STRUCT_TRAITS_BEGIN(PP_VideoProfileDescription) IPC_STRUCT_TRAITS_MEMBER(profile) IPC_STRUCT_TRAITS_MEMBER(max_resolution) @@ -449,6 +462,15 @@ IPC_STRUCT_TRAITS_MEMBER(max_framerate_denominator) IPC_STRUCT_TRAITS_MEMBER(hardware_accelerated) IPC_STRUCT_TRAITS_END() +IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPB_AudioEncodeParameters) + IPC_STRUCT_TRAITS_MEMBER(channels) + IPC_STRUCT_TRAITS_MEMBER(input_sample_rate) + IPC_STRUCT_TRAITS_MEMBER(input_sample_size) + IPC_STRUCT_TRAITS_MEMBER(output_profile) + IPC_STRUCT_TRAITS_MEMBER(initial_bitrate) + IPC_STRUCT_TRAITS_MEMBER(acceleration) +IPC_STRUCT_TRAITS_END() + #if !defined(OS_NACL) && !defined(NACL_WIN64) IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer) @@ -523,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. @@ -617,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, @@ -849,6 +871,57 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PpapiMsg_PPPInstancePrivate_GetInstanceObject, #endif // !defined(OS_NACL) && !defined(NACL_WIN64) +// This message is sent from the renderer to the PNaCl compiler process +// (NaCl untrusted code -- a nexe). This implements the init_callback() +// IRT interface. This message initializes the translation process, +// providing an array of object file FDs for writing output to, along with +// other parameters. +IPC_SYNC_MESSAGE_CONTROL3_2(PpapiMsg_PnaclTranslatorCompileInit, + /* number of threads to use */ + int, + /* object file FDs for outputs */ + std::vector<ppapi::proxy::SerializedHandle>, + /* list of command line flags */ + std::vector<std::string>, + /* success status result */ + bool, + /* error string if the success field is false */ + std::string) + +// This message is sent from the renderer to the PNaCl compiler process +// (NaCl untrusted code -- a nexe). This implements the data_callback() +// IRT interface. This message sends the next chunk of input bitcode data +// to the compiler process. If the success result is false (for failure), +// the renderer can still invoke PpapiMsg_PnaclTranslatorCompileEnd to get +// a message describing the error. +IPC_SYNC_MESSAGE_CONTROL1_1(PpapiMsg_PnaclTranslatorCompileChunk, + /* chunk of data for the input pexe file */ + std::string, + /* success status result */ + bool) + +// This message is sent from the renderer to the PNaCl compiler process +// (NaCl untrusted code -- a nexe). This implements the end_callback() IRT +// interface. This blocks until translation is complete or an error has +// occurred. +IPC_SYNC_MESSAGE_CONTROL0_2(PpapiMsg_PnaclTranslatorCompileEnd, + /* success status result */ + bool, + /* error string if the success field is false */ + std::string) + +// This message is sent from the renderer to the PNaCl linker process +// (NaCl untrusted code -- a nexe). This message tells the PNaCl +// linker to link the given object files together to produce a nexe +// file, writing the output to the given file handle. +IPC_SYNC_MESSAGE_CONTROL2_1(PpapiMsg_PnaclTranslatorLink, + /* object file FDs for inputs */ + std::vector<ppapi::proxy::SerializedHandle>, + /* nexe file FD for output */ + ppapi::proxy::SerializedHandle, + /* success status result */ + bool) + // Reports to the browser that a plugin has been active. IPC_MESSAGE_CONTROL0(PpapiHostMsg_Keepalive) @@ -865,7 +938,20 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_ChannelCreated, // Notify the renderer that the PPAPI channel gets ready in the plugin. IPC_MESSAGE_CONTROL0(PpapiHostMsg_StartupInitializationComplete) -// Calls renderer to open a resource file for nacl_irt_open_resource(). +// This is sent from a nexe (NaCl untrusted code) to the renderer, to open a +// file listed in a NaCl manifest file (NMF). It is part of the +// implementation of open_resource(), which is defined in NaCl's irt.h. +// +// This call returns a read-only file handle from the renderer. When using +// validation caching, this handle is not used: The NaCl loader process will +// reacquire the handle from the more-trusted browser process via +// NaClProcessMsg_ResolveFileToken, passing the token values returned here. +// +// Note that the open_resource() interface is not a PPAPI interface (in the +// sense that it's not defined in ppapi/c/), but this message is defined here +// in ppapi_messages.h (rather than in components/nacl/) because half of the +// implementation of open_resource() lives in ppapi/nacl_irt/, and because +// this message must be processed by ppapi/proxy/nacl_message_scanner.cc. IPC_SYNC_MESSAGE_CONTROL1_3(PpapiHostMsg_OpenResource, std::string /* key */, ppapi::proxy::SerializedHandle /* fd */, @@ -889,6 +975,32 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBAudio_StartOrStop, ppapi::HostResource /* audio_id */, bool /* play */) +// PPB_AudioEncoder +IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioEncoder_Create) +IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioEncoder_GetSupportedProfiles) +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_AudioEncoder_GetSupportedProfilesReply, + std::vector<PP_AudioProfileDescription> /* results */) +IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioEncoder_Initialize, + ppapi::proxy::PPB_AudioEncodeParameters /* parameters */) +IPC_MESSAGE_CONTROL5(PpapiPluginMsg_AudioEncoder_InitializeReply, + int32_t /* number_of_samples */, + int32_t /* audio_buffer_count */, + int32_t /* audio_buffer_size */, + int32_t /* bitstream_buffer_count */, + int32_t /* bitstream_buffer_size */) +IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioEncoder_Encode, int32_t /* buffer_id */) +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_AudioEncoder_EncodeReply, + int32_t /* buffer_id */) +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_AudioEncoder_BitstreamBufferReady, + int32_t /* buffer_id */) +IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioEncoder_RecycleBitstreamBuffer, + int32_t /* buffer_id */) +IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioEncoder_RequestBitrateChange, + uint32_t /* bitrate */) +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_AudioEncoder_NotifyError, + int32_t /* error */) +IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioEncoder_Close) + // PPB_Core. IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBCore_AddRefResource, ppapi::HostResource) @@ -906,46 +1018,49 @@ 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 */) -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers, - ppapi::HostResource /* graphics_3d */) + int32_t /* id */) +IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_SwapBuffers, + ppapi::HostResource /* graphics_3d */, + gpu::SyncToken /* sync_token */) 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 */) +IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBGraphics3D_EnsureWorkVisible, + ppapi::HostResource /* context */) // 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 */, @@ -953,7 +1068,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 */, @@ -1055,9 +1170,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 */, @@ -1100,13 +1214,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) @@ -1199,7 +1313,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( @@ -1224,8 +1338,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 */) @@ -1402,7 +1516,7 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_Compositor_CommitLayers, IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Compositor_CommitLayersReply) IPC_MESSAGE_CONTROL3(PpapiPluginMsg_Compositor_ReleaseResource, int32_t /* id */, - uint32_t /* sync_point */, + gpu::SyncToken /* sync_token */, bool /* is_lost */) // File chooser. diff --git a/chromium/ppapi/proxy/ppapi_param_traits.cc b/chromium/ppapi/proxy/ppapi_param_traits.cc index 3895b31b864..57f8a9f66a0 100644 --- a/chromium/ppapi/proxy/ppapi_param_traits.cc +++ b/chromium/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" @@ -76,7 +80,7 @@ void WriteVectorWithoutCopy(Message* m, const std::vector<T>& p) { // static void ParamTraits<PP_Bool>::Write(Message* m, const param_type& p) { - ParamTraits<bool>::Write(m, PP_ToBool(p)); + WriteParam(m, PP_ToBool(p)); } // static @@ -87,7 +91,7 @@ bool ParamTraits<PP_Bool>::Read(const Message* m, // which ParamTraits<bool> does for us. We don't want to deserialize "2" into // a PP_Bool, for example. bool result = false; - if (!ParamTraits<bool>::Read(m, iter, &result)) + if (!ReadParam(m, iter, &result)) return false; *r = PP_FromBool(result); return true; @@ -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)) @@ -183,8 +187,8 @@ void ParamTraits<PP_NetAddress_Private>::Log(const param_type& p, // static void ParamTraits<ppapi::HostResource>::Write(Message* m, const param_type& p) { - ParamTraits<PP_Instance>::Write(m, p.instance()); - ParamTraits<PP_Resource>::Write(m, p.host_resource()); + WriteParam(m, p.instance()); + WriteParam(m, p.host_resource()); } // static @@ -193,8 +197,7 @@ bool ParamTraits<ppapi::HostResource>::Read(const Message* m, param_type* r) { PP_Instance instance; PP_Resource resource; - if (!ParamTraits<PP_Instance>::Read(m, iter, &instance) || - !ParamTraits<PP_Resource>::Read(m, iter, &resource)) + if (!ReadParam(m, iter, &instance) || !ReadParam(m, iter, &resource)) return false; r->SetHostResource(instance, resource); return true; @@ -251,7 +254,7 @@ void ParamTraits< std::vector<ppapi::proxy::SerializedVar> >::Log( void ParamTraits<ppapi::PpapiPermissions>::Write(Message* m, const param_type& p) { - ParamTraits<uint32_t>::Write(m, p.GetBits()); + WriteParam(m, p.GetBits()); } // static @@ -259,7 +262,7 @@ bool ParamTraits<ppapi::PpapiPermissions>::Read(const Message* m, base::PickleIterator* iter, param_type* r) { uint32_t bits; - if (!ParamTraits<uint32_t>::Read(m, iter, &bits)) + if (!ReadParam(m, iter, &bits)) return false; *r = ppapi::PpapiPermissions(bits); return true; @@ -278,11 +281,11 @@ void ParamTraits<ppapi::proxy::SerializedHandle>::Write(Message* m, ppapi::proxy::SerializedHandle::WriteHeader(p.header(), m); switch (p.type()) { case ppapi::proxy::SerializedHandle::SHARED_MEMORY: - ParamTraits<base::SharedMemoryHandle>::Write(m, p.shmem()); + WriteParam(m, p.shmem()); break; case ppapi::proxy::SerializedHandle::SOCKET: case ppapi::proxy::SerializedHandle::FILE: - ParamTraits<IPC::PlatformFileForTransit>::Write(m, p.descriptor()); + WriteParam(m, p.descriptor()); break; case ppapi::proxy::SerializedHandle::INVALID: break; @@ -301,7 +304,7 @@ bool ParamTraits<ppapi::proxy::SerializedHandle>::Read( switch (header.type) { case ppapi::proxy::SerializedHandle::SHARED_MEMORY: { base::SharedMemoryHandle handle; - if (ParamTraits<base::SharedMemoryHandle>::Read(m, iter, &handle)) { + if (ReadParam(m, iter, &handle)) { r->set_shmem(handle, header.size); return true; } @@ -309,7 +312,7 @@ bool ParamTraits<ppapi::proxy::SerializedHandle>::Read( } case ppapi::proxy::SerializedHandle::SOCKET: { IPC::PlatformFileForTransit socket; - if (ParamTraits<IPC::PlatformFileForTransit>::Read(m, iter, &socket)) { + if (ReadParam(m, iter, &socket)) { r->set_socket(socket); return true; } @@ -317,7 +320,7 @@ bool ParamTraits<ppapi::proxy::SerializedHandle>::Read( } case ppapi::proxy::SerializedHandle::FILE: { IPC::PlatformFileForTransit desc; - if (ParamTraits<IPC::PlatformFileForTransit>::Read(m, iter, &desc)) { + if (ReadParam(m, iter, &desc)) { r->set_file_handle(desc, header.open_flags, header.file_io); return true; } @@ -341,12 +344,12 @@ void ParamTraits<ppapi::proxy::SerializedHandle>::Log(const param_type& p, void ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Write( Message* m, const param_type& p) { - ParamTraits<PP_Instance>::Write(m, p.instance); - ParamTraits<ppapi::HostResource>::Write(m, p.resource); - ParamTraits<int64_t>::Write(m, p.bytes_sent); - ParamTraits<int64_t>::Write(m, p.total_bytes_to_be_sent); - ParamTraits<int64_t>::Write(m, p.bytes_received); - ParamTraits<int64_t>::Write(m, p.total_bytes_to_be_received); + WriteParam(m, p.instance); + WriteParam(m, p.resource); + WriteParam(m, p.bytes_sent); + WriteParam(m, p.total_bytes_to_be_sent); + WriteParam(m, p.bytes_received); + WriteParam(m, p.total_bytes_to_be_received); } // static @@ -354,13 +357,11 @@ bool ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Read( const Message* m, base::PickleIterator* iter, param_type* r) { - return - ParamTraits<PP_Instance>::Read(m, iter, &r->instance) && - ParamTraits<ppapi::HostResource>::Read(m, iter, &r->resource) && - ParamTraits<int64_t>::Read(m, iter, &r->bytes_sent) && - ParamTraits<int64_t>::Read(m, iter, &r->total_bytes_to_be_sent) && - ParamTraits<int64_t>::Read(m, iter, &r->bytes_received) && - ParamTraits<int64_t>::Read(m, iter, &r->total_bytes_to_be_received); + return ReadParam(m, iter, &r->instance) && ReadParam(m, iter, &r->resource) && + ReadParam(m, iter, &r->bytes_sent) && + ReadParam(m, iter, &r->total_bytes_to_be_sent) && + ReadParam(m, iter, &r->bytes_received) && + ReadParam(m, iter, &r->total_bytes_to_be_received); } // static @@ -375,24 +376,24 @@ void ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Log( void ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Write( Message* m, const param_type& p) { - ParamTraits<PP_Instance>::Write(m, p.instance); - ParamTraits<ppapi::HostResource>::Write(m, p.image_data); - ParamTraits<ppapi::proxy::SerializedFontDescription>::Write(m, p.font_desc); - ParamTraits<uint32_t>::Write(m, p.color); - ParamTraits<PP_Point>::Write(m, p.position); - ParamTraits<PP_Rect>::Write(m, p.clip); - ParamTraits<float>::Write(m, p.transformation[0][0]); - ParamTraits<float>::Write(m, p.transformation[0][1]); - ParamTraits<float>::Write(m, p.transformation[0][2]); - ParamTraits<float>::Write(m, p.transformation[1][0]); - ParamTraits<float>::Write(m, p.transformation[1][1]); - ParamTraits<float>::Write(m, p.transformation[1][2]); - ParamTraits<float>::Write(m, p.transformation[2][0]); - ParamTraits<float>::Write(m, p.transformation[2][1]); - ParamTraits<float>::Write(m, p.transformation[2][2]); - ParamTraits<PP_Bool>::Write(m, p.allow_subpixel_aa); - ParamTraits<std::vector<uint16_t> >::Write(m, p.glyph_indices); - ParamTraits<std::vector<PP_Point> >::Write(m, p.glyph_advances); + WriteParam(m, p.instance); + WriteParam(m, p.image_data); + WriteParam(m, p.font_desc); + WriteParam(m, p.color); + WriteParam(m, p.position); + WriteParam(m, p.clip); + WriteParam(m, p.transformation[0][0]); + WriteParam(m, p.transformation[0][1]); + WriteParam(m, p.transformation[0][2]); + WriteParam(m, p.transformation[1][0]); + WriteParam(m, p.transformation[1][1]); + WriteParam(m, p.transformation[1][2]); + WriteParam(m, p.transformation[2][0]); + WriteParam(m, p.transformation[2][1]); + WriteParam(m, p.transformation[2][2]); + WriteParam(m, p.allow_subpixel_aa); + WriteParam(m, p.glyph_indices); + WriteParam(m, p.glyph_advances); } // static @@ -400,27 +401,23 @@ bool ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Read( const Message* m, base::PickleIterator* iter, param_type* r) { - return - ParamTraits<PP_Instance>::Read(m, iter, &r->instance) && - ParamTraits<ppapi::HostResource>::Read(m, iter, &r->image_data) && - ParamTraits<ppapi::proxy::SerializedFontDescription>::Read(m, iter, - &r->font_desc) && - ParamTraits<uint32_t>::Read(m, iter, &r->color) && - ParamTraits<PP_Point>::Read(m, iter, &r->position) && - ParamTraits<PP_Rect>::Read(m, iter, &r->clip) && - ParamTraits<float>::Read(m, iter, &r->transformation[0][0]) && - ParamTraits<float>::Read(m, iter, &r->transformation[0][1]) && - ParamTraits<float>::Read(m, iter, &r->transformation[0][2]) && - ParamTraits<float>::Read(m, iter, &r->transformation[1][0]) && - ParamTraits<float>::Read(m, iter, &r->transformation[1][1]) && - ParamTraits<float>::Read(m, iter, &r->transformation[1][2]) && - ParamTraits<float>::Read(m, iter, &r->transformation[2][0]) && - ParamTraits<float>::Read(m, iter, &r->transformation[2][1]) && - ParamTraits<float>::Read(m, iter, &r->transformation[2][2]) && - ParamTraits<PP_Bool>::Read(m, iter, &r->allow_subpixel_aa) && - ParamTraits<std::vector<uint16_t> >::Read(m, iter, &r->glyph_indices) && - ParamTraits<std::vector<PP_Point> >::Read(m, iter, &r->glyph_advances) && - r->glyph_indices.size() == r->glyph_advances.size(); + return ReadParam(m, iter, &r->instance) && + ReadParam(m, iter, &r->image_data) && + ReadParam(m, iter, &r->font_desc) && ReadParam(m, iter, &r->color) && + ReadParam(m, iter, &r->position) && ReadParam(m, iter, &r->clip) && + ReadParam(m, iter, &r->transformation[0][0]) && + ReadParam(m, iter, &r->transformation[0][1]) && + ReadParam(m, iter, &r->transformation[0][2]) && + ReadParam(m, iter, &r->transformation[1][0]) && + ReadParam(m, iter, &r->transformation[1][1]) && + ReadParam(m, iter, &r->transformation[1][2]) && + ReadParam(m, iter, &r->transformation[2][0]) && + ReadParam(m, iter, &r->transformation[2][1]) && + ReadParam(m, iter, &r->transformation[2][2]) && + ReadParam(m, iter, &r->allow_subpixel_aa) && + ReadParam(m, iter, &r->glyph_indices) && + ReadParam(m, iter, &r->glyph_advances) && + r->glyph_indices.size() == r->glyph_advances.size(); } // static @@ -434,8 +431,8 @@ void ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Log( // static void ParamTraits<ppapi::proxy::SerializedDirEntry>::Write(Message* m, const param_type& p) { - ParamTraits<std::string>::Write(m, p.name); - ParamTraits<bool>::Write(m, p.is_dir); + WriteParam(m, p.name); + WriteParam(m, p.is_dir); } // static @@ -443,8 +440,7 @@ bool ParamTraits<ppapi::proxy::SerializedDirEntry>::Read( const Message* m, base::PickleIterator* iter, param_type* r) { - return ParamTraits<std::string>::Read(m, iter, &r->name) && - ParamTraits<bool>::Read(m, iter, &r->is_dir); + return ReadParam(m, iter, &r->name) && ReadParam(m, iter, &r->is_dir); } // static @@ -458,14 +454,14 @@ void ParamTraits<ppapi::proxy::SerializedDirEntry>::Log(const param_type& p, void ParamTraits<ppapi::proxy::SerializedFontDescription>::Write( Message* m, const param_type& p) { - ParamTraits<std::string>::Write(m, p.face); - ParamTraits<int32_t>::Write(m, p.family); - ParamTraits<uint32_t>::Write(m, p.size); - ParamTraits<int32_t>::Write(m, p.weight); - ParamTraits<PP_Bool>::Write(m, p.italic); - ParamTraits<PP_Bool>::Write(m, p.small_caps); - ParamTraits<int32_t>::Write(m, p.letter_spacing); - ParamTraits<int32_t>::Write(m, p.word_spacing); + WriteParam(m, p.face); + WriteParam(m, p.family); + WriteParam(m, p.size); + WriteParam(m, p.weight); + WriteParam(m, p.italic); + WriteParam(m, p.small_caps); + WriteParam(m, p.letter_spacing); + WriteParam(m, p.word_spacing); } // static @@ -473,15 +469,11 @@ bool ParamTraits<ppapi::proxy::SerializedFontDescription>::Read( const Message* m, base::PickleIterator* iter, param_type* r) { - return - ParamTraits<std::string>::Read(m, iter, &r->face) && - ParamTraits<int32_t>::Read(m, iter, &r->family) && - ParamTraits<uint32_t>::Read(m, iter, &r->size) && - ParamTraits<int32_t>::Read(m, iter, &r->weight) && - ParamTraits<PP_Bool>::Read(m, iter, &r->italic) && - ParamTraits<PP_Bool>::Read(m, iter, &r->small_caps) && - ParamTraits<int32_t>::Read(m, iter, &r->letter_spacing) && - ParamTraits<int32_t>::Read(m, iter, &r->word_spacing); + return ReadParam(m, iter, &r->face) && ReadParam(m, iter, &r->family) && + ReadParam(m, iter, &r->size) && ReadParam(m, iter, &r->weight) && + ReadParam(m, iter, &r->italic) && ReadParam(m, iter, &r->small_caps) && + ReadParam(m, iter, &r->letter_spacing) && + ReadParam(m, iter, &r->word_spacing); } // static @@ -497,12 +489,12 @@ void ParamTraits<ppapi::proxy::SerializedFontDescription>::Log( void ParamTraits<ppapi::proxy::SerializedTrueTypeFontDesc>::Write( Message* m, const param_type& p) { - ParamTraits<std::string>::Write(m, p.family); - ParamTraits<PP_TrueTypeFontFamily_Dev>::Write(m, p.generic_family); - ParamTraits<PP_TrueTypeFontStyle_Dev>::Write(m, p.style); - ParamTraits<PP_TrueTypeFontWeight_Dev>::Write(m, p.weight); - ParamTraits<PP_TrueTypeFontWidth_Dev>::Write(m, p.width); - ParamTraits<PP_TrueTypeFontCharset_Dev>::Write(m, p.charset); + WriteParam(m, p.family); + WriteParam(m, p.generic_family); + WriteParam(m, p.style); + WriteParam(m, p.weight); + WriteParam(m, p.width); + WriteParam(m, p.charset); } // static @@ -510,14 +502,10 @@ bool ParamTraits<ppapi::proxy::SerializedTrueTypeFontDesc>::Read( const Message* m, base::PickleIterator* iter, param_type* r) { - return - ParamTraits<std::string>::Read(m, iter, &r->family) && - ParamTraits<PP_TrueTypeFontFamily_Dev>::Read(m, iter, - &r->generic_family) && - ParamTraits<PP_TrueTypeFontStyle_Dev>::Read(m, iter, &r->style) && - ParamTraits<PP_TrueTypeFontWeight_Dev>::Read(m, iter, &r->weight) && - ParamTraits<PP_TrueTypeFontWidth_Dev>::Read(m, iter, &r->width) && - ParamTraits<PP_TrueTypeFontCharset_Dev>::Read(m, iter, &r->charset); + return ReadParam(m, iter, &r->family) && + ReadParam(m, iter, &r->generic_family) && + ReadParam(m, iter, &r->style) && ReadParam(m, iter, &r->weight) && + ReadParam(m, iter, &r->width) && ReadParam(m, iter, &r->charset); } // static @@ -591,7 +579,7 @@ void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Log(const param_type& p, void ParamTraits<ppapi::PPB_X509Certificate_Fields>::Write( Message* m, const param_type& p) { - ParamTraits<base::ListValue>::Write(m, p.values_); + WriteParam(m, p.values_); } // static @@ -599,7 +587,7 @@ bool ParamTraits<ppapi::PPB_X509Certificate_Fields>::Read( const Message* m, base::PickleIterator* iter, param_type* r) { - return ParamTraits<base::ListValue>::Read(m, iter, &(r->values_)); + return ReadParam(m, iter, &(r->values_)); } // static @@ -613,7 +601,7 @@ void ParamTraits<ppapi::PPB_X509Certificate_Fields>::Log(const param_type& p, void ParamTraits<ppapi::SocketOptionData>::Write(Message* m, const param_type& p) { ppapi::SocketOptionData::Type type = p.GetType(); - ParamTraits<int32_t>::Write(m, static_cast<int32_t>(type)); + WriteParam(m, static_cast<int32_t>(type)); switch (type) { case ppapi::SocketOptionData::TYPE_INVALID: { break; @@ -625,7 +613,7 @@ void ParamTraits<ppapi::SocketOptionData>::Write(Message* m, static_cast<void>(result); DCHECK(result); - ParamTraits<bool>::Write(m, out_value); + WriteParam(m, out_value); break; } case ppapi::SocketOptionData::TYPE_INT32: { @@ -635,7 +623,7 @@ void ParamTraits<ppapi::SocketOptionData>::Write(Message* m, static_cast<void>(result); DCHECK(result); - ParamTraits<int32_t>::Write(m, out_value); + WriteParam(m, out_value); break; } // No default so the compiler will warn on new types. @@ -648,7 +636,7 @@ bool ParamTraits<ppapi::SocketOptionData>::Read(const Message* m, param_type* r) { *r = ppapi::SocketOptionData(); int32_t type = 0; - if (!ParamTraits<int32_t>::Read(m, iter, &type)) + if (!ReadParam(m, iter, &type)) return false; if (type != ppapi::SocketOptionData::TYPE_INVALID && type != ppapi::SocketOptionData::TYPE_BOOL && @@ -661,14 +649,14 @@ bool ParamTraits<ppapi::SocketOptionData>::Read(const Message* m, } case ppapi::SocketOptionData::TYPE_BOOL: { bool value = false; - if (!ParamTraits<bool>::Read(m, iter, &value)) + if (!ReadParam(m, iter, &value)) return false; r->SetBool(value); return true; } case ppapi::SocketOptionData::TYPE_INT32: { int32_t value = 0; - if (!ParamTraits<int32_t>::Read(m, iter, &value)) + if (!ReadParam(m, iter, &value)) return false; r->SetInt32(value); return true; @@ -690,7 +678,7 @@ void ParamTraits<ppapi::CompositorLayerData::Transform>::Write( Message* m, const param_type& p) { for (size_t i = 0; i < arraysize(p.matrix); i++) - ParamTraits<float>::Write(m, p.matrix[i]); + WriteParam(m, p.matrix[i]); } // static @@ -699,7 +687,7 @@ bool ParamTraits<ppapi::CompositorLayerData::Transform>::Read( base::PickleIterator* iter, param_type* r) { for (size_t i = 0; i < arraysize(r->matrix);i++) { - if (!ParamTraits<float>::Read(m, iter, &r->matrix[i])) + if (!ReadParam(m, iter, &r->matrix[i])) return false; } return true; diff --git a/chromium/ppapi/proxy/ppapi_param_traits.h b/chromium/ppapi/proxy/ppapi_param_traits.h index 6aff57450f8..e3638b8fa35 100644 --- a/chromium/ppapi/proxy/ppapi_param_traits.h +++ b/chromium/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/chromium/ppapi/proxy/ppapi_proxy_test.cc b/chromium/ppapi/proxy/ppapi_proxy_test.cc index bd76918b20a..f3fb9ddc162 100644 --- a/chromium/ppapi/proxy/ppapi_proxy_test.cc +++ b/chromium/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/chromium/ppapi/proxy/ppapi_proxy_test.h b/chromium/ppapi/proxy/ppapi_proxy_test.h index 897410da6e5..ec9907175fc 100644 --- a/chromium/ppapi/proxy/ppapi_proxy_test.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_audio_proxy.cc b/chromium/ppapi/proxy/ppb_audio_proxy.cc index daa0395d1f6..ed60aa1f0b8 100644 --- a/chromium/ppapi/proxy/ppb_audio_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_audio_proxy.h b/chromium/ppapi/proxy/ppb_audio_proxy.h index cc8af6cb9da..a738104add7 100644 --- a/chromium/ppapi/proxy/ppb_audio_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_broker_proxy.cc b/chromium/ppapi/proxy/ppb_broker_proxy.cc index e1d38ead671..3f2b617670e 100644 --- a/chromium/ppapi/proxy/ppb_broker_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_broker_proxy.h b/chromium/ppapi/proxy/ppb_broker_proxy.h index 5bc195afa50..7baf3a282e5 100644 --- a/chromium/ppapi/proxy/ppb_broker_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_buffer_proxy.h b/chromium/ppapi/proxy/ppb_buffer_proxy.h index 2c131a0948a..b3ba2482e3f 100644 --- a/chromium/ppapi/proxy/ppb_buffer_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_core_proxy.cc b/chromium/ppapi/proxy/ppb_core_proxy.cc index 0cf2a95ed29..b3651ab9d24 100644 --- a/chromium/ppapi/proxy/ppb_core_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_flash_message_loop_proxy.cc b/chromium/ppapi/proxy/ppb_flash_message_loop_proxy.cc index 1b332185293..24d990e69db 100644 --- a/chromium/ppapi/proxy/ppb_flash_message_loop_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_flash_message_loop_proxy.h b/chromium/ppapi/proxy/ppb_flash_message_loop_proxy.h index a28bbda0613..9f0a3f9a3f3 100644 --- a/chromium/ppapi/proxy/ppb_flash_message_loop_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_graphics_3d_proxy.cc b/chromium/ppapi/proxy/ppb_graphics_3d_proxy.cc index 81b6a70c927..a5f1d92acba 100644 --- a/chromium/ppapi/proxy/ppb_graphics_3d_proxy.cc +++ b/chromium/ppapi/proxy/ppb_graphics_3d_proxy.cc @@ -5,8 +5,10 @@ #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 "gpu/command_buffer/common/sync_token.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/enter_proxy.h" #include "ppapi/proxy/plugin_dispatcher.h" @@ -26,8 +28,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( @@ -113,6 +115,10 @@ void Graphics3D::RetireSyncPoint(uint32_t sync_point) { NOTREACHED(); } +void Graphics3D::EnsureWorkVisible() { + NOTREACHED(); +} + gpu::CommandBuffer* Graphics3D::GetCommandBuffer() { return command_buffer_.get(); } @@ -121,10 +127,20 @@ gpu::GpuControl* Graphics3D::GetGpuControl() { return command_buffer_.get(); } -int32 Graphics3D::DoSwapBuffers() { - gles2_impl()->SwapBuffers(); +int32_t Graphics3D::DoSwapBuffers(const gpu::SyncToken& sync_token) { + // A valid sync token would indicate a swap buffer already happened somehow. + DCHECK(!sync_token.HasData()); + + gpu::gles2::GLES2Implementation* gl = gles2_impl(); + gl->SwapBuffers(); + const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); + gl->ShallowFlushCHROMIUM(); + + gpu::SyncToken new_sync_token; + gl->GenSyncTokenCHROMIUM(fence_sync, new_sync_token.GetData()); + IPC::Message* msg = new PpapiHostMsg_PPBGraphics3D_SwapBuffers( - API_ID_PPB_GRAPHICS_3D, host_resource()); + API_ID_PPB_GRAPHICS_3D, host_resource(), new_sync_token); msg->set_unblock(true); PluginDispatcher::GetForResource(this)->Send(msg); @@ -216,6 +232,8 @@ bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) { OnMsgInsertFutureSyncPoint) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_RetireSyncPoint, OnMsgRetireSyncPoint) + IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_EnsureWorkVisible, + OnMsgEnsureWorkVisible) #endif // !defined(OS_NACL) IPC_MESSAGE_HANDLER(PpapiMsg_PPBGraphics3D_SwapBuffersACK, @@ -228,14 +246,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 +279,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 +288,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 +303,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 +317,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 +325,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,22 +348,23 @@ 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); } -void PPB_Graphics3D_Proxy::OnMsgSwapBuffers(const HostResource& context) { +void PPB_Graphics3D_Proxy::OnMsgSwapBuffers(const HostResource& context, + const gpu::SyncToken& sync_token) { EnterHostFromHostResourceForceCallback<PPB_Graphics3D_API> enter( context, callback_factory_, &PPB_Graphics3D_Proxy::SendSwapBuffersACKToPlugin, context); if (enter.succeeded()) - enter.SetResult(enter.object()->SwapBuffers(enter.callback())); + enter.SetResult(enter.object()->SwapBuffers(enter.callback(), sync_token)); } 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 +373,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,11 +381,17 @@ 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); } + +void PPB_Graphics3D_Proxy::OnMsgEnsureWorkVisible(const HostResource& context) { + EnterHostFromHostResource<PPB_Graphics3D_API> enter(context); + if (enter.succeeded()) + enter.object()->EnsureWorkVisible(); +} #endif // !defined(OS_NACL) void PPB_Graphics3D_Proxy::OnMsgSwapBuffersACK(const HostResource& resource, diff --git a/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h b/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h index 6beed429e44..a30fd6c3cd9 100644 --- a/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h +++ b/chromium/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; @@ -53,12 +56,13 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared { uint32_t InsertSyncPoint() override; uint32_t InsertFutureSyncPoint() override; void RetireSyncPoint(uint32_t sync_point) override; + void EnsureWorkVisible() override; private: // PPB_Graphics3D_Shared overrides. gpu::CommandBuffer* GetCommandBuffer() override; gpu::GpuControl* GetGpuControl() override; - int32 DoSwapBuffers() override; + int32_t DoSwapBuffers(const gpu::SyncToken& sync_token) override; scoped_ptr<PpapiCommandBufferProxy> command_buffer_; @@ -88,31 +92,31 @@ 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 OnMsgSwapBuffers(const HostResource& context); - void OnMsgInsertSyncPoint(const HostResource& context, uint32* sync_point); + void OnMsgDestroyTransferBuffer(const HostResource& context, int32_t id); + void OnMsgSwapBuffers(const HostResource& context, + const gpu::SyncToken& sync_token); + 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); + void OnMsgEnsureWorkVisible(const HostResource& context); // Renderer->plugin message handlers. void OnMsgSwapBuffersACK(const HostResource& context, int32_t pp_error); diff --git a/chromium/ppapi/proxy/ppb_image_data_proxy.cc b/chromium/ppapi/proxy/ppb_image_data_proxy.cc index 5df31456df2..3e2862985b3 100644 --- a/chromium/ppapi/proxy/ppb_image_data_proxy.cc +++ b/chromium/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" @@ -387,16 +388,19 @@ PlatformImageData::~PlatformImageData() { void* PlatformImageData::Map() { if (!mapped_canvas_.get()) { + if (!transport_dib_.get()) + return NULL; + + const bool is_opaque = false; mapped_canvas_.reset(transport_dib_->GetPlatformCanvas(desc_.size.width, - desc_.size.height)); + desc_.size.height, + is_opaque)); if (!mapped_canvas_.get()) return NULL; } - const SkBitmap& bitmap = - skia::GetTopDevice(*mapped_canvas_)->accessBitmap(true); - - bitmap.lockPixels(); - return bitmap.getAddr(0, 0); + SkPixmap pixmap; + skia::GetWritablePixels(mapped_canvas_.get(), &pixmap); + return pixmap.writable_addr(); } void PlatformImageData::Unmap() { diff --git a/chromium/ppapi/proxy/ppb_image_data_proxy.h b/chromium/ppapi/proxy/ppb_image_data_proxy.h index 47dccc4e2f5..38fc1097ba4 100644 --- a/chromium/ppapi/proxy/ppb_image_data_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_instance_proxy.cc b/chromium/ppapi/proxy/ppb_instance_proxy.cc index 8ccee5dac5d..63372cb4664 100644 --- a/chromium/ppapi/proxy/ppb_instance_proxy.cc +++ b/chromium/ppapi/proxy/ppb_instance_proxy.cc @@ -4,9 +4,10 @@ #include "ppapi/proxy/ppb_instance_proxy.h" +#include <utility> + #include "base/memory/ref_counted.h" #include "base/numerics/safe_conversions.h" -#include "base/stl_util.h" #include "build/build_config.h" #include "media/base/limits.h" #include "ppapi/c/pp_errors.h" @@ -545,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, @@ -559,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, @@ -633,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, @@ -789,7 +790,7 @@ int32_t PPB_Instance_Proxy::RegisterMessageHandler( scoped_ptr<MessageHandler> message_handler = MessageHandler::Create( instance, handler, user_data, message_loop, &result); if (message_handler) - data->message_handler = message_handler.Pass(); + data->message_handler = std::move(message_handler); return result; } @@ -1255,7 +1256,7 @@ void PPB_Instance_Proxy::OnHostMsgSessionKeysChange( enter.functions()->SessionKeysChange( instance, session_id_var.get(), has_additional_usable_key, base::checked_cast<uint32_t>(key_information.size()), - vector_as_array(&key_information)); + key_information.data()); } } diff --git a/chromium/ppapi/proxy/ppb_instance_proxy.h b/chromium/ppapi/proxy/ppb_instance_proxy.h index aac53b494db..d568ed245dc 100644 --- a/chromium/ppapi/proxy/ppb_instance_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_message_loop_proxy.cc b/chromium/ppapi/proxy/ppb_message_loop_proxy.cc index 3d29a7b9a89..e05ec5cfd30 100644 --- a/chromium/ppapi/proxy/ppb_message_loop_proxy.cc +++ b/chromium/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" @@ -141,9 +143,9 @@ int32_t MessageLoopResource::PostQuit(PP_Bool should_destroy) { should_destroy_ = true; if (IsCurrent() && nested_invocations_ > 0) - loop_->Quit(); + loop_->QuitWhenIdle(); else - PostClosure(FROM_HERE, base::MessageLoop::QuitClosure(), 0); + PostClosure(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), 0); return PP_OK; } @@ -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/chromium/ppapi/proxy/ppb_message_loop_proxy.h b/chromium/ppapi/proxy/ppb_message_loop_proxy.h index 25e69b31ba9..e8213a9820f 100644 --- a/chromium/ppapi/proxy/ppb_message_loop_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_testing_proxy.cc b/chromium/ppapi/proxy/ppb_testing_proxy.cc index 438179854b8..6ddbd7ea801 100644 --- a/chromium/ppapi/proxy/ppb_testing_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_testing_proxy.h b/chromium/ppapi/proxy/ppb_testing_proxy.h index 7640291bfb8..c4b149acfce 100644 --- a/chromium/ppapi/proxy/ppb_testing_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_var_deprecated_proxy.cc b/chromium/ppapi/proxy/ppb_var_deprecated_proxy.cc index 7adda60381b..dd4bb4c22bb 100644 --- a/chromium/ppapi/proxy/ppb_var_deprecated_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h b/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h index 344ccd5f66f..b5a6d1851d5 100644 --- a/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_var_unittest.cc b/chromium/ppapi/proxy/ppb_var_unittest.cc index 98b64283221..cfabf0f8788 100644 --- a/chromium/ppapi/proxy/ppb_var_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc b/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc index e63423d6460..1ec9605a860 100644 --- a/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_video_decoder_proxy.h b/chromium/ppapi/proxy/ppb_video_decoder_proxy.h index dbc030e47cc..0b2a6f69054 100644 --- a/chromium/ppapi/proxy/ppb_video_decoder_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc b/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc index df58f43a6bd..8ed49d6f17c 100644 --- a/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h b/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h index 95d8f2cdc64..4a451179807 100644 --- a/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_class_proxy.cc b/chromium/ppapi/proxy/ppp_class_proxy.cc index 3c28d0d54c0..f8301e013eb 100644 --- a/chromium/ppapi/proxy/ppp_class_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_class_proxy.h b/chromium/ppapi/proxy/ppp_class_proxy.h index f890b3ddf44..c70b564367e 100644 --- a/chromium/ppapi/proxy/ppp_class_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_content_decryptor_private_proxy.h b/chromium/ppapi/proxy/ppp_content_decryptor_private_proxy.h index 0df8734ca24..2ab19c339a1 100644 --- a/chromium/ppapi/proxy/ppp_content_decryptor_private_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_find_proxy.cc b/chromium/ppapi/proxy/ppp_find_proxy.cc index abd5663ba7e..c5d62b761bc 100644 --- a/chromium/ppapi/proxy/ppp_find_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_find_proxy.h b/chromium/ppapi/proxy/ppp_find_proxy.h index 6d2230424d8..8e07d7e416a 100644 --- a/chromium/ppapi/proxy/ppp_find_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_graphics_3d_proxy.cc b/chromium/ppapi/proxy/ppp_graphics_3d_proxy.cc index b5f0ac1df85..50f7fe56a56 100644 --- a/chromium/ppapi/proxy/ppp_graphics_3d_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h b/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h index a6f7eb63b1e..6897e6bcec6 100644 --- a/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_input_event_proxy.cc b/chromium/ppapi/proxy/ppp_input_event_proxy.cc index cbf6a63ad2a..b256a2b19d5 100644 --- a/chromium/ppapi/proxy/ppp_input_event_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_input_event_proxy.h b/chromium/ppapi/proxy/ppp_input_event_proxy.h index 9fbc418b687..01479da7523 100644 --- a/chromium/ppapi/proxy/ppp_input_event_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_instance_private_proxy.h b/chromium/ppapi/proxy/ppp_instance_private_proxy.h index 4fc3a3a068a..f430203a0e5 100644 --- a/chromium/ppapi/proxy/ppp_instance_private_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/chromium/ppapi/proxy/ppp_instance_private_proxy_unittest.cc index 8b758d9084f..cbf9f9cc328 100644 --- a/chromium/ppapi/proxy/ppp_instance_private_proxy_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_instance_proxy.cc b/chromium/ppapi/proxy/ppp_instance_proxy.cc index a7a0699508b..37a848bcf4c 100644 --- a/chromium/ppapi/proxy/ppp_instance_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_instance_proxy_unittest.cc b/chromium/ppapi/proxy/ppp_instance_proxy_unittest.cc index 18ec91993e5..755d83b8a02 100644 --- a/chromium/ppapi/proxy/ppp_instance_proxy_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_messaging_proxy.h b/chromium/ppapi/proxy/ppp_messaging_proxy.h index f232c6ba528..753c771c172 100644 --- a/chromium/ppapi/proxy/ppp_messaging_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_mouse_lock_proxy.cc b/chromium/ppapi/proxy/ppp_mouse_lock_proxy.cc index 66dc1304c51..30aadcec801 100644 --- a/chromium/ppapi/proxy/ppp_mouse_lock_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h b/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h index f04d7f359a4..dfb45131edc 100644 --- a/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_pdf_proxy.cc b/chromium/ppapi/proxy/ppp_pdf_proxy.cc index 4b16dd6b66a..cafde231006 100644 --- a/chromium/ppapi/proxy/ppp_pdf_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_pdf_proxy.h b/chromium/ppapi/proxy/ppp_pdf_proxy.h index 2544c0f5230..5cc27900ac1 100644 --- a/chromium/ppapi/proxy/ppp_pdf_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_printing_proxy.cc b/chromium/ppapi/proxy/ppp_printing_proxy.cc index 81710efcc5f..512f0ed4bee 100644 --- a/chromium/ppapi/proxy/ppp_printing_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_printing_proxy.h b/chromium/ppapi/proxy/ppp_printing_proxy.h index 03bebf7b6aa..7c4025d5b03 100644 --- a/chromium/ppapi/proxy/ppp_printing_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_text_input_proxy.cc b/chromium/ppapi/proxy/ppp_text_input_proxy.cc index 061b73cd4fd..235e0e0d6f7 100644 --- a/chromium/ppapi/proxy/ppp_text_input_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/ppp_text_input_proxy.h b/chromium/ppapi/proxy/ppp_text_input_proxy.h index 0ae023c71e9..57712564c39 100644 --- a/chromium/ppapi/proxy/ppp_text_input_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/ppp_video_decoder_proxy.h b/chromium/ppapi/proxy/ppp_video_decoder_proxy.h index 54beac12796..c4b23ef8031 100644 --- a/chromium/ppapi/proxy/ppp_video_decoder_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/printing_resource.h b/chromium/ppapi/proxy/printing_resource.h index deaa1f5cb78..0ef5c770c9b 100644 --- a/chromium/ppapi/proxy/printing_resource.h +++ b/chromium/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/chromium/ppapi/proxy/printing_resource_unittest.cc b/chromium/ppapi/proxy/printing_resource_unittest.cc index 6551ba17664..09589c34f6d 100644 --- a/chromium/ppapi/proxy/printing_resource_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/proxy_array_output.h b/chromium/ppapi/proxy/proxy_array_output.h index 6d15e0b8358..455b026d33e 100644 --- a/chromium/ppapi/proxy/proxy_array_output.h +++ b/chromium/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/chromium/ppapi/proxy/proxy_channel.cc b/chromium/ppapi/proxy/proxy_channel.cc index 2784e4b978b..23b0449fbae 100644 --- a/chromium/ppapi/proxy/proxy_channel.cc +++ b/chromium/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/chromium/ppapi/proxy/proxy_channel.h b/chromium/ppapi/proxy/proxy_channel.h index fbd31ad8556..0e657f73ad5 100644 --- a/chromium/ppapi/proxy/proxy_channel.h +++ b/chromium/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/chromium/ppapi/proxy/proxy_completion_callback_factory.h b/chromium/ppapi/proxy/proxy_completion_callback_factory.h index c8dabf183b4..71322b0ad66 100644 --- a/chromium/ppapi/proxy/proxy_completion_callback_factory.h +++ b/chromium/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/chromium/ppapi/proxy/proxy_module.h b/chromium/ppapi/proxy/proxy_module.h index 5d3a12525b7..21f53b175d9 100644 --- a/chromium/ppapi/proxy/proxy_module.h +++ b/chromium/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/chromium/ppapi/proxy/proxy_object_var.cc b/chromium/ppapi/proxy/proxy_object_var.cc index cc0054faa13..507d2062114 100644 --- a/chromium/ppapi/proxy/proxy_object_var.cc +++ b/chromium/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/chromium/ppapi/proxy/proxy_object_var.h b/chromium/ppapi/proxy/proxy_object_var.h index a3ba1533944..0690129dd8e 100644 --- a/chromium/ppapi/proxy/proxy_object_var.h +++ b/chromium/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/chromium/ppapi/proxy/raw_var_data.cc b/chromium/ppapi/proxy/raw_var_data.cc index 12483f7c586..6e4e0577d5f 100644 --- a/chromium/ppapi/proxy/raw_var_data.cc +++ b/chromium/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 { @@ -156,7 +156,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var, } } } - return graph.Pass(); + return graph; } PP_Var RawVarDataGraph::CreatePPVar(PP_Instance instance) { @@ -199,7 +199,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Read(const IPC::Message* m, if (!result->data_.back()->Read(var_type, m, iter)) return scoped_ptr<RawVarDataGraph>(); } - return result.Pass(); + return result; } std::vector<SerializedHandle*> RawVarDataGraph::GetHandles() { @@ -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 @@ -299,7 +299,7 @@ void BasicRawVarData::Write( m->WriteInt(var_.value.as_int); break; case PP_VARTYPE_DOUBLE: - IPC::ParamTraits<double>::Write(m, var_.value.as_double); + IPC::WriteParam(m, var_.value.as_double); break; case PP_VARTYPE_OBJECT: m->WriteInt64(var_.value.as_id); @@ -333,7 +333,7 @@ bool BasicRawVarData::Read(PP_VarType type, return false; break; case PP_VARTYPE_DOUBLE: - if (!IPC::ParamTraits<double>::Read(m, iter, &result.value.as_double)) + if (!IPC::ReadParam(m, iter, &result.value.as_double)) return false; break; case PP_VARTYPE_OBJECT: @@ -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: @@ -512,8 +512,7 @@ bool ArrayBufferRawVarData::Read(PP_VarType type, return false; break; case ARRAY_BUFFER_SHMEM_PLUGIN: - if (!IPC::ParamTraits<SerializedHandle>::Read( - m, iter, &plugin_shm_handle_)) { + if (!IPC::ReadParam(m, iter, &plugin_shm_handle_)) { return false; } break; @@ -720,7 +719,7 @@ void ResourceRawVarData::Write(IPC::Message* m, m->WriteInt(pending_browser_host_id_); m->WriteBool(creation_message_); if (creation_message_) - IPC::ParamTraits<IPC::Message>::Write(m, *creation_message_); + IPC::WriteParam(m, *creation_message_); } bool ResourceRawVarData::Read(PP_VarType type, @@ -739,7 +738,7 @@ bool ResourceRawVarData::Read(PP_VarType type, return false; if (has_creation_message) { creation_message_.reset(new IPC::Message()); - if (!IPC::ParamTraits<IPC::Message>::Read(m, iter, creation_message_.get())) + if (!IPC::ReadParam(m, iter, creation_message_.get())) return false; } else { creation_message_.reset(); diff --git a/chromium/ppapi/proxy/raw_var_data.h b/chromium/ppapi/proxy/raw_var_data.h index 9db31007abb..4789ccdc1b6 100644 --- a/chromium/ppapi/proxy/raw_var_data.h +++ b/chromium/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/chromium/ppapi/proxy/raw_var_data_unittest.cc b/chromium/ppapi/proxy/raw_var_data_unittest.cc index 8f783c26a5e..1e68712d5d2 100644 --- a/chromium/ppapi/proxy/raw_var_data_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/resource_creation_proxy.cc b/chromium/ppapi/proxy/resource_creation_proxy.cc index 5efd92b4376..fa0884354a2 100644 --- a/chromium/ppapi/proxy/resource_creation_proxy.cc +++ b/chromium/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/chromium/ppapi/proxy/resource_creation_proxy.h b/chromium/ppapi/proxy/resource_creation_proxy.h index f1b645c0a38..aad6bf3f0f7 100644 --- a/chromium/ppapi/proxy/resource_creation_proxy.h +++ b/chromium/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/chromium/ppapi/proxy/resource_message_params.cc b/chromium/ppapi/proxy/resource_message_params.cc index dc1559460ba..3e5e03b0d57 100644 --- a/chromium/ppapi/proxy/resource_message_params.cc +++ b/chromium/ppapi/proxy/resource_message_params.cc @@ -51,27 +51,25 @@ bool ResourceMessageParams::Deserialize(const IPC::Message* msg, } void ResourceMessageParams::WriteHeader(IPC::Message* msg) const { - IPC::ParamTraits<PP_Resource>::Write(msg, pp_resource_); - IPC::ParamTraits<int32_t>::Write(msg, sequence_); + IPC::WriteParam(msg, pp_resource_); + IPC::WriteParam(msg, sequence_); } void ResourceMessageParams::WriteHandles(IPC::Message* msg) const { - IPC::ParamTraits<std::vector<SerializedHandle> >::Write(msg, - handles_->data()); + IPC::WriteParam(msg, handles_->data()); } bool ResourceMessageParams::ReadHeader(const IPC::Message* msg, base::PickleIterator* iter) { DCHECK(handles_->data().empty()); handles_->set_should_close(true); - return IPC::ParamTraits<PP_Resource>::Read(msg, iter, &pp_resource_) && - IPC::ParamTraits<int32_t>::Read(msg, iter, &sequence_); + return IPC::ReadParam(msg, iter, &pp_resource_) && + IPC::ReadParam(msg, iter, &sequence_); } bool ResourceMessageParams::ReadHandles(const IPC::Message* msg, base::PickleIterator* iter) { - return IPC::ParamTraits<std::vector<SerializedHandle> >::Read( - msg, iter, &handles_->data()); + return IPC::ReadParam(msg, iter, &handles_->data()); } void ResourceMessageParams::ConsumeHandles() const { @@ -155,14 +153,14 @@ ResourceMessageCallParams::~ResourceMessageCallParams() { void ResourceMessageCallParams::Serialize(IPC::Message* msg) const { ResourceMessageParams::Serialize(msg); - IPC::ParamTraits<bool>::Write(msg, has_callback_); + IPC::WriteParam(msg, has_callback_); } bool ResourceMessageCallParams::Deserialize(const IPC::Message* msg, base::PickleIterator* iter) { if (!ResourceMessageParams::Deserialize(msg, iter)) return false; - return IPC::ParamTraits<bool>::Read(msg, iter, &has_callback_); + return IPC::ReadParam(msg, iter, &has_callback_); } ResourceMessageReplyParams::ResourceMessageReplyParams() @@ -190,14 +188,13 @@ void ResourceMessageReplyParams::Serialize(IPC::Message* msg) const { bool ResourceMessageReplyParams::Deserialize(const IPC::Message* msg, base::PickleIterator* iter) { - return (ReadHeader(msg, iter) && - IPC::ParamTraits<int32_t>::Read(msg, iter, &result_) && + return (ReadHeader(msg, iter) && IPC::ReadParam(msg, iter, &result_) && ReadHandles(msg, iter)); } void ResourceMessageReplyParams::WriteReplyHeader(IPC::Message* msg) const { WriteHeader(msg); - IPC::ParamTraits<int32_t>::Write(msg, result_); + IPC::WriteParam(msg, result_); } } // namespace proxy diff --git a/chromium/ppapi/proxy/resource_message_params.h b/chromium/ppapi/proxy/resource_message_params.h index 500ebb90824..9e76d1ec06c 100644 --- a/chromium/ppapi/proxy/resource_message_params.h +++ b/chromium/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/chromium/ppapi/proxy/resource_message_test_sink.cc b/chromium/ppapi/proxy/resource_message_test_sink.cc index b3f3724e9eb..4047d59dd5e 100644 --- a/chromium/ppapi/proxy/resource_message_test_sink.cc +++ b/chromium/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/chromium/ppapi/proxy/resource_message_test_sink.h b/chromium/ppapi/proxy/resource_message_test_sink.h index 3e40e31060d..b6ada44c899 100644 --- a/chromium/ppapi/proxy/resource_message_test_sink.h +++ b/chromium/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/chromium/ppapi/proxy/resource_reply_thread_registrar.h b/chromium/ppapi/proxy/resource_reply_thread_registrar.h index 193c205119c..256890c79dd 100644 --- a/chromium/ppapi/proxy/resource_reply_thread_registrar.h +++ b/chromium/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/chromium/ppapi/proxy/serialized_flash_menu.cc b/chromium/ppapi/proxy/serialized_flash_menu.cc index cda9545c89d..4791b064493 100644 --- a/chromium/ppapi/proxy/serialized_flash_menu.cc +++ b/chromium/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" @@ -50,8 +52,8 @@ void WriteMenuItem(IPC::Message* m, const PP_Flash_MenuItem* menu_item) { m->WriteUInt32(type); m->WriteString(menu_item->name ? menu_item->name : ""); m->WriteInt(menu_item->id); - IPC::ParamTraits<PP_Bool>::Write(m, menu_item->enabled); - IPC::ParamTraits<PP_Bool>::Write(m, menu_item->checked); + IPC::WriteParam(m, menu_item->enabled); + IPC::WriteParam(m, menu_item->checked); if (type == PP_FLASH_MENUITEM_TYPE_SUBMENU) WriteMenu(m, menu_item->submenu); } @@ -96,9 +98,9 @@ bool ReadMenuItem(int depth, menu_item->name[name.size()] = 0; if (!iter->ReadInt(&menu_item->id)) return false; - if (!IPC::ParamTraits<PP_Bool>::Read(m, iter, &menu_item->enabled)) + if (!IPC::ReadParam(m, iter, &menu_item->enabled)) return false; - if (!IPC::ParamTraits<PP_Bool>::Read(m, iter, &menu_item->checked)) + if (!IPC::ReadParam(m, iter, &menu_item->checked)) return false; if (type == PP_FLASH_MENUITEM_TYPE_SUBMENU) { menu_item->submenu = ReadMenu(depth, m, iter); diff --git a/chromium/ppapi/proxy/serialized_flash_menu.h b/chromium/ppapi/proxy/serialized_flash_menu.h index 8c1d7096067..607c6039112 100644 --- a/chromium/ppapi/proxy/serialized_flash_menu.h +++ b/chromium/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/chromium/ppapi/proxy/serialized_handle.cc b/chromium/ppapi/proxy/serialized_handle.cc index ee0f359f082..000eed5be57 100644 --- a/chromium/ppapi/proxy/serialized_handle.cc +++ b/chromium/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; @@ -128,6 +127,7 @@ bool SerializedHandle::ReadHeader(base::PickleIterator* iter, Header* hdr) { hdr->open_flags = open_flags; hdr->file_io = file_io; valid_type = true; + break; } case SOCKET: case INVALID: diff --git a/chromium/ppapi/proxy/serialized_handle.h b/chromium/ppapi/proxy/serialized_handle.h index 6e765fd35fa..d7e74ccb542 100644 --- a/chromium/ppapi/proxy/serialized_handle.h +++ b/chromium/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/chromium/ppapi/proxy/serialized_structs.cc b/chromium/ppapi/proxy/serialized_structs.cc index 255865a65dc..c88b70cd42c 100644 --- a/chromium/ppapi/proxy/serialized_structs.cc +++ b/chromium/ppapi/proxy/serialized_structs.cc @@ -6,7 +6,6 @@ #include "base/pickle.h" #include "build/build_config.h" -#include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/trusted/ppb_browser_font_trusted.h" @@ -28,20 +27,6 @@ SerializedFontDescription::SerializedFontDescription() SerializedFontDescription::~SerializedFontDescription() {} -void SerializedFontDescription::SetFromPPFontDescription( - const PP_FontDescription_Dev& desc) { - StringVar* string_var = StringVar::FromPPVar(desc.face); - face = string_var ? string_var->value() : std::string(); - - family = desc.family; - size = desc.size; - weight = desc.weight; - italic = desc.italic; - small_caps = desc.small_caps; - letter_spacing = desc.letter_spacing; - word_spacing = desc.word_spacing; -} - void SerializedFontDescription::SetFromPPBrowserFontDescription( const PP_BrowserFont_Trusted_Description& desc) { StringVar* string_var = StringVar::FromPPVar(desc.face); @@ -56,18 +41,6 @@ void SerializedFontDescription::SetFromPPBrowserFontDescription( word_spacing = desc.word_spacing; } -void SerializedFontDescription::SetToPPFontDescription( - PP_FontDescription_Dev* desc) const { - desc->face = StringVar::StringToPPVar(face); - desc->family = static_cast<PP_FontFamily_Dev>(family); - desc->size = size; - desc->weight = static_cast<PP_FontWeight_Dev>(weight); - desc->italic = italic; - desc->small_caps = small_caps; - desc->letter_spacing = letter_spacing; - desc->word_spacing = word_spacing; -} - void SerializedFontDescription::SetToPPBrowserFontDescription( PP_BrowserFont_Trusted_Description* desc) const { desc->face = StringVar::StringToPPVar(face); diff --git a/chromium/ppapi/proxy/serialized_structs.h b/chromium/ppapi/proxy/serialized_structs.h index efefadebefe..3820056811a 100644 --- a/chromium/ppapi/proxy/serialized_structs.h +++ b/chromium/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> @@ -13,6 +15,7 @@ #include "build/build_config.h" #include "ppapi/c/dev/ppb_truetype_font_dev.h" #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_codecs.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_point.h" #include "ppapi/c/pp_rect.h" @@ -21,30 +24,20 @@ #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/host_resource.h" -struct PP_FontDescription_Dev; struct PP_BrowserFont_Trusted_Description; namespace ppapi { namespace proxy { -// PP_FontDescription_Dev/PP_BrowserFontDescription (same definition, different -// names) has to be redefined with a string in place of the PP_Var used for the -// face name. +// PP_BrowserFontDescription has to be redefined with a string in place of the +// PP_Var used for the face name. struct PPAPI_PROXY_EXPORT SerializedFontDescription { SerializedFontDescription(); ~SerializedFontDescription(); - // Converts a PP_FontDescription_Dev to a SerializedFontDescription. - // - // The reference of |face| owned by the PP_FontDescription_Dev will be - // unchanged and the caller is responsible for freeing it. - void SetFromPPFontDescription(const PP_FontDescription_Dev& desc); void SetFromPPBrowserFontDescription( const PP_BrowserFont_Trusted_Description& desc); - // Converts to a PP_FontDescription_Dev. The face name will have one ref - // assigned to it. The caller is responsible for freeing it. - void SetToPPFontDescription(PP_FontDescription_Dev* desc) const; void SetToPPBrowserFontDescription( PP_BrowserFont_Trusted_Description* desc) const; @@ -81,7 +74,7 @@ struct PPAPI_PROXY_EXPORT SerializedTrueTypeFontDesc { // caller is responsible for releasing it. void SetFromPPTrueTypeFontDesc(const PP_TrueTypeFontDesc_Dev& desc); - // Converts this to a PP_FontDescription_Dev. + // Converts this to a PP_TrueTypeFontDesc_Dev. // // The desc.family PP_Var will have one reference assigned to it. The caller // is responsible for releasing it. @@ -131,6 +124,15 @@ struct PPPDecryptor_Buffer { base::SharedMemoryHandle handle; }; +struct PPB_AudioEncodeParameters { + uint32_t channels; + uint32_t input_sample_rate; + uint32_t input_sample_size; + PP_AudioProfile output_profile; + uint32_t initial_bitrate; + PP_HardwareAcceleration acceleration; +}; + // TODO(raymes): Make ImageHandle compatible with SerializedHandle. #if defined(OS_WIN) typedef HANDLE ImageHandle; diff --git a/chromium/ppapi/proxy/serialized_var.h b/chromium/ppapi/proxy/serialized_var.h index 46f8ed52e56..3f8ec99068d 100644 --- a/chromium/ppapi/proxy/serialized_var.h +++ b/chromium/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/chromium/ppapi/proxy/serialized_var_unittest.cc b/chromium/ppapi/proxy/serialized_var_unittest.cc index d88c848317e..3a5513d7ccf 100644 --- a/chromium/ppapi/proxy/serialized_var_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/tcp_server_socket_private_resource.h b/chromium/ppapi/proxy/tcp_server_socket_private_resource.h index 055b3b05db2..ea131e3f108 100644 --- a/chromium/ppapi/proxy/tcp_server_socket_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/tcp_socket_private_resource.h b/chromium/ppapi/proxy/tcp_socket_private_resource.h index bbc5b1cc7da..0a36d1b7027 100644 --- a/chromium/ppapi/proxy/tcp_socket_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/tcp_socket_resource.h b/chromium/ppapi/proxy/tcp_socket_resource.h index 449cab69622..57da040c223 100644 --- a/chromium/ppapi/proxy/tcp_socket_resource.h +++ b/chromium/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/chromium/ppapi/proxy/tcp_socket_resource_base.cc b/chromium/ppapi/proxy/tcp_socket_resource_base.cc index fb4db5bee64..3cc4fdd84a7 100644 --- a/chromium/ppapi/proxy/tcp_socket_resource_base.cc +++ b/chromium/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/chromium/ppapi/proxy/tcp_socket_resource_base.h b/chromium/ppapi/proxy/tcp_socket_resource_base.h index 3274fb9518e..c60ff335946 100644 --- a/chromium/ppapi/proxy/tcp_socket_resource_base.h +++ b/chromium/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/chromium/ppapi/proxy/tracked_callback_unittest.cc b/chromium/ppapi/proxy/tracked_callback_unittest.cc index 0a9278a3c72..8b68b8e31dc 100644 --- a/chromium/ppapi/proxy/tracked_callback_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/truetype_font_resource.h b/chromium/ppapi/proxy/truetype_font_resource.h index 2f44365b027..99cbf2f9173 100644 --- a/chromium/ppapi/proxy/truetype_font_resource.h +++ b/chromium/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/chromium/ppapi/proxy/truetype_font_singleton_resource.cc b/chromium/ppapi/proxy/truetype_font_singleton_resource.cc index 77a7432c549..277aba1f51a 100644 --- a/chromium/ppapi/proxy/truetype_font_singleton_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/truetype_font_singleton_resource.h b/chromium/ppapi/proxy/truetype_font_singleton_resource.h index df09471da07..3c498b05ed5 100644 --- a/chromium/ppapi/proxy/truetype_font_singleton_resource.h +++ b/chromium/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/chromium/ppapi/proxy/udp_socket_filter.cc b/chromium/ppapi/proxy/udp_socket_filter.cc index 8d7ff9de3a7..e41d7583201 100644 --- a/chromium/ppapi/proxy/udp_socket_filter.cc +++ b/chromium/ppapi/proxy/udp_socket_filter.cc @@ -6,6 +6,7 @@ #include <algorithm> #include <cstring> +#include <utility> #include "base/logging.h" #include "ppapi/c/pp_errors.h" @@ -183,7 +184,7 @@ void UDPSocketFilter::RecvQueue::DataReceivedOnIOThread( // is actually run.) scoped_ptr<std::string> data_to_pass(new std::string(data)); recvfrom_callback_->set_completion_task(base::Bind( - &SetRecvFromOutput, pp_instance_, base::Passed(data_to_pass.Pass()), + &SetRecvFromOutput, pp_instance_, base::Passed(std::move(data_to_pass)), addr, base::Unretained(read_buffer_), bytes_to_read_, base::Unretained(recvfrom_addr_resource_))); last_recvfrom_addr_ = addr; @@ -226,8 +227,8 @@ int32_t UDPSocketFilter::RecvQueue::RequestData( int32_t result = static_cast<int32_t>(front.data.size()); scoped_ptr<std::string> data_to_pass(new std::string); data_to_pass->swap(front.data); - SetRecvFromOutput(pp_instance_, data_to_pass.Pass(), front.addr, buffer_out, - num_bytes, addr_out, PP_OK); + SetRecvFromOutput(pp_instance_, std::move(data_to_pass), front.addr, + buffer_out, num_bytes, addr_out, PP_OK); last_recvfrom_addr_ = front.addr; recv_buffers_.pop(); slot_available_callback_.Run(); diff --git a/chromium/ppapi/proxy/udp_socket_filter.h b/chromium/ppapi/proxy/udp_socket_filter.h index faa62e09989..4aa3e5cde83 100644 --- a/chromium/ppapi/proxy/udp_socket_filter.h +++ b/chromium/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/chromium/ppapi/proxy/udp_socket_private_resource.h b/chromium/ppapi/proxy/udp_socket_private_resource.h index f335c6c9482..d57ef0455b2 100644 --- a/chromium/ppapi/proxy/udp_socket_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/udp_socket_resource.h b/chromium/ppapi/proxy/udp_socket_resource.h index 5217d96956c..e7ba86d6125 100644 --- a/chromium/ppapi/proxy/udp_socket_resource.h +++ b/chromium/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/chromium/ppapi/proxy/udp_socket_resource_base.h b/chromium/ppapi/proxy/udp_socket_resource_base.h index e5a8aef805f..30599422f03 100644 --- a/chromium/ppapi/proxy/udp_socket_resource_base.h +++ b/chromium/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/chromium/ppapi/proxy/uma_private_resource.h b/chromium/ppapi/proxy/uma_private_resource.h index 3215e647577..67eb67b8069 100644 --- a/chromium/ppapi/proxy/uma_private_resource.h +++ b/chromium/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/chromium/ppapi/proxy/url_loader_resource.h b/chromium/ppapi/proxy/url_loader_resource.h index f96c1aba2e4..d349beea929 100644 --- a/chromium/ppapi/proxy/url_loader_resource.h +++ b/chromium/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/chromium/ppapi/proxy/url_request_info_resource.h b/chromium/ppapi/proxy/url_request_info_resource.h index 318668fb0a2..1ec7d13b38b 100644 --- a/chromium/ppapi/proxy/url_request_info_resource.h +++ b/chromium/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/chromium/ppapi/proxy/url_response_info_resource.cc b/chromium/ppapi/proxy/url_response_info_resource.cc index 315b4a109d3..74370daffcd 100644 --- a/chromium/ppapi/proxy/url_response_info_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/url_response_info_resource.h b/chromium/ppapi/proxy/url_response_info_resource.h index e20417fbb0f..506b4d36f57 100644 --- a/chromium/ppapi/proxy/url_response_info_resource.h +++ b/chromium/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/chromium/ppapi/proxy/video_capture_resource.cc b/chromium/ppapi/proxy/video_capture_resource.cc index ca69d382b43..51895091030 100644 --- a/chromium/ppapi/proxy/video_capture_resource.cc +++ b/chromium/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/chromium/ppapi/proxy/video_capture_resource.h b/chromium/ppapi/proxy/video_capture_resource.h index add97136129..9b1a8a1dd49 100644 --- a/chromium/ppapi/proxy/video_capture_resource.h +++ b/chromium/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/chromium/ppapi/proxy/video_decoder_resource.cc b/chromium/ppapi/proxy/video_decoder_resource.cc index 0ea624d95d8..1519d1ae653 100644 --- a/chromium/ppapi/proxy/video_decoder_resource.cc +++ b/chromium/ppapi/proxy/video_decoder_resource.cc @@ -4,6 +4,8 @@ #include "ppapi/proxy/video_decoder_resource.h" +#include <utility> + #include "base/bind.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/client/gles2_implementation.h" @@ -33,7 +35,7 @@ VideoDecoderResource::ShmBuffer::ShmBuffer( scoped_ptr<base::SharedMemory> shm_ptr, uint32_t size, uint32_t shm_id) - : shm(shm_ptr.Pass()), addr(NULL), shm_id(shm_id) { + : shm(std::move(shm_ptr)), addr(NULL), shm_id(shm_id) { if (shm->Map(size)) addr = shm->memory(); } @@ -231,7 +233,7 @@ int32_t VideoDecoderResource::Decode(uint32_t decode_id, scoped_ptr<base::SharedMemory> shm( new base::SharedMemory(shm_handle, false /* read_only */)); scoped_ptr<ShmBuffer> shm_buffer( - new ShmBuffer(shm.Pass(), shm_size, shm_id)); + new ShmBuffer(std::move(shm), shm_size, shm_id)); if (!shm_buffer->addr) return PP_ERROR_NOMEMORY; diff --git a/chromium/ppapi/proxy/video_decoder_resource.h b/chromium/ppapi/proxy/video_decoder_resource.h index bb630c4ee8a..8f66e4a7dfa 100644 --- a/chromium/ppapi/proxy/video_decoder_resource.h +++ b/chromium/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/chromium/ppapi/proxy/video_decoder_resource_unittest.cc b/chromium/ppapi/proxy/video_decoder_resource_unittest.cc index 5a128d14db5..a8e3c4fb787 100644 --- a/chromium/ppapi/proxy/video_decoder_resource_unittest.cc +++ b/chromium/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/chromium/ppapi/proxy/video_destination_resource.h b/chromium/ppapi/proxy/video_destination_resource.h index 2e545a3aca0..a74450ef712 100644 --- a/chromium/ppapi/proxy/video_destination_resource.h +++ b/chromium/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/chromium/ppapi/proxy/video_encoder_resource.cc b/chromium/ppapi/proxy/video_encoder_resource.cc index 01c6b0e1612..4af703a22e1 100644 --- a/chromium/ppapi/proxy/video_encoder_resource.cc +++ b/chromium/ppapi/proxy/video_encoder_resource.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ppapi/proxy/video_encoder_resource.h" + +#include <utility> + #include "base/memory/shared_memory.h" #include "base/numerics/safe_conversions.h" #include "ppapi/c/pp_array_output.h" #include "ppapi/proxy/ppapi_messages.h" -#include "ppapi/proxy/video_encoder_resource.h" #include "ppapi/proxy/video_frame_resource.h" #include "ppapi/shared_impl/array_writer.h" #include "ppapi/shared_impl/media_stream_buffer.h" @@ -57,8 +60,7 @@ std::vector<PP_VideoProfileDescription_0_1> PP_VideoProfileDescriptionTo_0_1( VideoEncoderResource::ShmBuffer::ShmBuffer(uint32_t id, scoped_ptr<base::SharedMemory> shm) - : id(id), shm(shm.Pass()) { -} + : id(id), shm(std::move(shm)) {} VideoEncoderResource::ShmBuffer::~ShmBuffer() { } @@ -398,7 +400,7 @@ void VideoEncoderResource::OnPluginMsgBitstreamBuffers( new base::SharedMemory(shm_handles[i], true)); CHECK(shm->Map(buffer_length)); - ShmBuffer* buffer = new ShmBuffer(i, shm.Pass()); + ShmBuffer* buffer = new ShmBuffer(i, std::move(shm)); shm_buffers_.push_back(buffer); bitstream_buffer_map_.insert( std::make_pair(buffer->shm->memory(), buffer->id)); diff --git a/chromium/ppapi/proxy/video_encoder_resource.h b/chromium/ppapi/proxy/video_encoder_resource.h index 41f33c7e92b..f040a386499 100644 --- a/chromium/ppapi/proxy/video_encoder_resource.h +++ b/chromium/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/chromium/ppapi/proxy/video_encoder_resource_unittest.cc b/chromium/ppapi/proxy/video_encoder_resource_unittest.cc index c1d39084d58..2b122e93b59 100644 --- a/chromium/ppapi/proxy/video_encoder_resource_unittest.cc +++ b/chromium/ppapi/proxy/video_encoder_resource_unittest.cc @@ -2,6 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ppapi/proxy/video_encoder_resource.h" + +#include <stdint.h> + +#include <utility> + #include "base/memory/shared_memory.h" #include "base/process/process.h" #include "base/synchronization/waitable_event.h" @@ -14,7 +20,6 @@ #include "ppapi/proxy/ppapi_message_utils.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/ppapi_proxy_test.h" -#include "ppapi/proxy/video_encoder_resource.h" #include "ppapi/shared_impl/media_stream_buffer.h" #include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/thunk/thunk.h" @@ -120,7 +125,7 @@ class VideoEncoderResourceTest : public PluginProxyTest, for (uint32_t i = 0; i < nb_buffers; ++i) { scoped_ptr<base::SharedMemory> mem(new base::SharedMemory()); ASSERT_TRUE(mem->CreateAnonymous(buffer_size)); - shared_memory_bitstreams_.push_back(mem.Pass()); + shared_memory_bitstreams_.push_back(std::move(mem)); } } @@ -132,10 +137,8 @@ class VideoEncoderResourceTest : public PluginProxyTest, frame_length + sizeof(ppapi::MediaStreamBuffer::Video); ASSERT_TRUE(shared_memory_frames->CreateAnonymous(buffer_length * frame_count)); - ASSERT_TRUE(video_frames_manager_.SetBuffers(frame_count, - buffer_length, - shared_memory_frames.Pass(), - true)); + ASSERT_TRUE(video_frames_manager_.SetBuffers( + frame_count, buffer_length, std::move(shared_memory_frames), true)); for (int32_t i = 0; i < video_frames_manager_.number_of_buffers(); ++i) { ppapi::MediaStreamBuffer::Video* buffer = &(video_frames_manager_.GetBufferPointer(i)->video); @@ -510,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); @@ -643,7 +646,7 @@ TEST_F(VideoEncoderResourceTest, InitializeFailure) { TEST_F(VideoEncoderResourceTest, InitializeSuccess) { { // Verify the initialize callback is called when initialization is - // successfull. + // successful. LockingResourceReleaser encoder(CreateEncoder()); ResourceMessageCallParams params; PP_Size size = kFrameSize; diff --git a/chromium/ppapi/proxy/video_frame_resource.h b/chromium/ppapi/proxy/video_frame_resource.h index e796eed8d45..d82518bdbb8 100644 --- a/chromium/ppapi/proxy/video_frame_resource.h +++ b/chromium/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/chromium/ppapi/proxy/video_source_resource.h b/chromium/ppapi/proxy/video_source_resource.h index 56cd7ddd3e2..bbc85b469bb 100644 --- a/chromium/ppapi/proxy/video_source_resource.h +++ b/chromium/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/chromium/ppapi/proxy/websocket_resource.cc b/chromium/ppapi/proxy/websocket_resource.cc index bc4e8535520..02b918e3c37 100644 --- a/chromium/ppapi/proxy/websocket_resource.cc +++ b/chromium/ppapi/proxy/websocket_resource.cc @@ -4,6 +4,9 @@ #include "ppapi/proxy/websocket_resource.h" +#include <stddef.h> + +#include <limits> #include <set> #include <string> #include <vector> @@ -26,8 +29,8 @@ const size_t kMinimumPayloadSizeWithTwoByteExtendedPayloadLength = 126; const size_t kMinimumPayloadSizeWithEightByteExtendedPayloadLength = 0x10000; uint64_t SaturateAdd(uint64_t a, uint64_t b) { - if (kuint64max - a < b) - return kuint64max; + if (std::numeric_limits<uint64_t>::max() - a < b) + return std::numeric_limits<uint64_t>::max(); return a + b; } @@ -272,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/chromium/ppapi/proxy/websocket_resource.h b/chromium/ppapi/proxy/websocket_resource.h index 51fb52d0626..2cb43b8a8af 100644 --- a/chromium/ppapi/proxy/websocket_resource.h +++ b/chromium/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/chromium/ppapi/proxy/websocket_resource_unittest.cc b/chromium/ppapi/proxy/websocket_resource_unittest.cc index bdc0b885494..9df1308b4f6 100644 --- a/chromium/ppapi/proxy/websocket_resource_unittest.cc +++ b/chromium/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" |