diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/ppapi/thunk | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/ppapi/thunk')
48 files changed, 189 insertions, 310 deletions
diff --git a/chromium/ppapi/thunk/DEPS b/chromium/ppapi/thunk/DEPS index ded13232a98..06212494117 100644 --- a/chromium/ppapi/thunk/DEPS +++ b/chromium/ppapi/thunk/DEPS @@ -1,6 +1,7 @@ include_rules = [ # For gpu::CommandBuffer::State "+gpu/command_buffer/common/command_buffer.h", + "+gpu/command_buffer/common/command_buffer_id.h", "+gpu/command_buffer/common/sync_token.h", "-ppapi/cpp", "-ppapi/proxy", diff --git a/chromium/ppapi/thunk/interfaces_ppb_private.h b/chromium/ppapi/thunk/interfaces_ppb_private.h index 630f1ce9c26..636cf203ffe 100644 --- a/chromium/ppapi/thunk/interfaces_ppb_private.h +++ b/chromium/ppapi/thunk/interfaces_ppb_private.h @@ -51,12 +51,6 @@ PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3, PROXIED_IFACE(PPB_OUTPUTPROTECTION_PRIVATE_INTERFACE_0_1, PPB_OutputProtection_Private_0_1) - -// Hack to keep font working. The Font 0.6 API is binary compatible with -// BrowserFont 1.0, so just map the string to the same thing. -// TODO(brettw) remove support for the old Font API. -PROXIED_IFACE(PPB_FONT_DEV_INTERFACE_0_6, - PPB_BrowserFont_Trusted_1_0) #endif // !defined(OS_NACL) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc b/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc index 75e0f806cb5..1d84d3b3fd2 100644 --- a/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc +++ b/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_audio_buffer.idl modified Thu May 15 17:11:43 2014. +// From ppb_audio_buffer.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -88,15 +88,10 @@ uint32_t GetDataBufferSize(PP_Resource buffer) { return enter.object()->GetDataBufferSize(); } -const PPB_AudioBuffer_0_1 g_ppb_audiobuffer_thunk_0_1 = {&IsAudioBuffer, - &GetTimestamp, - &SetTimestamp, - &GetSampleRate, - &GetSampleSize, - &GetNumberOfChannels, - &GetNumberOfSamples, - &GetDataBuffer, - &GetDataBufferSize}; +const PPB_AudioBuffer_0_1 g_ppb_audiobuffer_thunk_0_1 = { + &IsAudioBuffer, &GetTimestamp, &SetTimestamp, + &GetSampleRate, &GetSampleSize, &GetNumberOfChannels, + &GetNumberOfSamples, &GetDataBuffer, &GetDataBufferSize}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_audio_encoder_thunk.cc b/chromium/ppapi/thunk/ppb_audio_encoder_thunk.cc index f8355bb8567..89d4b8c4a0e 100644 --- a/chromium/ppapi/thunk/ppb_audio_encoder_thunk.cc +++ b/chromium/ppapi/thunk/ppb_audio_encoder_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_audio_encoder.idl modified Mon Sep 7 10:17:53 2015. +// From ppb_audio_encoder.idl modified Wed Jan 27 17:39:22 2016. #include <stdint.h> @@ -56,13 +56,9 @@ int32_t Initialize(PP_Resource audio_encoder, EnterResource<PPB_AudioEncoder_API> enter(audio_encoder, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->Initialize(channels, - input_sample_rate, - input_sample_size, - output_profile, - initial_bitrate, - acceleration, - enter.callback())); + return enter.SetResult(enter.object()->Initialize( + channels, input_sample_rate, input_sample_size, output_profile, + initial_bitrate, acceleration, enter.callback())); } int32_t GetNumberOfSamples(PP_Resource audio_encoder) { diff --git a/chromium/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc b/chromium/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc index 3bfdd4c8808..7f76c5b1f27 100644 --- a/chromium/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_camera_capabilities_private_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_camera_capabilities_private.idl modified Thu Feb 19 09:06:18 -// 2015. +// From private/ppb_camera_capabilities_private.idl modified Wed Jan 27 17:10:16 +// 2016. #include <stdint.h> @@ -38,8 +38,7 @@ void GetSupportedVideoCaptureFormats(PP_Resource capabilities, const PPB_CameraCapabilities_Private_0_1 g_ppb_cameracapabilities_private_thunk_0_1 = { - &IsCameraCapabilities, - &GetSupportedVideoCaptureFormats}; + &IsCameraCapabilities, &GetSupportedVideoCaptureFormats}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_camera_device_private_thunk.cc b/chromium/ppapi/thunk/ppb_camera_device_private_thunk.cc index 207d92fbff1..b33df8bec87 100644 --- a/chromium/ppapi/thunk/ppb_camera_device_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_camera_device_private_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_camera_device_private.idl modified Wed Feb 18 16:44:52 2015. +// From private/ppb_camera_device_private.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -62,8 +62,8 @@ int32_t GetCameraCapabilities(PP_Resource camera_device, enter.object()->GetCameraCapabilities(capabilities, enter.callback())); } -const PPB_CameraDevice_Private_0_1 g_ppb_cameradevice_private_thunk_0_1 = - {&Create, &IsCameraDevice, &Open, &Close, &GetCameraCapabilities}; +const PPB_CameraDevice_Private_0_1 g_ppb_cameradevice_private_thunk_0_1 = { + &Create, &IsCameraDevice, &Open, &Close, &GetCameraCapabilities}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc b/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc index 32d966c65ff..29645403b0d 100644 --- a/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc +++ b/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_compositor_layer.idl modified Thu Jan 29 16:28:15 2015. +// From ppb_compositor_layer.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -126,28 +126,18 @@ int32_t SetPremultipliedAlpha(PP_Resource layer, PP_Bool premult) { } const PPB_CompositorLayer_0_1 g_ppb_compositorlayer_thunk_0_1 = { - &IsCompositorLayer, - &SetColor, - &SetTexture_0_1, - &SetImage, - &SetClipRect, - &SetTransform, - &SetOpacity, - &SetBlendMode, - &SetSourceRect, - &SetPremultipliedAlpha}; + &IsCompositorLayer, &SetColor, + &SetTexture_0_1, &SetImage, + &SetClipRect, &SetTransform, + &SetOpacity, &SetBlendMode, + &SetSourceRect, &SetPremultipliedAlpha}; const PPB_CompositorLayer_0_2 g_ppb_compositorlayer_thunk_0_2 = { - &IsCompositorLayer, - &SetColor, - &SetTexture, - &SetImage, - &SetClipRect, - &SetTransform, - &SetOpacity, - &SetBlendMode, - &SetSourceRect, - &SetPremultipliedAlpha}; + &IsCompositorLayer, &SetColor, + &SetTexture, &SetImage, + &SetClipRect, &SetTransform, + &SetOpacity, &SetBlendMode, + &SetSourceRect, &SetPremultipliedAlpha}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_compositor_thunk.cc b/chromium/ppapi/thunk/ppb_compositor_thunk.cc index b640787f7a8..f1593c3e3c0 100644 --- a/chromium/ppapi/thunk/ppb_compositor_thunk.cc +++ b/chromium/ppapi/thunk/ppb_compositor_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_compositor.idl modified Thu Sep 18 11:36:39 2014. +// From ppb_compositor.idl modified Wed Jan 27 17:39:22 2016. #include <stdint.h> @@ -57,11 +57,8 @@ int32_t ResetLayers(PP_Resource compositor) { return enter.object()->ResetLayers(); } -const PPB_Compositor_0_1 g_ppb_compositor_thunk_0_1 = {&IsCompositor, - &Create, - &AddLayer, - &CommitLayers, - &ResetLayers}; +const PPB_Compositor_0_1 g_ppb_compositor_thunk_0_1 = { + &IsCompositor, &Create, &AddLayer, &CommitLayers, &ResetLayers}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_console_thunk.cc b/chromium/ppapi/thunk/ppb_console_thunk.cc index 3bde49a6320..5c9d5f86307 100644 --- a/chromium/ppapi/thunk/ppb_console_thunk.cc +++ b/chromium/ppapi/thunk/ppb_console_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_console.idl modified Mon May 6 10:11:29 2013. +// From ppb_console.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_console.h" diff --git a/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc b/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc index 25a5bb4318a..fc357d59967 100644 --- a/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_device_ref_dev.idl modified Mon May 6 10:11:29 2013. +// From dev/ppb_device_ref_dev.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/dev/ppb_device_ref_dev.h" #include "ppapi/c/pp_errors.h" @@ -38,9 +40,8 @@ struct PP_Var GetName(PP_Resource device_ref) { return enter.object()->GetName(); } -const PPB_DeviceRef_Dev_0_1 g_ppb_deviceref_dev_thunk_0_1 = {&IsDeviceRef, - &GetType, - &GetName}; +const PPB_DeviceRef_Dev_0_1 g_ppb_deviceref_dev_thunk_0_1 = { + &IsDeviceRef, &GetType, &GetName}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc b/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc index 96f398ed8f1..51c5d760553 100644 --- a/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_display_color_profile_private.idl modified Mon Apr 7 -// 08:56:43 2014. +// From private/ppb_display_color_profile_private.idl modified Wed Jan 27 +// 17:10:16 2016. #include <stdint.h> @@ -61,9 +61,7 @@ int32_t RegisterColorProfileChangeCallback( const PPB_DisplayColorProfile_Private_0_1 g_ppb_displaycolorprofile_private_thunk_0_1 = { - &Create, - &IsDisplayColorProfile, - &GetColorProfile, + &Create, &IsDisplayColorProfile, &GetColorProfile, &RegisterColorProfileChangeCallback}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc b/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc index 88594df5c3a..8880de9ce95 100644 --- a/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_file_chooser_dev.idl modified Fri Feb 7 08:29:41 2014. +// From dev/ppb_file_chooser_dev.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -61,12 +61,11 @@ int32_t Show(PP_Resource chooser, return enter.SetResult(enter.object()->Show(output, enter.callback())); } -const PPB_FileChooser_Dev_0_5 g_ppb_filechooser_dev_thunk_0_5 = - {&Create, &IsFileChooser, &Show_0_5, &GetNextChosenFile}; +const PPB_FileChooser_Dev_0_5 g_ppb_filechooser_dev_thunk_0_5 = { + &Create, &IsFileChooser, &Show_0_5, &GetNextChosenFile}; -const PPB_FileChooser_Dev_0_6 g_ppb_filechooser_dev_thunk_0_6 = {&Create, - &IsFileChooser, - &Show}; +const PPB_FileChooser_Dev_0_6 g_ppb_filechooser_dev_thunk_0_6 = { + &Create, &IsFileChooser, &Show}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_file_io_thunk.cc b/chromium/ppapi/thunk/ppb_file_io_thunk.cc index 6c23a2f64c9..99b8d3f16d5 100644 --- a/chromium/ppapi/thunk/ppb_file_io_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_io_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_file_io.idl modified Mon Nov 11 16:02:07 2013. +// From ppb_file_io.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -132,28 +132,13 @@ int32_t ReadToArray(PP_Resource file_io, output, enter.callback())); } -const PPB_FileIO_1_0 g_ppb_fileio_thunk_1_0 = {&Create, - &IsFileIO, - &Open, - &Query, - &Touch, - &Read, - &Write, - &SetLength, - &Flush, - &Close}; - -const PPB_FileIO_1_1 g_ppb_fileio_thunk_1_1 = {&Create, - &IsFileIO, - &Open, - &Query, - &Touch, - &Read, - &Write, - &SetLength, - &Flush, - &Close, - &ReadToArray}; +const PPB_FileIO_1_0 g_ppb_fileio_thunk_1_0 = { + &Create, &IsFileIO, &Open, &Query, &Touch, + &Read, &Write, &SetLength, &Flush, &Close}; + +const PPB_FileIO_1_1 g_ppb_fileio_thunk_1_1 = { + &Create, &IsFileIO, &Open, &Query, &Touch, &Read, + &Write, &SetLength, &Flush, &Close, &ReadToArray}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_file_ref_api.h b/chromium/ppapi/thunk/ppb_file_ref_api.h index b6dfa77c31d..73adf86de2d 100644 --- a/chromium/ppapi/thunk/ppb_file_ref_api.h +++ b/chromium/ppapi/thunk/ppb_file_ref_api.h @@ -9,7 +9,6 @@ #include <vector> -#include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_file_ref.h" #include "ppapi/shared_impl/file_ref_create_info.h" diff --git a/chromium/ppapi/thunk/ppb_file_system_thunk.cc b/chromium/ppapi/thunk/ppb_file_system_thunk.cc index e8b5ff0268a..45709cae312 100644 --- a/chromium/ppapi/thunk/ppb_file_system_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_system_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_file_system.idl modified Wed May 15 13:57:07 2013. +// From ppb_file_system.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -51,10 +51,8 @@ PP_FileSystemType GetType(PP_Resource file_system) { return enter.object()->GetType(); } -const PPB_FileSystem_1_0 g_ppb_filesystem_thunk_1_0 = {&Create, - &IsFileSystem, - &Open, - &GetType}; +const PPB_FileSystem_1_0 g_ppb_filesystem_thunk_1_0 = {&Create, &IsFileSystem, + &Open, &GetType}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_find_private_thunk.cc b/chromium/ppapi/thunk/ppb_find_private_thunk.cc index 0766b84f38a..b2a6893f8f7 100644 --- a/chromium/ppapi/thunk/ppb_find_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_find_private_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_find_private.idl modified Mon Apr 7 08:56:43 2014. +// From private/ppb_find_private.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -54,10 +54,8 @@ void SetTickmarks(PP_Instance instance, } const PPB_Find_Private_0_3 g_ppb_find_private_thunk_0_3 = { - &SetPluginToHandleFindRequests, - &NumberOfFindResultsChanged, - &SelectedFindResultChanged, - &SetTickmarks}; + &SetPluginToHandleFindRequests, &NumberOfFindResultsChanged, + &SelectedFindResultChanged, &SetTickmarks}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc b/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc index 8c925e77e6e..240550a0bd1 100644 --- a/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc +++ b/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc @@ -4,7 +4,8 @@ #include <stdint.h> -#include "base/memory/scoped_ptr.h" +#include <memory> + #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/thunk/enter.h" @@ -72,7 +73,7 @@ int32_t WriteData_4_0(PP_Instance instance, uint32_t data_item_count, const PP_Flash_Clipboard_Format formats[], const PP_Var data_items[]) { - scoped_ptr<uint32_t[]> new_formats(new uint32_t[data_item_count]); + std::unique_ptr<uint32_t[]> new_formats(new uint32_t[data_item_count]); for (uint32_t i = 0; i < data_item_count; ++i) new_formats[i] = static_cast<uint32_t>(formats[i]); return WriteData(instance, clipboard_type, data_item_count, diff --git a/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc b/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc index d80e3b8c11c..8fe71b4da16 100644 --- a/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc +++ b/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_flash_drm.idl modified Mon Apr 7 08:56:43 2014. +// From private/ppb_flash_drm.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -67,16 +67,11 @@ int32_t MonitorIsExternal(PP_Resource drm, enter.object()->MonitorIsExternal(is_external, enter.callback())); } -const PPB_Flash_DRM_1_0 g_ppb_flash_drm_thunk_1_0 = {&Create, - &GetDeviceID, - &GetHmonitor, - &GetVoucherFile}; +const PPB_Flash_DRM_1_0 g_ppb_flash_drm_thunk_1_0 = { + &Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile}; -const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = {&Create, - &GetDeviceID, - &GetHmonitor, - &GetVoucherFile, - &MonitorIsExternal}; +const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = { + &Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile, &MonitorIsExternal}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_flash_font_file_thunk.cc b/chromium/ppapi/thunk/ppb_flash_font_file_thunk.cc index ea732cd572a..1c70a5452b1 100644 --- a/chromium/ppapi/thunk/ppb_flash_font_file_thunk.cc +++ b/chromium/ppapi/thunk/ppb_flash_font_file_thunk.cc @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_flash_font_file.idl modified Thu Oct 22 22:02:40 2015. +// From private/ppb_flash_font_file.idl modified Wed Mar 9 12:48:51 2016. #include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_font_file.h" +#include "ppapi/shared_impl/ppb_flash_font_file_shared.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppapi_thunk_export.h" @@ -47,7 +48,7 @@ PP_Bool GetFontTable(PP_Resource font_file, PP_Bool IsSupportedForWindows(void) { VLOG(4) << "PPB_Flash_FontFile::IsSupportedForWindows()"; - return PP_TRUE; + return PPB_Flash_FontFile_Shared::IsSupportedForWindows(); } const PPB_Flash_FontFile_0_1 g_ppb_flash_fontfile_thunk_0_1 = { diff --git a/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc b/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc index 3704847c1c2..af0f3afe745 100644 --- a/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc +++ b/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_fullscreen.idl modified Wed May 15 13:57:07 2013. +// From ppb_fullscreen.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_fullscreen.h" @@ -39,9 +41,8 @@ PP_Bool GetScreenSize(PP_Instance instance, struct PP_Size* size) { return enter.functions()->GetScreenSize(instance, size); } -const PPB_Fullscreen_1_0 g_ppb_fullscreen_thunk_1_0 = {&IsFullscreen, - &SetFullscreen, - &GetScreenSize}; +const PPB_Fullscreen_1_0 g_ppb_fullscreen_thunk_1_0 = { + &IsFullscreen, &SetFullscreen, &GetScreenSize}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_gamepad_thunk.cc b/chromium/ppapi/thunk/ppb_gamepad_thunk.cc index e7f4a60cc7a..354eb315311 100644 --- a/chromium/ppapi/thunk/ppb_gamepad_thunk.cc +++ b/chromium/ppapi/thunk/ppb_gamepad_thunk.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. -// From ppb_gamepad.idl modified Tue May 7 14:43:00 2013. +// From ppb_gamepad.idl modified Wed Jan 27 17:10:16 2016. +#include <stdint.h> #include <string.h> #include "ppapi/c/pp_errors.h" diff --git a/chromium/ppapi/thunk/ppb_graphics_2d_thunk.cc b/chromium/ppapi/thunk/ppb_graphics_2d_thunk.cc index 7ecbb3573d0..527b0aa80cc 100644 --- a/chromium/ppapi/thunk/ppb_graphics_2d_thunk.cc +++ b/chromium/ppapi/thunk/ppb_graphics_2d_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_graphics_2d.idl modified Wed May 15 13:57:07 2013. +// From ppb_graphics_2d.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> #include <string.h> @@ -102,23 +102,13 @@ float GetScale(PP_Resource resource) { return enter.object()->GetScale(); } -const PPB_Graphics2D_1_0 g_ppb_graphics2d_thunk_1_0 = {&Create, - &IsGraphics2D, - &Describe, - &PaintImageData, - &Scroll, - &ReplaceContents, - &Flush}; - -const PPB_Graphics2D_1_1 g_ppb_graphics2d_thunk_1_1 = {&Create, - &IsGraphics2D, - &Describe, - &PaintImageData, - &Scroll, - &ReplaceContents, - &Flush, - &SetScale, - &GetScale}; +const PPB_Graphics2D_1_0 g_ppb_graphics2d_thunk_1_0 = { + &Create, &IsGraphics2D, &Describe, &PaintImageData, + &Scroll, &ReplaceContents, &Flush}; + +const PPB_Graphics2D_1_1 g_ppb_graphics2d_thunk_1_1 = { + &Create, &IsGraphics2D, &Describe, &PaintImageData, &Scroll, + &ReplaceContents, &Flush, &SetScale, &GetScale}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_graphics_3d_api.h b/chromium/ppapi/thunk/ppb_graphics_3d_api.h index 231c0acd44b..05a28c929c1 100644 --- a/chromium/ppapi/thunk/ppb_graphics_3d_api.h +++ b/chromium/ppapi/thunk/ppb_graphics_3d_api.h @@ -32,8 +32,10 @@ class PPAPI_THUNK_EXPORT PPB_Graphics3D_API { virtual int32_t SetAttribs(const int32_t attrib_list[]) = 0; virtual int32_t GetError() = 0; virtual int32_t ResizeBuffers(int32_t width, int32_t height) = 0; - virtual int32_t SwapBuffers(scoped_refptr<TrackedCallback> callback, - const gpu::SyncToken& sync_token) = 0; + virtual int32_t SwapBuffers(scoped_refptr<TrackedCallback> callback) = 0; + virtual int32_t SwapBuffersWithSyncToken( + scoped_refptr<TrackedCallback> callback, + const gpu::SyncToken& sync_token) = 0; virtual int32_t GetAttribMaxValue(int32_t attribute, int32_t* value) = 0; // Graphics3DTrusted API. @@ -59,9 +61,6 @@ class PPAPI_THUNK_EXPORT PPB_Graphics3D_API { GLenum access) = 0; virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) = 0; - virtual uint32_t InsertSyncPoint() = 0; - virtual uint32_t InsertFutureSyncPoint() = 0; - virtual void RetireSyncPoint(uint32_t sync_point) = 0; virtual void EnsureWorkVisible() = 0; }; diff --git a/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc b/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc index a42ddd10212..d0babbb31bb 100644 --- a/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc +++ b/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_graphics_3d.idl modified Fri Nov 1 16:12:12 2013. +// From ppb_graphics_3d.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> -#include "gpu/command_buffer/common/sync_token.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_graphics_3d.h" @@ -85,18 +84,12 @@ int32_t SwapBuffers(PP_Resource context, EnterResource<PPB_Graphics3D_API> enter(context, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->SwapBuffers(enter.callback(), - gpu::SyncToken())); + return enter.SetResult(enter.object()->SwapBuffers(enter.callback())); } -const PPB_Graphics3D_1_0 g_ppb_graphics3d_thunk_1_0 = {&GetAttribMaxValue, - &Create, - &IsGraphics3D, - &GetAttribs, - &SetAttribs, - &GetError, - &ResizeBuffers, - &SwapBuffers}; +const PPB_Graphics3D_1_0 g_ppb_graphics3d_thunk_1_0 = { + &GetAttribMaxValue, &Create, &IsGraphics3D, &GetAttribs, + &SetAttribs, &GetError, &ResizeBuffers, &SwapBuffers}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc b/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc index 08e2aa25058..81896c44f41 100644 --- a/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc +++ b/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_host_resolver.idl modified Mon Jun 24 15:10:54 2013. +// From ppb_host_resolver.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -70,12 +70,9 @@ PP_Resource GetNetAddress(PP_Resource host_resolver, uint32_t index) { return enter.object()->GetNetAddress(index); } -const PPB_HostResolver_1_0 g_ppb_hostresolver_thunk_1_0 = {&Create, - &IsHostResolver, - &Resolve, - &GetCanonicalName, - &GetNetAddressCount, - &GetNetAddress}; +const PPB_HostResolver_1_0 g_ppb_hostresolver_thunk_1_0 = { + &Create, &IsHostResolver, &Resolve, + &GetCanonicalName, &GetNetAddressCount, &GetNetAddress}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_image_data_thunk.cc b/chromium/ppapi/thunk/ppb_image_data_thunk.cc index 343372c9f2f..52ca75d3702 100644 --- a/chromium/ppapi/thunk/ppb_image_data_thunk.cc +++ b/chromium/ppapi/thunk/ppb_image_data_thunk.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. -// From ppb_image_data.idl modified Tue May 7 14:43:00 2013. +// From ppb_image_data.idl modified Wed Jan 27 17:10:16 2016. +#include <stdint.h> #include <string.h> #include "ppapi/c/pp_errors.h" diff --git a/chromium/ppapi/thunk/ppb_instance_api.h b/chromium/ppapi/thunk/ppb_instance_api.h index 3657c878e16..8e771569d16 100644 --- a/chromium/ppapi/thunk/ppb_instance_api.h +++ b/chromium/ppapi/thunk/ppb_instance_api.h @@ -8,7 +8,6 @@ #include <stdint.h> #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "ppapi/c/dev/ppb_url_util_dev.h" #include "ppapi/c/pp_bool.h" diff --git a/chromium/ppapi/thunk/ppb_instance_private_thunk.cc b/chromium/ppapi/thunk/ppb_instance_private_thunk.cc index 9e576fe588b..5a2a7e3e02e 100644 --- a/chromium/ppapi/thunk/ppb_instance_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_instance_private_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_instance_private.idl modified Fri Jul 26 09:45:14 2013. +// From private/ppb_instance_private.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_instance_private.h" @@ -42,9 +44,7 @@ struct PP_Var ExecuteScript(PP_Instance instance, } const PPB_Instance_Private_0_1 g_ppb_instance_private_thunk_0_1 = { - &GetWindowObject, - &GetOwnerElementObject, - &ExecuteScript}; + &GetWindowObject, &GetOwnerElementObject, &ExecuteScript}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_instance_thunk.cc b/chromium/ppapi/thunk/ppb_instance_thunk.cc index 6de5db0da70..02dd1dd35ba 100644 --- a/chromium/ppapi/thunk/ppb_instance_thunk.cc +++ b/chromium/ppapi/thunk/ppb_instance_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_instance.idl modified Mon May 6 10:11:29 2013. +// From ppb_instance.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_instance.h" diff --git a/chromium/ppapi/thunk/ppb_media_stream_video_track_thunk.cc b/chromium/ppapi/thunk/ppb_media_stream_video_track_thunk.cc index 2d640c25cb3..d8c8ceabf59 100644 --- a/chromium/ppapi/thunk/ppb_media_stream_video_track_thunk.cc +++ b/chromium/ppapi/thunk/ppb_media_stream_video_track_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_media_stream_video_track.idl modified Thu Sep 18 11:36:39 2014. +// From ppb_media_stream_video_track.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -129,16 +129,11 @@ const PPB_MediaStreamVideoTrack_0_1 g_ppb_mediastreamvideotrack_thunk_0_1 = { &Close}; const PPB_MediaStreamVideoTrack_1_0 g_ppb_mediastreamvideotrack_thunk_1_0 = { - &Create, - &IsMediaStreamVideoTrack, - &Configure, - &GetAttrib, - &GetId, - &HasEnded, - &GetFrame, - &RecycleFrame, - &Close, - &GetEmptyFrame, + &Create, &IsMediaStreamVideoTrack, + &Configure, &GetAttrib, + &GetId, &HasEnded, + &GetFrame, &RecycleFrame, + &Close, &GetEmptyFrame, &PutFrame}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_messaging_thunk.cc b/chromium/ppapi/thunk/ppb_messaging_thunk.cc index a8b3c1a9198..40f749e7866 100644 --- a/chromium/ppapi/thunk/ppb_messaging_thunk.cc +++ b/chromium/ppapi/thunk/ppb_messaging_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_messaging.idl modified Tue Mar 24 16:53:47 2015. +// From ppb_messaging.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -47,9 +47,8 @@ void UnregisterMessageHandler(PP_Instance instance) { const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = {&PostMessage}; -const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = {&PostMessage, - &RegisterMessageHandler, - &UnregisterMessageHandler}; +const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = { + &PostMessage, &RegisterMessageHandler, &UnregisterMessageHandler}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc b/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc index 463693ffb81..e667ac128bf 100644 --- a/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc +++ b/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_mouse_cursor.idl modified Mon May 6 10:11:29 2013. +// From ppb_mouse_cursor.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_mouse_cursor.h" diff --git a/chromium/ppapi/thunk/ppb_network_list_thunk.cc b/chromium/ppapi/thunk/ppb_network_list_thunk.cc index 42df3152f30..ee7ec397ba8 100644 --- a/chromium/ppapi/thunk/ppb_network_list_thunk.cc +++ b/chromium/ppapi/thunk/ppb_network_list_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_network_list.idl modified Fri Nov 1 16:12:12 2013. +// From ppb_network_list.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -82,14 +82,9 @@ uint32_t GetMTU(PP_Resource resource, uint32_t index) { return enter.object()->GetMTU(index); } -const PPB_NetworkList_1_0 g_ppb_networklist_thunk_1_0 = {&IsNetworkList, - &GetCount, - &GetName, - &GetType, - &GetState, - &GetIpAddresses, - &GetDisplayName, - &GetMTU}; +const PPB_NetworkList_1_0 g_ppb_networklist_thunk_1_0 = { + &IsNetworkList, &GetCount, &GetName, &GetType, + &GetState, &GetIpAddresses, &GetDisplayName, &GetMTU}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc b/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc index 7d37ac508e4..b84b406fb20 100644 --- a/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc +++ b/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_network_monitor.idl modified Fri Nov 1 16:12:12 2013. +// From ppb_network_monitor.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -45,9 +45,7 @@ PP_Bool IsNetworkMonitor(PP_Resource resource) { } const PPB_NetworkMonitor_1_0 g_ppb_networkmonitor_thunk_1_0 = { - &Create, - &UpdateNetworkList, - &IsNetworkMonitor}; + &Create, &UpdateNetworkList, &IsNetworkMonitor}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc b/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc index c92885ac93c..8cd0a0c58d3 100644 --- a/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_output_protection_private.idl modified Fri Nov 1 16:12:12 -// 2013. +// From private/ppb_output_protection_private.idl modified Wed Jan 27 17:10:16 +// 2016. #include <stdint.h> @@ -58,10 +58,8 @@ int32_t EnableProtection(PP_Resource resource, } const PPB_OutputProtection_Private_0_1 - g_ppb_outputprotection_private_thunk_0_1 = {&Create, - &IsOutputProtection, - &QueryStatus, - &EnableProtection}; + g_ppb_outputprotection_private_thunk_0_1 = { + &Create, &IsOutputProtection, &QueryStatus, &EnableProtection}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc b/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc index d751cd31777..786ef6e705c 100644 --- a/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_platform_verification_private.idl modified Fri Nov 1 -// 16:12:12 2013. +// From private/ppb_platform_verification_private.idl modified Wed Jan 27 +// 17:10:16 2016. #include <stdint.h> @@ -51,9 +51,8 @@ int32_t ChallengePlatform(PP_Resource instance, } const PPB_PlatformVerification_Private_0_2 - g_ppb_platformverification_private_thunk_0_2 = {&Create, - &IsPlatformVerification, - &ChallengePlatform}; + g_ppb_platformverification_private_thunk_0_2 = { + &Create, &IsPlatformVerification, &ChallengePlatform}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc b/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc index 88bca985919..2b70b992ed5 100644 --- a/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_printing_dev.idl modified Tue May 7 14:43:00 2013. +// From dev/ppb_printing_dev.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -39,8 +39,7 @@ int32_t GetDefaultPrintSettings(PP_Resource resource, } const PPB_Printing_Dev_0_7 g_ppb_printing_dev_thunk_0_7 = { - &Create, - &GetDefaultPrintSettings}; + &Create, &GetDefaultPrintSettings}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_text_input_thunk.cc b/chromium/ppapi/thunk/ppb_text_input_thunk.cc index 030a7f57951..c376ce0e9d4 100644 --- a/chromium/ppapi/thunk/ppb_text_input_thunk.cc +++ b/chromium/ppapi/thunk/ppb_text_input_thunk.cc @@ -16,8 +16,9 @@ namespace thunk { namespace { -#define STATIC_ASSERT_ENUM(a, b) \ - static_assert(int(a) == int(b), "mismatching enum values: " #a) +#define STATIC_ASSERT_ENUM(a, b) \ + static_assert(static_cast<int>(a) == static_cast<int>(b), \ + "mismatching enum: " #a) STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_NONE, PP_TEXTINPUT_TYPE_NONE); STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_TEXT, PP_TEXTINPUT_TYPE_TEXT); diff --git a/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc b/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc index 8437c75662f..a568e6498b7 100644 --- a/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_truetype_font_dev.idl modified Fri Nov 1 16:12:12 2013. +// From dev/ppb_truetype_font_dev.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -94,13 +94,8 @@ int32_t GetTable(PP_Resource font, } const PPB_TrueTypeFont_Dev_0_1 g_ppb_truetypefont_dev_thunk_0_1 = { - &GetFontFamilies, - &GetFontsInFamily, - &Create, - &IsTrueTypeFont, - &Describe, - &GetTableTags, - &GetTable}; + &GetFontFamilies, &GetFontsInFamily, &Create, &IsTrueTypeFont, + &Describe, &GetTableTags, &GetTable}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc b/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc index 3df936e3cd9..1c35bad2717 100644 --- a/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc +++ b/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_udp_socket.idl modified Fri Mar 13 17:49:57 2015. +// From ppb_udp_socket.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -141,34 +141,17 @@ int32_t LeaveGroup(PP_Resource udp_socket, return enter.SetResult(enter.object()->LeaveGroup(group, enter.callback())); } -const PPB_UDPSocket_1_0 g_ppb_udpsocket_thunk_1_0 = {&Create, - &IsUDPSocket, - &Bind, - &GetBoundAddress, - &RecvFrom, - &SendTo, - &Close, - &SetOption_1_0}; - -const PPB_UDPSocket_1_1 g_ppb_udpsocket_thunk_1_1 = {&Create, - &IsUDPSocket, - &Bind, - &GetBoundAddress, - &RecvFrom, - &SendTo, - &Close, - &SetOption_1_1}; - -const PPB_UDPSocket_1_2 g_ppb_udpsocket_thunk_1_2 = {&Create, - &IsUDPSocket, - &Bind, - &GetBoundAddress, - &RecvFrom, - &SendTo, - &Close, - &SetOption, - &JoinGroup, - &LeaveGroup}; +const PPB_UDPSocket_1_0 g_ppb_udpsocket_thunk_1_0 = { + &Create, &IsUDPSocket, &Bind, &GetBoundAddress, + &RecvFrom, &SendTo, &Close, &SetOption_1_0}; + +const PPB_UDPSocket_1_1 g_ppb_udpsocket_thunk_1_1 = { + &Create, &IsUDPSocket, &Bind, &GetBoundAddress, + &RecvFrom, &SendTo, &Close, &SetOption_1_1}; + +const PPB_UDPSocket_1_2 g_ppb_udpsocket_thunk_1_2 = { + &Create, &IsUDPSocket, &Bind, &GetBoundAddress, &RecvFrom, + &SendTo, &Close, &SetOption, &JoinGroup, &LeaveGroup}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_uma_private_thunk.cc b/chromium/ppapi/thunk/ppb_uma_private_thunk.cc index 0e1a0b92094..517b945b596 100644 --- a/chromium/ppapi/thunk/ppb_uma_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_uma_private_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_uma_private.idl modified Mon Apr 7 08:56:43 2014. +// From private/ppb_uma_private.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -70,9 +70,7 @@ int32_t IsCrashReportingEnabled(PP_Instance instance, } const PPB_UMA_Private_0_3 g_ppb_uma_private_thunk_0_3 = { - &HistogramCustomTimes, - &HistogramCustomCounts, - &HistogramEnumeration, + &HistogramCustomTimes, &HistogramCustomCounts, &HistogramEnumeration, &IsCrashReportingEnabled}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc b/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc index 264eed67684..7d48a03b838 100644 --- a/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From trusted/ppb_url_loader_trusted.idl modified Tue May 7 14:43:00 2013. +// From trusted/ppb_url_loader_trusted.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h" @@ -34,8 +36,7 @@ void RegisterStatusCallback(PP_Resource loader, } const PPB_URLLoaderTrusted_0_3 g_ppb_urlloadertrusted_thunk_0_3 = { - &GrantUniversalAccess, - &RegisterStatusCallback}; + &GrantUniversalAccess, &RegisterStatusCallback}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc b/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc index 3ec617fb3b3..24e1041a8d2 100644 --- a/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_url_request_info.idl modified Mon May 6 10:11:29 2013. +// From ppb_url_request_info.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -64,10 +64,7 @@ PP_Bool AppendFileToBody(PP_Resource request, } const PPB_URLRequestInfo_1_0 g_ppb_urlrequestinfo_thunk_1_0 = { - &Create, - &IsURLRequestInfo, - &SetProperty, - &AppendDataToBody, + &Create, &IsURLRequestInfo, &SetProperty, &AppendDataToBody, &AppendFileToBody}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc b/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc index c61eba7be0f..9b90f0a486c 100644 --- a/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_url_response_info.idl modified Tue May 7 14:43:00 2013. +// From ppb_url_response_info.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_url_response_info.h" @@ -40,9 +42,7 @@ PP_Resource GetBodyAsFileRef(PP_Resource response) { } const PPB_URLResponseInfo_1_0 g_ppb_urlresponseinfo_thunk_1_0 = { - &IsURLResponseInfo, - &GetProperty, - &GetBodyAsFileRef}; + &IsURLResponseInfo, &GetProperty, &GetBodyAsFileRef}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_video_frame_thunk.cc b/chromium/ppapi/thunk/ppb_video_frame_thunk.cc index 96e023a2564..c980f8a44bd 100644 --- a/chromium/ppapi/thunk/ppb_video_frame_thunk.cc +++ b/chromium/ppapi/thunk/ppb_video_frame_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_video_frame.idl modified Mon Apr 7 08:56:43 2014. +// From ppb_video_frame.idl modified Wed Jan 27 17:10:16 2016. #include <stdint.h> @@ -72,13 +72,9 @@ uint32_t GetDataBufferSize(PP_Resource frame) { return enter.object()->GetDataBufferSize(); } -const PPB_VideoFrame_0_1 g_ppb_videoframe_thunk_0_1 = {&IsVideoFrame, - &GetTimestamp, - &SetTimestamp, - &GetFormat, - &GetSize, - &GetDataBuffer, - &GetDataBufferSize}; +const PPB_VideoFrame_0_1 g_ppb_videoframe_thunk_0_1 = { + &IsVideoFrame, &GetTimestamp, &SetTimestamp, &GetFormat, + &GetSize, &GetDataBuffer, &GetDataBufferSize}; } // namespace diff --git a/chromium/ppapi/thunk/ppb_view_dev_thunk.cc b/chromium/ppapi/thunk/ppb_view_dev_thunk.cc index 0a2ef275670..2dd83b49342 100644 --- a/chromium/ppapi/thunk/ppb_view_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_view_dev_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_view_dev.idl modified Mon May 6 10:11:29 2013. +// From dev/ppb_view_dev.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/dev/ppb_view_dev.h" #include "ppapi/c/pp_errors.h" diff --git a/chromium/ppapi/thunk/ppb_view_thunk.cc b/chromium/ppapi/thunk/ppb_view_thunk.cc index 980c768fbf1..6e069fc1d4e 100644 --- a/chromium/ppapi/thunk/ppb_view_thunk.cc +++ b/chromium/ppapi/thunk/ppb_view_thunk.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_view.idl modified Wed Nov 5 14:29:15 2014. +// From ppb_view.idl modified Wed Jan 27 17:10:16 2016. + +#include <stdint.h> #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_view.h" @@ -86,31 +88,17 @@ PP_Bool GetScrollOffset(PP_Resource resource, struct PP_Point* offset) { return enter.object()->GetScrollOffset(offset); } -const PPB_View_1_0 g_ppb_view_thunk_1_0 = {&IsView, - &GetRect, - &IsFullscreen, - &IsVisible, - &IsPageVisible, - &GetClipRect}; - -const PPB_View_1_1 g_ppb_view_thunk_1_1 = {&IsView, - &GetRect, - &IsFullscreen, - &IsVisible, - &IsPageVisible, - &GetClipRect, - &GetDeviceScale, - &GetCSSScale}; - -const PPB_View_1_2 g_ppb_view_thunk_1_2 = {&IsView, - &GetRect, - &IsFullscreen, - &IsVisible, - &IsPageVisible, - &GetClipRect, - &GetDeviceScale, - &GetCSSScale, - &GetScrollOffset}; +const PPB_View_1_0 g_ppb_view_thunk_1_0 = { + &IsView, &GetRect, &IsFullscreen, &IsVisible, &IsPageVisible, &GetClipRect}; + +const PPB_View_1_1 g_ppb_view_thunk_1_1 = { + &IsView, &GetRect, &IsFullscreen, &IsVisible, + &IsPageVisible, &GetClipRect, &GetDeviceScale, &GetCSSScale}; + +const PPB_View_1_2 g_ppb_view_thunk_1_2 = { + &IsView, &GetRect, &IsFullscreen, + &IsVisible, &IsPageVisible, &GetClipRect, + &GetDeviceScale, &GetCSSScale, &GetScrollOffset}; } // namespace diff --git a/chromium/ppapi/thunk/resource_creation_api.h b/chromium/ppapi/thunk/resource_creation_api.h index e9ca691e60f..582d9a18648 100644 --- a/chromium/ppapi/thunk/resource_creation_api.h +++ b/chromium/ppapi/thunk/resource_creation_api.h @@ -9,6 +9,7 @@ #include "base/memory/shared_memory.h" #include "build/build_config.h" +#include "gpu/command_buffer/common/command_buffer_id.h" #include "ppapi/c/dev/pp_video_dev.h" #include "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/dev/ppb_truetype_font_dev.h" @@ -144,7 +145,7 @@ class ResourceCreationAPI { const int32_t* attrib_list, gpu::Capabilities* capabilities, base::SharedMemoryHandle* shared_state, - uint64_t* command_buffer_id) = 0; + gpu::CommandBufferId* command_buffer_id) = 0; virtual PP_Resource CreateHostResolver(PP_Instance instance) = 0; virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) = 0; virtual PP_Resource CreateImageData(PP_Instance instance, |