diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/ppapi/thunk | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/ppapi/thunk')
99 files changed, 2193 insertions, 1447 deletions
diff --git a/chromium/ppapi/thunk/OWNERS b/chromium/ppapi/thunk/OWNERS new file mode 100644 index 00000000000..80e764b4e0e --- /dev/null +++ b/chromium/ppapi/thunk/OWNERS @@ -0,0 +1,12 @@ +# New interfaces that use dev channel permissions should have a security review +# until http://crbug.com/386743 is resolved. +per-file interfaces_ppb_public_dev_channel.h=set noparent +per-file interfaces_ppb_public_dev_channel.h=cevans@chromium.org +per-file interfaces_ppb_public_dev_channel.h=dcheng@chromium.org +per-file interfaces_ppb_public_dev_channel.h=inferno@chromium.org +per-file interfaces_ppb_public_dev_channel.h=jln@chromium.org +per-file interfaces_ppb_public_dev_channel.h=jschuh@chromium.org +per-file interfaces_ppb_public_dev_channel.h=kenrb@chromium.org +per-file interfaces_ppb_public_dev_channel.h=nasko@chromium.org +per-file interfaces_ppb_public_dev_channel.h=palmer@chromium.org +per-file interfaces_ppb_public_dev_channel.h=tsepez@chromium.org diff --git a/chromium/ppapi/thunk/enter.cc b/chromium/ppapi/thunk/enter.cc index 47889dd1577..03937c9b533 100644 --- a/chromium/ppapi/thunk/enter.cc +++ b/chromium/ppapi/thunk/enter.cc @@ -32,16 +32,19 @@ namespace subtle { EnterBase::EnterBase() : resource_(NULL), retval_(PP_OK) { + PpapiGlobals::Get()->MarkPluginIsActive(); } EnterBase::EnterBase(PP_Resource resource) : resource_(GetResource(resource)), retval_(PP_OK) { + PpapiGlobals::Get()->MarkPluginIsActive(); } EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id) : resource_(GetSingletonResource(instance, resource_id)), retval_(PP_OK) { + PpapiGlobals::Get()->MarkPluginIsActive(); } EnterBase::EnterBase(PP_Resource resource, @@ -49,16 +52,17 @@ EnterBase::EnterBase(PP_Resource resource, : resource_(GetResource(resource)), retval_(PP_OK) { callback_ = new TrackedCallback(resource_, callback); + PpapiGlobals::Get()->MarkPluginIsActive(); } EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id, const PP_CompletionCallback& callback) : resource_(GetSingletonResource(instance, resource_id)), retval_(PP_OK) { - DCHECK(resource_ || !instance); if (!resource_) retval_ = PP_ERROR_BADARGUMENT; callback_ = new TrackedCallback(resource_, callback); + PpapiGlobals::Get()->MarkPluginIsActive(); } EnterBase::~EnterBase() { diff --git a/chromium/ppapi/thunk/extensions_common_api.h b/chromium/ppapi/thunk/extensions_common_api.h deleted file mode 100644 index 5afb73fac90..00000000000 --- a/chromium/ppapi/thunk/extensions_common_api.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef PPAPI_THUNK_EXTENSIONS_COMMON_API_H_ -#define PPAPI_THUNK_EXTENSIONS_COMMON_API_H_ - -#include <string> -#include <vector> - -#include "base/memory/ref_counted.h" -#include "ppapi/c/pp_var.h" -#include "ppapi/shared_impl/singleton_resource_id.h" -#include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/ppapi_thunk_export.h" - -namespace ppapi { -namespace thunk { - -class PPAPI_THUNK_EXPORT ExtensionsCommon_API { - public: - virtual ~ExtensionsCommon_API() {} - - virtual int32_t CallRenderer(const std::string& request_name, - const std::vector<PP_Var>& input_args, - const std::vector<PP_Var*>& output_args, - scoped_refptr<TrackedCallback> callback) = 0; - virtual void PostRenderer(const std::string& request_name, - const std::vector<PP_Var>& args) = 0; - virtual int32_t CallBrowser(const std::string& request_name, - const std::vector<PP_Var>& input_args, - const std::vector<PP_Var*>& output_args, - scoped_refptr<TrackedCallback> callback) = 0; - virtual void PostBrowser(const std::string& request_name, - const std::vector<PP_Var>& args) = 0; - - static const SingletonResourceID kSingletonResourceID = - EXTENSIONS_COMMON_SINGLETON_ID; -}; - -} // namespace thunk -} // namespace ppapi - -#endif // PPAPI_THUNK_EXTENSIONS_COMMON_API_H_ diff --git a/chromium/ppapi/thunk/interfaces_legacy.h b/chromium/ppapi/thunk/interfaces_legacy.h index 60518249a06..db47faea5aa 100644 --- a/chromium/ppapi/thunk/interfaces_legacy.h +++ b/chromium/ppapi/thunk/interfaces_legacy.h @@ -27,14 +27,17 @@ LEGACY_IFACE(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0, ::ppapi::PPB_OpenGLES2_Shared::GetChromiumMapSubInterface()) LEGACY_IFACE(PPB_OPENGLES2_QUERY_INTERFACE, ::ppapi::PPB_OpenGLES2_Shared::GetQueryInterface()) +LEGACY_IFACE(PPB_OPENGLES2_DRAWBUFFERS_DEV_INTERFACE, + ::ppapi::PPB_OpenGLES2_Shared::GetDrawBuffersInterface()) LEGACY_IFACE(PPB_PROXY_PRIVATE_INTERFACE, PPB_Proxy_Impl::GetInterface()) -LEGACY_IFACE(PPB_UMA_PRIVATE_INTERFACE, PPB_UMA_Private_Impl::GetInterface()) LEGACY_IFACE(PPB_VAR_DEPRECATED_INTERFACE, PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface()) LEGACY_IFACE(PPB_VAR_INTERFACE_1_0, ::ppapi::PPB_Var_Shared::GetVarInterface1_0()) LEGACY_IFACE(PPB_VAR_INTERFACE_1_1, ::ppapi::PPB_Var_Shared::GetVarInterface1_1()) +LEGACY_IFACE(PPB_VAR_INTERFACE_1_2, + ::ppapi::PPB_Var_Shared::GetVarInterface1_2()) LEGACY_IFACE(PPB_VAR_ARRAY_BUFFER_INTERFACE_1_0, ::ppapi::PPB_Var_Shared::GetVarArrayBufferInterface1_0()) diff --git a/chromium/ppapi/thunk/interfaces_postamble.h b/chromium/ppapi/thunk/interfaces_postamble.h index cebfe74e5d2..c845b5f072e 100644 --- a/chromium/ppapi/thunk/interfaces_postamble.h +++ b/chromium/ppapi/thunk/interfaces_postamble.h @@ -9,17 +9,7 @@ #undef PROXIED_API #endif -#ifdef UNDEFINE_UNPROXIED_API -#undef UNDEFINE_UNPROXIED_API -#undef UNPROXIED_API -#endif - #ifdef UNDEFINE_PROXIED_IFACE #undef UNDEFINE_PROXIED_IFACE #undef PROXIED_IFACE #endif - -#ifdef UNDEFINE_UNPROXIED_IFACE -#undef UNDEFINE_UNPROXIED_IFACE -#undef UNPROXIED_IFACE -#endif diff --git a/chromium/ppapi/thunk/interfaces_ppb_private.h b/chromium/ppapi/thunk/interfaces_ppb_private.h index 11d5e526709..e4aff229127 100644 --- a/chromium/ppapi/thunk/interfaces_ppb_private.h +++ b/chromium/ppapi/thunk/interfaces_ppb_private.h @@ -11,59 +11,59 @@ PROXIED_API(PPB_X509Certificate_Private) -PROXIED_IFACE(PPB_X509Certificate_Private, - PPB_X509CERTIFICATE_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_X509CERTIFICATE_PRIVATE_INTERFACE_0_1, PPB_X509Certificate_Private_0_1) #if !defined(OS_NACL) PROXIED_API(PPB_Broker) -PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, +PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_2, PPB_BrokerTrusted_0_2) -PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_3, +PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_3, PPB_BrokerTrusted_0_3) -PROXIED_IFACE(PPB_Instance, PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0, +PROXIED_IFACE(PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0, PPB_BrowserFont_Trusted_1_0) -PROXIED_IFACE(PPB_Instance, - PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_9, - PPB_ContentDecryptor_Private_0_9) -PROXIED_IFACE(PPB_Instance, PPB_CHARSET_TRUSTED_INTERFACE_1_0, +PROXIED_IFACE(PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_12, + PPB_ContentDecryptor_Private_0_12) +PROXIED_IFACE(PPB_CHARSET_TRUSTED_INTERFACE_1_0, PPB_CharSet_Trusted_1_0) -PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, +PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, PPB_FileChooserTrusted_0_5) -PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6, +PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6, PPB_FileChooserTrusted_0_6) -PROXIED_IFACE(NoAPIName, PPB_FILEREFPRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_FILEREFPRIVATE_INTERFACE_0_1, PPB_FileRefPrivate_0_1) -// TODO(xhwang): Move PPB_Flash_DeviceID back to interfaces_ppb_private_flash.h. -PROXIED_IFACE(NoAPIName, PPB_FLASH_DEVICEID_INTERFACE_1_0, - PPB_Flash_DeviceID_1_0) -PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_0_1, +PROXIED_IFACE(PPB_FIND_PRIVATE_INTERFACE_0_3, + PPB_Find_Private_0_3) +PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_0_1, PPB_FlashFullscreen_0_1) -PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_1_0, +PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_1_0, PPB_FlashFullscreen_0_1) -PROXIED_IFACE(NoAPIName, PPB_PDF_INTERFACE, +PROXIED_IFACE(PPB_PDF_INTERFACE, PPB_PDF) #if defined(OS_CHROMEOS) -PROXIED_IFACE(NoAPIName, PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_2, +PROXIED_IFACE(PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_2, PPB_PlatformVerification_Private_0_2) #endif -PROXIED_IFACE(NoAPIName, PPB_TALK_PRIVATE_INTERFACE_1_0, +PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_1_0, PPB_Talk_Private_1_0) -PROXIED_IFACE(NoAPIName, PPB_TALK_PRIVATE_INTERFACE_2_0, +PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_2_0, PPB_Talk_Private_2_0) -PROXIED_IFACE(NoAPIName, PPB_URLLOADERTRUSTED_INTERFACE_0_3, +PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3, PPB_URLLoaderTrusted_0_3) -PROXIED_IFACE(NoAPIName, PPB_OUTPUTPROTECTION_PRIVATE_INTERFACE_0_1, +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_Instance, PPB_FONT_DEV_INTERFACE_0_6, +PROXIED_IFACE(PPB_FONT_DEV_INTERFACE_0_6, PPB_BrowserFont_Trusted_1_0) #endif // !defined(OS_NACL) +PROXIED_IFACE(PPB_INPUTEVENT_PRIVATE_INTERFACE_0_1, + PPB_InputEvent_Private_0_1) + #include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/interfaces_ppb_private_flash.h b/chromium/ppapi/thunk/interfaces_ppb_private_flash.h index facfdebc620..8957526e7c7 100644 --- a/chromium/ppapi/thunk/interfaces_ppb_private_flash.h +++ b/chromium/ppapi/thunk/interfaces_ppb_private_flash.h @@ -7,52 +7,45 @@ #include "ppapi/thunk/interfaces_preamble.h" -PROXIED_IFACE(NoAPIName, - PPB_FLASH_INTERFACE_12_4, +PROXIED_IFACE(PPB_FLASH_INTERFACE_12_4, PPB_Flash_12_4) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_INTERFACE_12_5, +PROXIED_IFACE(PPB_FLASH_INTERFACE_12_5, PPB_Flash_12_5) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_INTERFACE_12_6, +PROXIED_IFACE(PPB_FLASH_INTERFACE_12_6, PPB_Flash_12_6) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_INTERFACE_13_0, +PROXIED_IFACE(PPB_FLASH_INTERFACE_13_0, PPB_Flash_13_0) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_FILE_MODULELOCAL_INTERFACE_3_0, +PROXIED_IFACE(PPB_FLASH_FILE_MODULELOCAL_INTERFACE_3_0, PPB_Flash_File_ModuleLocal_3_0) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_FILE_FILEREF_INTERFACE, +PROXIED_IFACE(PPB_FLASH_FILE_FILEREF_INTERFACE, PPB_Flash_File_FileRef) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_CLIPBOARD_INTERFACE_4_0, +PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_4_0, PPB_Flash_Clipboard_4_0) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_CLIPBOARD_INTERFACE_5_0, +PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_0, PPB_Flash_Clipboard_5_0) +PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_1, + PPB_Flash_Clipboard_5_1) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_DRM_INTERFACE_1_0, +PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0, + PPB_Flash_DeviceID_1_0) +PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_0, PPB_Flash_DRM_1_0) +PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_1, + PPB_Flash_DRM_1_1) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_FONTFILE_INTERFACE_0_1, +PROXIED_IFACE(PPB_FLASH_FONTFILE_INTERFACE_0_1, PPB_Flash_FontFile_0_1) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_MENU_INTERFACE_0_2, +PROXIED_IFACE(PPB_FLASH_MENU_INTERFACE_0_2, PPB_Flash_Menu_0_2) PROXIED_API(PPB_Flash_MessageLoop) -PROXIED_IFACE(PPB_Flash_MessageLoop, - PPB_FLASH_MESSAGELOOP_INTERFACE_0_1, +PROXIED_IFACE(PPB_FLASH_MESSAGELOOP_INTERFACE_0_1, PPB_Flash_MessageLoop_0_1) -PROXIED_IFACE(NoAPIName, - PPB_FLASH_PRINT_INTERFACE_1_0, +PROXIED_IFACE(PPB_FLASH_PRINT_INTERFACE_1_0, PPB_Flash_Print_1_0) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h b/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h index 3b4446f9fbe..6c224fe57bf 100644 --- a/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h +++ b/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h @@ -10,42 +10,45 @@ // These interfaces don't require private permissions. However, they only work // for whitelisted origins. -PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_HOSTRESOLVER_PRIVATE_INTERFACE_0_1, PPB_HostResolver_Private_0_1) -PROXIED_IFACE(NoAPIName, PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1, PPB_TCPServerSocket_Private_0_1) -PROXIED_IFACE(NoAPIName, PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_2, +PROXIED_IFACE(PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_2, PPB_TCPServerSocket_Private_0_2) -PROXIED_IFACE(NoAPIName, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3, +PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3, PPB_TCPSocket_Private_0_3) -PROXIED_IFACE(NoAPIName, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_4, +PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_4, PPB_TCPSocket_Private_0_4) -PROXIED_IFACE(NoAPIName, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_5, +PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_5, PPB_TCPSocket_Private_0_5) -PROXIED_IFACE(NoAPIName, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2, +PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2, PPB_UDPSocket_Private_0_2) -PROXIED_IFACE(NoAPIName, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3, +PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3, PPB_UDPSocket_Private_0_3) -PROXIED_IFACE(NoAPIName, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4, +PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4, PPB_UDPSocket_Private_0_4) -PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_NETADDRESS_PRIVATE_INTERFACE_0_1, PPB_NetAddress_Private_0_1) -PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_1_0, +PROXIED_IFACE(PPB_NETADDRESS_PRIVATE_INTERFACE_1_0, PPB_NetAddress_Private_1_0) -PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_1_1, +PROXIED_IFACE(PPB_NETADDRESS_PRIVATE_INTERFACE_1_1, PPB_NetAddress_Private_1_1) -PROXIED_IFACE(NoAPIName, PPB_EXT_CRXFILESYSTEM_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_EXT_CRXFILESYSTEM_PRIVATE_INTERFACE_0_1, PPB_Ext_CrxFileSystem_Private_0_1) -PROXIED_IFACE(NoAPIName, PPB_FILEIO_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_FILEIO_PRIVATE_INTERFACE_0_1, PPB_FileIO_Private_0_1) -PROXIED_IFACE(NoAPIName, PPB_ISOLATEDFILESYSTEM_PRIVATE_INTERFACE_0_2, +PROXIED_IFACE(PPB_ISOLATEDFILESYSTEM_PRIVATE_INTERFACE_0_2, PPB_IsolatedFileSystem_Private_0_2) -PROXIED_IFACE(NoAPIName, PPB_VIDEODESTINATION_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_VIDEODESTINATION_PRIVATE_INTERFACE_0_1, PPB_VideoDestination_Private_0_1) -PROXIED_IFACE(NoAPIName, PPB_VIDEOSOURCE_PRIVATE_INTERFACE_0_1, +PROXIED_IFACE(PPB_VIDEOSOURCE_PRIVATE_INTERFACE_0_1, PPB_VideoSource_Private_0_1) +PROXIED_IFACE(PPB_UMA_PRIVATE_INTERFACE_0_3, + PPB_UMA_Private_0_3) + #include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/interfaces_ppb_public_dev.h b/chromium/ppapi/thunk/interfaces_ppb_public_dev.h index 2c894e409da..9597843a701 100644 --- a/chromium/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/chromium/ppapi/thunk/interfaces_ppb_public_dev.h @@ -9,81 +9,39 @@ // Map the old dev console interface to the stable one (which is the same) to // keep Flash, etc. working. -PROXIED_IFACE(PPB_Instance, "PPB_Console(Dev);0.1", PPB_Console_1_0) -PROXIED_IFACE(NoAPIName, PPB_ALARMS_DEV_INTERFACE_0_1, PPB_Alarms_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4, - PPB_CursorControl_Dev_0_4) -PROXIED_IFACE(NoAPIName, PPB_EXT_SOCKET_DEV_INTERFACE_0_1, - PPB_Ext_Socket_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_EXT_SOCKET_DEV_INTERFACE_0_2, - PPB_Ext_Socket_Dev_0_2) -PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_5, - PPB_FileChooser_Dev_0_5) -PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_6, - PPB_FileChooser_Dev_0_6) -UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3) -PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2, - PPB_IMEInputEvent_Dev_0_2) -PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_2, - PPB_KeyboardInputEvent_Dev_0_2) -PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_PRINTING_DEV_INTERFACE_0_7, - PPB_Printing_Dev_0_7) -PROXIED_IFACE(NoAPIName, PPB_RESOURCEARRAY_DEV_INTERFACE_0_1, - PPB_ResourceArray_Dev_0_1) -PROXIED_IFACE(PPB_Instance, PPB_TEXTINPUT_DEV_INTERFACE_0_2, - PPB_TextInput_Dev_0_2) -PROXIED_IFACE(NoAPIName, PPB_TRUETYPEFONT_DEV_INTERFACE_0_1, - PPB_TrueTypeFont_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_VAR_RESOURCE_DEV_INTERFACE_0_1, - PPB_VarResource_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_VIEW_DEV_INTERFACE_0_1, - PPB_View_Dev_0_1) -UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev_0_2) -PROXIED_IFACE(PPB_Instance, PPB_TRACE_EVENT_DEV_INTERFACE_0_1, - PPB_Trace_Event_Dev_0_1) -PROXIED_IFACE(PPB_Instance, PPB_TRACE_EVENT_DEV_INTERFACE_0_2, - PPB_Trace_Event_Dev_0_2) +PROXIED_IFACE("PPB_Console(Dev);0.1", PPB_Console_1_0) +PROXIED_IFACE(PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4, PPB_CursorControl_Dev_0_4) +PROXIED_IFACE(PPB_FILECHOOSER_DEV_INTERFACE_0_5, PPB_FileChooser_Dev_0_5) +PROXIED_IFACE(PPB_FILECHOOSER_DEV_INTERFACE_0_6, PPB_FileChooser_Dev_0_6) +PROXIED_IFACE(PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2, PPB_IMEInputEvent_Dev_0_2) +PROXIED_IFACE(PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1) +PROXIED_IFACE(PPB_PRINTING_DEV_INTERFACE_0_7, PPB_Printing_Dev_0_7) +PROXIED_IFACE(PPB_TEXTINPUT_DEV_INTERFACE_0_2, PPB_TextInput_Dev_0_2) +PROXIED_IFACE(PPB_TRUETYPEFONT_DEV_INTERFACE_0_1, PPB_TrueTypeFont_Dev_0_1) +PROXIED_IFACE(PPB_VIEW_DEV_INTERFACE_0_1, PPB_View_Dev_0_1) +PROXIED_IFACE(PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev_0_2) #if !defined(OS_NACL) PROXIED_API(PPB_Buffer) -UNPROXIED_API(PPB_Scrollbar) PROXIED_API(PPB_VideoDecoder) -UNPROXIED_API(PPB_Widget) -PROXIED_IFACE(NoAPIName, PPB_AUDIO_INPUT_DEV_INTERFACE_0_2, - PPB_AudioInput_Dev_0_2) -PROXIED_IFACE(NoAPIName, PPB_AUDIO_INPUT_DEV_INTERFACE_0_3, - PPB_AudioInput_Dev_0_3) -PROXIED_IFACE(NoAPIName, PPB_AUDIO_INPUT_DEV_INTERFACE_0_4, - PPB_AudioInput_Dev_0_4) -PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1, - PPB_IMEInputEvent_Dev_0_1) -PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev_0_4) -PROXIED_IFACE(PPB_Graphics3D, - PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1, +PROXIED_IFACE(PPB_AUDIO_INPUT_DEV_INTERFACE_0_3, PPB_AudioInput_Dev_0_3) +PROXIED_IFACE(PPB_AUDIO_INPUT_DEV_INTERFACE_0_4, PPB_AudioInput_Dev_0_4) +PROXIED_IFACE(PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev_0_4) +PROXIED_IFACE(PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev_0_4) +PROXIED_IFACE(PPB_CRYPTO_DEV_INTERFACE_0_1, PPB_Crypto_Dev_0_1) +PROXIED_IFACE(PPB_DEVICEREF_DEV_INTERFACE_0_1, PPB_DeviceRef_Dev_0_1) +PROXIED_IFACE(PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1, PPB_GLESChromiumTextureMapping_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE_0_1, PPB_Crypto_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_DEVICEREF_DEV_INTERFACE_0_1, PPB_DeviceRef_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_GRAPHICS2D_DEV_INTERFACE_0_1, - PPB_Graphics2D_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_GRAPHICS2D_DEV_INTERFACE_0_2, - PPB_Graphics2D_Dev_0_2) -PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev_0_4) -PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev_0_6) -PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_7, PPB_URLUtil_Dev_0_7) -UNPROXIED_IFACE(PPB_Scrollbar, PPB_SCROLLBAR_DEV_INTERFACE_0_5, - PPB_Scrollbar_Dev_0_5) -PROXIED_IFACE(PPB_Instance, PPB_TEXTINPUT_DEV_INTERFACE_0_1, - PPB_TextInput_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2, - PPB_VideoCapture_Dev_0_2) -PROXIED_IFACE(NoAPIName, PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3, - PPB_VideoCapture_Dev_0_3) -PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16, - PPB_VideoDecoder_Dev_0_16) -UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3) -UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_4, PPB_Widget_Dev_0_4) +PROXIED_IFACE(PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1, PPB_IMEInputEvent_Dev_0_1) +PROXIED_IFACE(PPB_SCROLLBAR_DEV_INTERFACE_0_5, PPB_Scrollbar_Dev_0_5) +PROXIED_IFACE(PPB_TEXTINPUT_DEV_INTERFACE_0_1, PPB_TextInput_Dev_0_1) +PROXIED_IFACE(PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev_0_6) +PROXIED_IFACE(PPB_URLUTIL_DEV_INTERFACE_0_7, PPB_URLUtil_Dev_0_7) +PROXIED_IFACE(PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3, PPB_VideoCapture_Dev_0_3) +PROXIED_IFACE(PPB_VIDEODECODER_DEV_INTERFACE_0_16, PPB_VideoDecoder_Dev_0_16) +PROXIED_IFACE(PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3) +PROXIED_IFACE(PPB_WIDGET_DEV_INTERFACE_0_4, PPB_Widget_Dev_0_4) #endif // !defined(OS_NACL) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/interfaces_ppb_public_dev_channel.h b/chromium/ppapi/thunk/interfaces_ppb_public_dev_channel.h new file mode 100644 index 00000000000..a4f0e5963ff --- /dev/null +++ b/chromium/ppapi/thunk/interfaces_ppb_public_dev_channel.h @@ -0,0 +1,25 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Please see inteface_ppb_public_stable for the documentation on the format of +// this file. + +#include "ppapi/thunk/interfaces_preamble.h" + +// Interfaces go here. +PROXIED_IFACE(PPB_COMPOSITOR_INTERFACE_0_1, PPB_Compositor_0_1) +PROXIED_IFACE(PPB_COMPOSITORLAYER_INTERFACE_0_1, PPB_CompositorLayer_0_1) +PROXIED_IFACE(PPB_FILEMAPPING_INTERFACE_0_1, PPB_FileMapping_0_1) +PROXIED_IFACE(PPB_MESSAGING_INTERFACE_1_1, PPB_Messaging_1_1) +PROXIED_IFACE(PPB_VIDEODECODER_INTERFACE_0_1, PPB_VideoDecoder_0_1) + +// Note, PPB_TraceEvent is special. We don't want to actually make it stable, +// but we want developers to be able to leverage it when running Chrome Dev or +// Chrome Canary. +PROXIED_IFACE(PPB_TRACE_EVENT_DEV_INTERFACE_0_1, + PPB_Trace_Event_Dev_0_1) +PROXIED_IFACE(PPB_TRACE_EVENT_DEV_INTERFACE_0_2, + PPB_Trace_Event_Dev_0_2) + +#include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/interfaces_ppb_public_stable.h b/chromium/ppapi/thunk/interfaces_ppb_public_stable.h index 91e023afe66..adf765640cc 100644 --- a/chromium/ppapi/thunk/interfaces_ppb_public_stable.h +++ b/chromium/ppapi/thunk/interfaces_ppb_public_stable.h @@ -7,7 +7,13 @@ // This file contains lists of interfaces. It's intended to be included by // another file which defines implementations of the macros. This allows files // to do specific registration tasks for each supported interface. - +// +// When adding an interface, you must also add the hash value for the +// interface's name to tools/metrics/histograms/histograms.xml. This is so we +// get human-readable UMA tracking for interface usage. +// +// Use the 'pepper_hash_for_uma' tool in ppapi/tools to determine the hash for +// a given interface string. // Api categories // -------------- @@ -15,21 +21,16 @@ // this directory. One API may implement one or more actual interfaces. // // For PROXIED_APIs, these also correspond to *_Proxy objects. The proxied ones -// define factory functions for each of these classes. UNPROXIED_APIs are ones -// that exist in the webkit/plugins/ppapi/*_impl.h, but not in the proxy. +// define factory functions for each of these classes. PROXIED_API(PPB_Audio) PROXIED_API(PPB_Core) PROXIED_API(PPB_Graphics3D) PROXIED_API(PPB_ImageData) PROXIED_API(PPB_Instance) -// AudioConfig isn't proxied in the normal way, we have only local classes and -// serialize it to a struct when we need it on the host side. -UNPROXIED_API(PPB_AudioConfig) - // Interfaces // ---------- -// Enumerates interfaces as (api_name, interface_name, interface_struct). +// Enumerates interfaces as (interface_name, interface_struct). // // The api_name corresponds to the class in the list above for the object // that implements the API. Some things may be special and aren't implemented @@ -43,64 +44,65 @@ UNPROXIED_API(PPB_AudioConfig) // The interface_struct is the typename of the struct corresponding to the // interface string. // Note: Core is special and is registered manually. -PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0) -PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_1, PPB_Audio_1_1) -PROXIED_IFACE(NoAPIName, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0) -PROXIED_IFACE(NoAPIName, PPB_FILEREF_INTERFACE_1_1, PPB_FileRef_1_1) -PROXIED_IFACE(NoAPIName, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0) -PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0) -PROXIED_IFACE(PPB_ImageData, PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData_1_0) -PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_INTERFACE_1_0, PPB_Console_1_0) -PROXIED_IFACE(PPB_Instance, PPB_GAMEPAD_INTERFACE_1_0, PPB_Gamepad_1_0) -PROXIED_IFACE(PPB_Instance, PPB_INSTANCE_INTERFACE_1_0, PPB_Instance_1_0) -PROXIED_IFACE(NoAPIName, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0) -PROXIED_IFACE(NoAPIName, PPB_FILEIO_INTERFACE_1_1, PPB_FileIO_1_1) -PROXIED_IFACE(NoAPIName, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0) -PROXIED_IFACE(NoAPIName, PPB_GRAPHICS_2D_INTERFACE_1_1, PPB_Graphics2D_1_1) -PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_INTERFACE_1_0, PPB_HostResolver_1_0) -PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_INTERFACE_1_0, - PPB_IMEInputEvent_1_0) -PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0) -PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0, +PROXIED_IFACE(PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0) +PROXIED_IFACE(PPB_AUDIO_INTERFACE_1_1, PPB_Audio_1_1) +PROXIED_IFACE(PPB_AUDIOBUFFER_INTERFACE_0_1, PPB_AudioBuffer_0_1) +PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0) +PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_1, PPB_FileRef_1_1) +PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_2, PPB_FileRef_1_2) +PROXIED_IFACE(PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0) +PROXIED_IFACE(PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0) +PROXIED_IFACE(PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData_1_0) +PROXIED_IFACE(PPB_CONSOLE_INTERFACE_1_0, PPB_Console_1_0) +PROXIED_IFACE(PPB_GAMEPAD_INTERFACE_1_0, PPB_Gamepad_1_0) +PROXIED_IFACE(PPB_INSTANCE_INTERFACE_1_0, PPB_Instance_1_0) +PROXIED_IFACE(PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0) +PROXIED_IFACE(PPB_FILEIO_INTERFACE_1_1, PPB_FileIO_1_1) +PROXIED_IFACE(PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0) +PROXIED_IFACE(PPB_GRAPHICS_2D_INTERFACE_1_1, PPB_Graphics2D_1_1) +PROXIED_IFACE(PPB_HOSTRESOLVER_INTERFACE_1_0, PPB_HostResolver_1_0) +PROXIED_IFACE(PPB_IME_INPUT_EVENT_INTERFACE_1_0, PPB_IMEInputEvent_1_0) +PROXIED_IFACE(PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0) +PROXIED_IFACE(PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0, PPB_KeyboardInputEvent_1_0) -PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0, - PPB_MouseInputEvent_1_0) -PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1, - PPB_MouseInputEvent_1_1) -PROXIED_IFACE(NoAPIName, PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0, - PPB_WheelInputEvent_1_0) -PROXIED_IFACE(NoAPIName, PPB_TOUCH_INPUT_EVENT_INTERFACE_1_0, - PPB_TouchInputEvent_1_0) -PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen_1_0) -PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging_1_0) -PROXIED_IFACE(PPB_Instance, PPB_MOUSECURSOR_INTERFACE_1_0, PPB_MouseCursor_1_0) -PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock_1_0) -PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_INTERFACE_1_0, PPB_NetAddress_1_0) -PROXIED_IFACE(NoAPIName, PPB_NETWORKLIST_INTERFACE_1_0, PPB_NetworkList_1_0) -PROXIED_IFACE(NoAPIName, PPB_NETWORKMONITOR_INTERFACE_1_0, - PPB_NetworkMonitor_1_0) -PROXIED_IFACE(NoAPIName, PPB_NETWORKPROXY_INTERFACE_1_0, PPB_NetworkProxy_1_0) -PROXIED_IFACE(NoAPIName, PPB_TCPSOCKET_INTERFACE_1_0, PPB_TCPSocket_1_0) -PROXIED_IFACE(NoAPIName, PPB_TCPSOCKET_INTERFACE_1_1, PPB_TCPSocket_1_1) -PROXIED_IFACE(NoAPIName, PPB_TEXTINPUTCONTROLLER_INTERFACE_1_0, +PROXIED_IFACE(PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_2, + PPB_KeyboardInputEvent_1_2) +PROXIED_IFACE(PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0, PPB_MouseInputEvent_1_0) +PROXIED_IFACE(PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1, PPB_MouseInputEvent_1_1) +PROXIED_IFACE(PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0, PPB_WheelInputEvent_1_0) +PROXIED_IFACE(PPB_TOUCH_INPUT_EVENT_INTERFACE_1_0, PPB_TouchInputEvent_1_0) +PROXIED_IFACE(PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen_1_0) +PROXIED_IFACE(PPB_MEDIASTREAMAUDIOTRACK_INTERFACE_0_1, + PPB_MediaStreamAudioTrack_0_1) +PROXIED_IFACE(PPB_MEDIASTREAMVIDEOTRACK_INTERFACE_0_1, + PPB_MediaStreamVideoTrack_0_1) +PROXIED_IFACE(PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging_1_0) +PROXIED_IFACE(PPB_MOUSECURSOR_INTERFACE_1_0, PPB_MouseCursor_1_0) +PROXIED_IFACE(PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock_1_0) +PROXIED_IFACE(PPB_NETADDRESS_INTERFACE_1_0, PPB_NetAddress_1_0) +PROXIED_IFACE(PPB_NETWORKLIST_INTERFACE_1_0, PPB_NetworkList_1_0) +PROXIED_IFACE(PPB_NETWORKMONITOR_INTERFACE_1_0, PPB_NetworkMonitor_1_0) +PROXIED_IFACE(PPB_NETWORKPROXY_INTERFACE_1_0, PPB_NetworkProxy_1_0) +PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_0, PPB_TCPSocket_1_0) +PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_1, PPB_TCPSocket_1_1) +PROXIED_IFACE(PPB_TEXTINPUTCONTROLLER_INTERFACE_1_0, PPB_TextInputController_1_0) -PROXIED_IFACE(NoAPIName, PPB_UDPSOCKET_INTERFACE_1_0, PPB_UDPSocket_1_0) -PROXIED_IFACE(NoAPIName, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader_1_0) -PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0, - PPB_URLRequestInfo_1_0) -PROXIED_IFACE(NoAPIName, PPB_URLRESPONSEINFO_INTERFACE_1_0, - PPB_URLResponseInfo_1_0) -PROXIED_IFACE(NoAPIName, PPB_VAR_ARRAY_INTERFACE_1_0, PPB_VarArray_1_0) -PROXIED_IFACE(NoAPIName, PPB_VAR_DICTIONARY_INTERFACE_1_0, - PPB_VarDictionary_1_0) -PROXIED_IFACE(NoAPIName, PPB_WEBSOCKET_INTERFACE_1_0, PPB_WebSocket_1_0) +PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_0, PPB_UDPSocket_1_0) +PROXIED_IFACE(PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader_1_0) +PROXIED_IFACE(PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo_1_0) +PROXIED_IFACE(PPB_URLRESPONSEINFO_INTERFACE_1_0, PPB_URLResponseInfo_1_0) +PROXIED_IFACE(PPB_VAR_ARRAY_INTERFACE_1_0, PPB_VarArray_1_0) +PROXIED_IFACE(PPB_VAR_DICTIONARY_INTERFACE_1_0, PPB_VarDictionary_1_0) +PROXIED_IFACE(PPB_VIDEOFRAME_INTERFACE_0_1, PPB_VideoFrame_0_1) +PROXIED_IFACE(PPB_WEBSOCKET_INTERFACE_1_0, PPB_WebSocket_1_0) // Note: PPB_Var and PPB_VarArrayBuffer are special and registered manually. -PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_0, PPB_View_1_0) -PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_1, PPB_View_1_1) +PROXIED_IFACE(PPB_VIEW_INTERFACE_1_0, PPB_View_1_0) +PROXIED_IFACE(PPB_VIEW_INTERFACE_1_1, PPB_View_1_1) +PROXIED_IFACE(PPB_VIEW_INTERFACE_1_2, PPB_View_1_2) // This has no corresponding _Proxy object since it does no IPC. -PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig_1_0) -PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_1, PPB_AudioConfig_1_1) +PROXIED_IFACE(PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig_1_0) +PROXIED_IFACE(PPB_AUDIO_CONFIG_INTERFACE_1_1, PPB_AudioConfig_1_1) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/chromium/ppapi/thunk/interfaces_preamble.h b/chromium/ppapi/thunk/interfaces_preamble.h index 7fe1d77bbf8..beaa357055c 100644 --- a/chromium/ppapi/thunk/interfaces_preamble.h +++ b/chromium/ppapi/thunk/interfaces_preamble.h @@ -15,17 +15,7 @@ #define UNDEFINE_PROXIED_API #endif -#ifndef UNPROXIED_API -#define UNPROXIED_API(api_name) -#define UNDEFINE_UNPROXIED_API -#endif - #ifndef PROXIED_IFACE -#define PROXIED_IFACE(api_name, iface_str, iface_struct) +#define PROXIED_IFACE(iface_str, iface_struct) #define UNDEFINE_PROXIED_IFACE #endif - -#ifndef UNPROXIED_IFACE -#define UNPROXIED_IFACE(api_name, iface_str, iface_struct) -#define UNDEFINE_UNPROXIED_IFACE -#endif diff --git a/chromium/ppapi/thunk/ppb_alarms_dev_thunk.cc b/chromium/ppapi/thunk/ppb_alarms_dev_thunk.cc deleted file mode 100644 index 2d2ae14b89f..00000000000 --- a/chromium/ppapi/thunk/ppb_alarms_dev_thunk.cc +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/logging.h" -#include "ppapi/c/dev/ppb_alarms_dev.h" -#include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/extensions_common_api.h" -#include "ppapi/thunk/thunk.h" - -namespace ppapi { -namespace thunk { - -namespace { - -// TODO(yzshen): crbug.com/327197 Implement the thunk. - -void Create(PP_Instance instance, - PP_Var name, - const PP_Alarms_AlarmCreateInfo_Dev* alarm_info) { - NOTIMPLEMENTED(); -} - -int32_t Get(PP_Instance instance, - PP_Var name, - PP_Alarms_Alarm_Dev* alarm, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - NOTIMPLEMENTED(); - - return enter.SetResult(PP_ERROR_FAILED); -} - -int32_t GetAll(PP_Instance instance, - PP_Alarms_Alarm_Array_Dev* alarms, - PP_ArrayOutput array_allocator, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - NOTIMPLEMENTED(); - - return enter.SetResult(PP_ERROR_FAILED); -} - -void Clear(PP_Instance instance, PP_Var name) { - NOTIMPLEMENTED(); -} - -void ClearAll(PP_Instance instance) { - NOTIMPLEMENTED(); -} - -uint32_t AddOnAlarmListener(PP_Instance instance, - PP_Alarms_OnAlarm_Dev callback, - void* user_data) { - NOTIMPLEMENTED(); - return 0; -} - -const PPB_Alarms_Dev_0_1 g_ppb_alarms_dev_0_1_thunk = { - &Create, - &Get, - &GetAll, - &Clear, - &ClearAll, - &AddOnAlarmListener -}; - -} // namespace - -const PPB_Alarms_Dev_0_1* GetPPB_Alarms_Dev_0_1_Thunk() { - return &g_ppb_alarms_dev_0_1_thunk; -} - -} // namespace thunk -} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_audio_buffer_api.h b/chromium/ppapi/thunk/ppb_audio_buffer_api.h new file mode 100644 index 00000000000..7c37e65851c --- /dev/null +++ b/chromium/ppapi/thunk/ppb_audio_buffer_api.h @@ -0,0 +1,38 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_AUDIO_BUFFER_API_H_ +#define PPAPI_THUNK_PPB_AUDIO_BUFFER_API_H_ + +#include "ppapi/c/ppb_audio_buffer.h" +#include "ppapi/thunk/ppapi_thunk_export.h" + +namespace ppapi { + +union MediaStreamBuffer; + +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_AudioBuffer_API { + public: + virtual ~PPB_AudioBuffer_API() {} + virtual PP_TimeDelta GetTimestamp() = 0; + virtual void SetTimestamp(PP_TimeDelta timestamp) = 0; + virtual PP_AudioBuffer_SampleRate GetSampleRate() = 0; + virtual PP_AudioBuffer_SampleSize GetSampleSize() = 0; + virtual uint32_t GetNumberOfChannels() = 0; + virtual uint32_t GetNumberOfSamples() = 0; + virtual void* GetDataBuffer() = 0; + virtual uint32_t GetDataBufferSize() = 0; + + // Methods used by Pepper internal implementation only. + virtual MediaStreamBuffer* GetBuffer() = 0; + virtual int32_t GetBufferIndex() = 0; + virtual void Invalidate() = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_AUDIO_BUFFER_API_H_ diff --git a/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc b/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc new file mode 100644 index 00000000000..d87d5b0780a --- /dev/null +++ b/chromium/ppapi/thunk/ppb_audio_buffer_thunk.cc @@ -0,0 +1,108 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_audio_buffer.idl modified Thu Feb 6 15:31:48 2014. + +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_audio_buffer.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_audio_buffer_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Bool IsAudioBuffer(PP_Resource resource) { + VLOG(4) << "PPB_AudioBuffer::IsAudioBuffer()"; + EnterResource<PPB_AudioBuffer_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +PP_TimeDelta GetTimestamp(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetTimestamp()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return 0.0; + return enter.object()->GetTimestamp(); +} + +void SetTimestamp(PP_Resource buffer, PP_TimeDelta timestamp) { + VLOG(4) << "PPB_AudioBuffer::SetTimestamp()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return; + enter.object()->SetTimestamp(timestamp); +} + +PP_AudioBuffer_SampleRate GetSampleRate(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetSampleRate()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return PP_AUDIOBUFFER_SAMPLERATE_UNKNOWN; + return enter.object()->GetSampleRate(); +} + +PP_AudioBuffer_SampleSize GetSampleSize(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetSampleSize()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return PP_AUDIOBUFFER_SAMPLESIZE_UNKNOWN; + return enter.object()->GetSampleSize(); +} + +uint32_t GetNumberOfChannels(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetNumberOfChannels()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return 0; + return enter.object()->GetNumberOfChannels(); +} + +uint32_t GetNumberOfSamples(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetNumberOfSamples()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return 0; + return enter.object()->GetNumberOfSamples(); +} + +void* GetDataBuffer(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetDataBuffer()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return NULL; + return enter.object()->GetDataBuffer(); +} + +uint32_t GetDataBufferSize(PP_Resource buffer) { + VLOG(4) << "PPB_AudioBuffer::GetDataBufferSize()"; + EnterResource<PPB_AudioBuffer_API> enter(buffer, true); + if (enter.failed()) + return 0; + return enter.object()->GetDataBufferSize(); +} + +const PPB_AudioBuffer_0_1 g_ppb_audiobuffer_thunk_0_1 = { + &IsAudioBuffer, + &GetTimestamp, + &SetTimestamp, + &GetSampleRate, + &GetSampleSize, + &GetNumberOfChannels, + &GetNumberOfSamples, + &GetDataBuffer, + &GetDataBufferSize +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_AudioBuffer_0_1* GetPPB_AudioBuffer_0_1_Thunk() { + return &g_ppb_audiobuffer_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_audio_input_api.h b/chromium/ppapi/thunk/ppb_audio_input_api.h index 60fc881d8a8..706417ee0fd 100644 --- a/chromium/ppapi/thunk/ppb_audio_input_api.h +++ b/chromium/ppapi/thunk/ppb_audio_input_api.h @@ -20,16 +20,13 @@ class PPB_AudioInput_API { public: virtual ~PPB_AudioInput_API() {} - virtual int32_t EnumerateDevices0_2( - PP_Resource* devices, - scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t EnumerateDevices(const PP_ArrayOutput& output, scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t MonitorDeviceChange(PP_MonitorDeviceChangeCallback callback, void* user_data) = 0; - virtual int32_t Open0_2(PP_Resource device_ref, + virtual int32_t Open0_3(PP_Resource device_ref, PP_Resource config, - PPB_AudioInput_Callback_0_2 audio_input_callback_0_2, + PPB_AudioInput_Callback_0_3 audio_input_callback_0_3, void* user_data, scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t Open(PP_Resource device_ref, diff --git a/chromium/ppapi/thunk/ppb_audio_input_dev_thunk.cc b/chromium/ppapi/thunk/ppb_audio_input_dev_thunk.cc index ee38c7ad9fe..7d44a030787 100644 --- a/chromium/ppapi/thunk/ppb_audio_input_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_audio_input_dev_thunk.cc @@ -31,18 +31,6 @@ PP_Bool IsAudioInput(PP_Resource resource) { return PP_FromBool(enter.succeeded()); } -int32_t EnumerateDevices_0_2(PP_Resource audio_input, - PP_Resource* devices, - struct PP_CompletionCallback callback) { - VLOG(4) << "PPB_AudioInput_Dev::EnumerateDevices()"; - EnterResource<PPB_AudioInput_API> enter(audio_input, callback, true); - if (enter.failed()) - return enter.retval(); - return enter.SetResult(enter.object()->EnumerateDevices0_2( - devices, - enter.callback())); -} - int32_t EnumerateDevices(PP_Resource audio_input, struct PP_ArrayOutput output, struct PP_CompletionCallback callback) { @@ -64,17 +52,17 @@ int32_t MonitorDeviceChange(PP_Resource audio_input, return enter.object()->MonitorDeviceChange(callback, user_data); } -int32_t Open_0_2(PP_Resource audio_input, +int32_t Open_0_3(PP_Resource audio_input, PP_Resource device_ref, PP_Resource config, - PPB_AudioInput_Callback_0_2 audio_input_callback, + PPB_AudioInput_Callback_0_3 audio_input_callback, void* user_data, struct PP_CompletionCallback callback) { VLOG(4) << "PPB_AudioInput_Dev::Open()"; EnterResource<PPB_AudioInput_API> enter(audio_input, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->Open0_2(device_ref, + return enter.SetResult(enter.object()->Open0_3(device_ref, config, audio_input_callback, user_data, @@ -130,23 +118,12 @@ void Close(PP_Resource audio_input) { enter.object()->Close(); } -const PPB_AudioInput_Dev_0_2 g_ppb_audioinput_dev_thunk_0_2 = { - &Create, - &IsAudioInput, - &EnumerateDevices_0_2, - &Open_0_2, - &GetCurrentConfig, - &StartCapture, - &StopCapture, - &Close -}; - const PPB_AudioInput_Dev_0_3 g_ppb_audioinput_dev_thunk_0_3 = { &Create, &IsAudioInput, &EnumerateDevices, &MonitorDeviceChange, - &Open_0_2, + &Open_0_3, &GetCurrentConfig, &StartCapture, &StopCapture, @@ -167,10 +144,6 @@ const PPB_AudioInput_Dev_0_4 g_ppb_audioinput_dev_thunk_0_4 = { } // namespace -const PPB_AudioInput_Dev_0_2* GetPPB_AudioInput_Dev_0_2_Thunk() { - return &g_ppb_audioinput_dev_thunk_0_2; -} - const PPB_AudioInput_Dev_0_3* GetPPB_AudioInput_Dev_0_3_Thunk() { return &g_ppb_audioinput_dev_thunk_0_3; } diff --git a/chromium/ppapi/thunk/ppb_compositor_api.h b/chromium/ppapi/thunk/ppb_compositor_api.h new file mode 100644 index 00000000000..78a40ff6394 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_compositor_api.h @@ -0,0 +1,27 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_COMPOSITOR_API_H_ +#define PPAPI_THUNK_PPB_COMPOSITOR_API_H_ + +#include "base/memory/ref_counted.h" +#include "ppapi/c/ppb_compositor.h" +#include "ppapi/shared_impl/tracked_callback.h" + +namespace ppapi { +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_Compositor_API { + public: + virtual ~PPB_Compositor_API() {} + virtual PP_Resource AddLayer() = 0; + virtual int32_t CommitLayers( + const scoped_refptr<ppapi::TrackedCallback>& callback) = 0; + virtual int32_t ResetLayers() = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_COMPOSITOR_API_H_ diff --git a/chromium/ppapi/thunk/ppb_compositor_layer_api.h b/chromium/ppapi/thunk/ppb_compositor_layer_api.h new file mode 100644 index 00000000000..e59f6325c42 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_compositor_layer_api.h @@ -0,0 +1,43 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_COMPOSITOR_LAYER_API_H_ +#define PPAPI_THUNK_PPB_COMPOSITOR_LAYER_API_H_ + +#include "base/memory/ref_counted.h" +#include "ppapi/c/ppb_compositor_layer.h" +#include "ppapi/shared_impl/tracked_callback.h" + +namespace ppapi { +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_CompositorLayer_API { + public: + virtual ~PPB_CompositorLayer_API() {} + virtual int32_t SetColor(float red, + float green, + float blue, + float alpha, + const PP_Size* size) = 0; + virtual int32_t SetTexture( + PP_Resource context, + uint32_t texture, + const PP_Size* size, + const scoped_refptr<ppapi::TrackedCallback>& callback) = 0; + virtual int32_t SetImage( + PP_Resource image_data, + const PP_Size* size, + const scoped_refptr<ppapi::TrackedCallback>& callback) = 0; + virtual int32_t SetClipRect(const PP_Rect* rects) = 0; + virtual int32_t SetTransform(const float matrix[16]) = 0; + virtual int32_t SetOpacity(float opacity) = 0; + virtual int32_t SetBlendMode(PP_BlendMode mode) = 0; + virtual int32_t SetSourceRect(const PP_FloatRect* rect) = 0; + virtual int32_t SetPremultipliedAlpha(PP_Bool premult) = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_COMPOSITOR_API_H_ diff --git a/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc b/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc new file mode 100644 index 00000000000..4923feab600 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_compositor_layer_thunk.cc @@ -0,0 +1,136 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_compositor_layer.idl modified Wed Jun 4 11:17:54 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_compositor_layer.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_compositor_layer_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Bool IsCompositorLayer(PP_Resource resource) { + VLOG(4) << "PPB_CompositorLayer::IsCompositorLayer()"; + EnterResource<PPB_CompositorLayer_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +int32_t SetColor(PP_Resource layer, + float red, + float green, + float blue, + float alpha, + const struct PP_Size* size) { + VLOG(4) << "PPB_CompositorLayer::SetColor()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetColor(red, green, blue, alpha, size); +} + +int32_t SetTexture(PP_Resource layer, + PP_Resource context, + uint32_t texture, + const struct PP_Size* size, + struct PP_CompletionCallback cc) { + VLOG(4) << "PPB_CompositorLayer::SetTexture()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, cc, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->SetTexture(context, + texture, + size, + enter.callback())); +} + +int32_t SetImage(PP_Resource layer, + PP_Resource image_data, + const struct PP_Size* size, + struct PP_CompletionCallback cc) { + VLOG(4) << "PPB_CompositorLayer::SetImage()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, cc, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->SetImage(image_data, + size, + enter.callback())); +} + +int32_t SetClipRect(PP_Resource layer, const struct PP_Rect* rect) { + VLOG(4) << "PPB_CompositorLayer::SetClipRect()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetClipRect(rect); +} + +int32_t SetTransform(PP_Resource layer, const float matrix[16]) { + VLOG(4) << "PPB_CompositorLayer::SetTransform()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetTransform(matrix); +} + +int32_t SetOpacity(PP_Resource layer, float opacity) { + VLOG(4) << "PPB_CompositorLayer::SetOpacity()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetOpacity(opacity); +} + +int32_t SetBlendMode(PP_Resource layer, PP_BlendMode mode) { + VLOG(4) << "PPB_CompositorLayer::SetBlendMode()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetBlendMode(mode); +} + +int32_t SetSourceRect(PP_Resource layer, const struct PP_FloatRect* rect) { + VLOG(4) << "PPB_CompositorLayer::SetSourceRect()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetSourceRect(rect); +} + +int32_t SetPremultipliedAlpha(PP_Resource layer, PP_Bool premult) { + VLOG(4) << "PPB_CompositorLayer::SetPremultipliedAlpha()"; + EnterResource<PPB_CompositorLayer_API> enter(layer, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->SetPremultipliedAlpha(premult); +} + +const PPB_CompositorLayer_0_1 g_ppb_compositorlayer_thunk_0_1 = { + &IsCompositorLayer, + &SetColor, + &SetTexture, + &SetImage, + &SetClipRect, + &SetTransform, + &SetOpacity, + &SetBlendMode, + &SetSourceRect, + &SetPremultipliedAlpha +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_CompositorLayer_0_1* + GetPPB_CompositorLayer_0_1_Thunk() { + return &g_ppb_compositorlayer_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_compositor_thunk.cc b/chromium/ppapi/thunk/ppb_compositor_thunk.cc new file mode 100644 index 00000000000..682b42d5c39 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_compositor_thunk.cc @@ -0,0 +1,73 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_compositor.idl modified Thu May 15 17:40:43 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_compositor.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_compositor_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Bool IsCompositor(PP_Resource resource) { + VLOG(4) << "PPB_Compositor::IsCompositor()"; + EnterResource<PPB_Compositor_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +PP_Resource Create(PP_Instance instance) { + VLOG(4) << "PPB_Compositor::Create()"; + EnterResourceCreation enter(instance); + if (enter.failed()) + return 0; + return enter.functions()->CreateCompositor(instance); +} + +PP_Resource AddLayer(PP_Resource compositor) { + VLOG(4) << "PPB_Compositor::AddLayer()"; + EnterResource<PPB_Compositor_API> enter(compositor, true); + if (enter.failed()) + return 0; + return enter.object()->AddLayer(); +} + +int32_t CommitLayers(PP_Resource compositor, struct PP_CompletionCallback cc) { + VLOG(4) << "PPB_Compositor::CommitLayers()"; + EnterResource<PPB_Compositor_API> enter(compositor, cc, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->CommitLayers(enter.callback())); +} + +int32_t ResetLayers(PP_Resource compositor) { + VLOG(4) << "PPB_Compositor::ResetLayers()"; + EnterResource<PPB_Compositor_API> enter(compositor, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->ResetLayers(); +} + +const PPB_Compositor_0_1 g_ppb_compositor_thunk_0_1 = { + &IsCompositor, + &Create, + &AddLayer, + &CommitLayers, + &ResetLayers +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_Compositor_0_1* GetPPB_Compositor_0_1_Thunk() { + return &g_ppb_compositor_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_console_thunk.cc b/chromium/ppapi/thunk/ppb_console_thunk.cc index 80b115c0608..65c992bbf14 100644 --- a/chromium/ppapi/thunk/ppb_console_thunk.cc +++ b/chromium/ppapi/thunk/ppb_console_thunk.cc @@ -2,15 +2,13 @@ // 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 Tue Apr 16 11:25:44 2013. +// From ppb_console.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_console.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -43,7 +41,7 @@ const PPB_Console_1_0 g_ppb_console_thunk_1_0 = { } // namespace -const PPB_Console_1_0* GetPPB_Console_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Console_1_0* GetPPB_Console_1_0_Thunk() { return &g_ppb_console_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc index e434f4f7226..19bbd18705a 100644 --- a/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc @@ -3,33 +3,57 @@ // found in the LICENSE file. // From private/ppb_content_decryptor_private.idl, -// modified Fri Dec 6 12:16:22 2013. +// modified Thu Jun 5 13:39:15 2014. #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_content_decryptor_private.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { namespace { -void SessionCreated(PP_Instance instance, - uint32_t session_id, - struct PP_Var web_session_id) { - VLOG(4) << "PPB_ContentDecryptor_Private::SessionCreated()"; +void PromiseResolved(PP_Instance instance, uint32_t promise_id) { + VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolved()"; EnterInstance enter(instance); if (enter.failed()) return; - enter.functions()->SessionCreated(instance, session_id, web_session_id); + enter.functions()->PromiseResolved(instance, promise_id); +} + +void PromiseResolvedWithSession(PP_Instance instance, + uint32_t promise_id, + struct PP_Var web_session_id) { + VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolvedWithSession()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->PromiseResolvedWithSession(instance, + promise_id, + web_session_id); +} + +void PromiseRejected(PP_Instance instance, + uint32_t promise_id, + PP_CdmExceptionCode exception_code, + uint32_t system_code, + struct PP_Var error_description) { + VLOG(4) << "PPB_ContentDecryptor_Private::PromiseRejected()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->PromiseRejected(instance, + promise_id, + exception_code, + system_code, + error_description); } void SessionMessage(PP_Instance instance, - uint32_t session_id, + struct PP_Var web_session_id, struct PP_Var message, struct PP_Var destination_url) { VLOG(4) << "PPB_ContentDecryptor_Private::SessionMessage()"; @@ -37,39 +61,41 @@ void SessionMessage(PP_Instance instance, if (enter.failed()) return; enter.functions()->SessionMessage(instance, - session_id, + web_session_id, message, destination_url); } -void SessionReady(PP_Instance instance, uint32_t session_id) { +void SessionReady(PP_Instance instance, struct PP_Var web_session_id) { VLOG(4) << "PPB_ContentDecryptor_Private::SessionReady()"; EnterInstance enter(instance); if (enter.failed()) return; - enter.functions()->SessionReady(instance, session_id); + enter.functions()->SessionReady(instance, web_session_id); } -void SessionClosed(PP_Instance instance, uint32_t session_id) { +void SessionClosed(PP_Instance instance, struct PP_Var web_session_id) { VLOG(4) << "PPB_ContentDecryptor_Private::SessionClosed()"; EnterInstance enter(instance); if (enter.failed()) return; - enter.functions()->SessionClosed(instance, session_id); + enter.functions()->SessionClosed(instance, web_session_id); } void SessionError(PP_Instance instance, - uint32_t session_id, - int32_t media_error, - int32_t system_code) { + struct PP_Var web_session_id, + PP_CdmExceptionCode exception_code, + uint32_t system_code, + struct PP_Var error_description) { VLOG(4) << "PPB_ContentDecryptor_Private::SessionError()"; EnterInstance enter(instance); if (enter.failed()) return; enter.functions()->SessionError(instance, - session_id, - media_error, - system_code); + web_session_id, + exception_code, + system_code, + error_description); } void DeliverBlock(PP_Instance instance, @@ -145,9 +171,11 @@ void DeliverSamples( decrypted_sample_info); } -const PPB_ContentDecryptor_Private_0_9 - g_ppb_contentdecryptor_private_thunk_0_9 = { - &SessionCreated, +const PPB_ContentDecryptor_Private_0_12 + g_ppb_contentdecryptor_private_thunk_0_12 = { + &PromiseResolved, + &PromiseResolvedWithSession, + &PromiseRejected, &SessionMessage, &SessionReady, &SessionClosed, @@ -162,9 +190,9 @@ const PPB_ContentDecryptor_Private_0_9 } // namespace -const PPB_ContentDecryptor_Private_0_9* - GetPPB_ContentDecryptor_Private_0_9_Thunk() { - return &g_ppb_contentdecryptor_private_thunk_0_9; +PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_12* + GetPPB_ContentDecryptor_Private_0_12_Thunk() { + return &g_ppb_contentdecryptor_private_thunk_0_12; } } // namespace thunk diff --git a/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc b/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc index 9045cd84410..eb87093b530 100644 --- a/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_device_ref_dev_thunk.cc @@ -2,16 +2,14 @@ // 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 Thu Dec 20 13:10:26 2012. +// From dev/ppb_device_ref_dev.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/dev/ppb_device_ref_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_device_ref_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -48,7 +46,8 @@ const PPB_DeviceRef_Dev_0_1 g_ppb_deviceref_dev_thunk_0_1 = { } // namespace -const PPB_DeviceRef_Dev_0_1* GetPPB_DeviceRef_Dev_0_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_DeviceRef_Dev_0_1* + GetPPB_DeviceRef_Dev_0_1_Thunk() { return &g_ppb_deviceref_dev_thunk_0_1; } diff --git a/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc b/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc new file mode 100644 index 00000000000..6b14347c5fa --- /dev/null +++ b/chromium/ppapi/thunk/ppb_display_color_profile_private_thunk.cc @@ -0,0 +1,78 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From private/ppb_display_color_profile_private.idl, +// modified Tue Feb 18 18:03:36 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/private/ppb_display_color_profile_private.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_display_color_profile_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Resource Create(PP_Instance instance) { + VLOG(4) << "PPB_DisplayColorProfile_Private::Create()"; + EnterResourceCreation enter(instance); + if (enter.failed()) + return 0; + return enter.functions()->CreateDisplayColorProfilePrivate(instance); +} + +PP_Bool IsDisplayColorProfile(PP_Resource resource) { + VLOG(4) << "PPB_DisplayColorProfile_Private::IsDisplayColorProfile()"; + EnterResource<PPB_DisplayColorProfile_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +int32_t GetColorProfile(PP_Resource display_color_profile_res, + struct PP_ArrayOutput color_profile, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_DisplayColorProfile_Private::GetColorProfile()"; + EnterResource<PPB_DisplayColorProfile_API> enter(display_color_profile_res, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->GetColorProfile(color_profile, + enter.callback())); +} + +int32_t RegisterColorProfileChangeCallback( + PP_Resource display_color_profile_res, + struct PP_CompletionCallback callback) { + VLOG(4) << + "PPB_DisplayColorProfile_Private::RegisterColorProfileChangeCallback()"; + EnterResource<PPB_DisplayColorProfile_API> enter(display_color_profile_res, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->RegisterColorProfileChangeCallback( + enter.callback())); +} + +const PPB_DisplayColorProfile_Private_0_1 + g_ppb_displaycolorprofile_private_thunk_0_1 = { + &Create, + &IsDisplayColorProfile, + &GetColorProfile, + &RegisterColorProfileChangeCallback +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_DisplayColorProfile_Private_0_1* + GetPPB_DisplayColorProfile_Private_0_1_Thunk() { + return &g_ppb_displaycolorprofile_private_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_ext_socket_thunk.cc b/chromium/ppapi/thunk/ppb_ext_socket_thunk.cc deleted file mode 100644 index e0afd66e27e..00000000000 --- a/chromium/ppapi/thunk/ppb_ext_socket_thunk.cc +++ /dev/null @@ -1,419 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <vector> - -#include "ppapi/c/extensions/dev/ppb_ext_socket_dev.h" -#include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/extensions_common_api.h" -#include "ppapi/thunk/thunk.h" - -namespace ppapi { -namespace thunk { - -namespace { - -int32_t Create(PP_Instance instance, - PP_Ext_Socket_SocketType_Dev type, - PP_Ext_Socket_CreateOptions_Dev options, - PP_Ext_Socket_CreateInfo_Dev* create_info, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(type); - input_args.push_back(options); - output_args.push_back(create_info); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.create", input_args, output_args, enter.callback())); -} - -void Destroy(PP_Instance instance, PP_Var socket_id) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance); - if (enter.failed()) - return; - - std::vector<PP_Var> args; - args.push_back(socket_id); - enter.functions()->PostBrowser("socket.destroy", args); -} - -int32_t Connect(PP_Instance instance, - PP_Var socket_id, - PP_Var hostname, - PP_Var port, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(hostname); - input_args.push_back(port); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.connect", input_args, output_args, enter.callback())); -} - -int32_t Bind(PP_Instance instance, - PP_Var socket_id, - PP_Var address, - PP_Var port, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(address); - input_args.push_back(port); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.bind", input_args, output_args, enter.callback())); -} - -void Disconnect(PP_Instance instance, PP_Var socket_id) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance); - if (enter.failed()) - return; - - std::vector<PP_Var> args; - args.push_back(socket_id); - enter.functions()->PostBrowser("socket.disconnect", args); -} - -int32_t Read(PP_Instance instance, - PP_Var socket_id, - PP_Var buffer_size, - PP_Ext_Socket_ReadInfo_Dev* read_info, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(buffer_size); - output_args.push_back(read_info); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.read", input_args, output_args, enter.callback())); -} - -int32_t Write(PP_Instance instance, - PP_Var socket_id, - PP_Var data, - PP_Ext_Socket_WriteInfo_Dev* write_info, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(data); - output_args.push_back(write_info); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.write", input_args, output_args, enter.callback())); -} - -int32_t RecvFrom(PP_Instance instance, - PP_Var socket_id, - PP_Var buffer_size, - PP_Ext_Socket_RecvFromInfo_Dev* recv_from_info, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(buffer_size); - output_args.push_back(recv_from_info); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.recvFrom", input_args, output_args, enter.callback())); -} - -int32_t SendTo(PP_Instance instance, - PP_Var socket_id, - PP_Var data, - PP_Var address, - PP_Var port, - PP_Ext_Socket_WriteInfo_Dev* write_info, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(data); - input_args.push_back(address); - input_args.push_back(port); - output_args.push_back(write_info); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.sendTo", input_args, output_args, enter.callback())); -} - -int32_t Listen(PP_Instance instance, - PP_Var socket_id, - PP_Var address, - PP_Var port, - PP_Var backlog, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(address); - input_args.push_back(port); - input_args.push_back(backlog); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.listen", input_args, output_args, enter.callback())); -} - -int32_t Accept(PP_Instance instance, - PP_Var socket_id, - PP_Ext_Socket_AcceptInfo_Dev* accept_info, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - output_args.push_back(accept_info); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.accept", input_args, output_args, enter.callback())); -} - -int32_t SetKeepAlive(PP_Instance instance, - PP_Var socket_id, - PP_Var enable, - PP_Var delay, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(enable); - input_args.push_back(delay); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.setKeepAlive", input_args, output_args, enter.callback())); -} - -int32_t SetNoDelay(PP_Instance instance, - PP_Var socket_id, - PP_Var no_delay, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(no_delay); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.setNoDelay", input_args, output_args, enter.callback())); -} - -int32_t GetInfo(PP_Instance instance, - PP_Var socket_id, - PP_Ext_Socket_SocketInfo_Dev* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.getInfo", input_args, output_args, enter.callback())); -} - -int32_t GetNetworkList(PP_Instance instance, - PP_Ext_Socket_NetworkInterface_Dev_Array* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.getNetworkList", input_args, output_args, enter.callback())); -} - -int32_t JoinGroup(PP_Instance instance, - PP_Var socket_id, - PP_Var address, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(address); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.joinGroup", input_args, output_args, enter.callback())); -} - -int32_t LeaveGroup(PP_Instance instance, - PP_Var socket_id, - PP_Var address, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(address); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.leaveGroup", input_args, output_args, enter.callback())); -} - -int32_t SetMulticastTimeToLive(PP_Instance instance, - PP_Var socket_id, - PP_Var ttl, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(ttl); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.setMulticastTimeToLive", input_args, output_args, - enter.callback())); -} - -int32_t SetMulticastLoopbackMode(PP_Instance instance, - PP_Var socket_id, - PP_Var enabled, - PP_Var* result, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - input_args.push_back(enabled); - output_args.push_back(result); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.setMulticastLoopbackMode", input_args, output_args, - enter.callback())); -} - -int32_t GetJoinedGroups(PP_Instance instance, - PP_Var socket_id, - PP_Var* groups, - PP_CompletionCallback callback) { - EnterInstanceAPI<ExtensionsCommon_API> enter(instance, callback); - if (enter.failed()) - return enter.retval(); - - std::vector<PP_Var> input_args; - std::vector<PP_Var*> output_args; - input_args.push_back(socket_id); - output_args.push_back(groups); - return enter.SetResult(enter.functions()->CallBrowser( - "socket.getJoinedGroups", input_args, output_args, enter.callback())); -} - -const PPB_Ext_Socket_Dev_0_1 g_ppb_ext_socket_dev_0_1_thunk = { - &Create, - &Destroy, - &Connect, - &Bind, - &Disconnect, - &Read, - &Write, - &RecvFrom, - &SendTo, - &Listen, - &Accept, - &SetKeepAlive, - &SetNoDelay, - &GetInfo, - &GetNetworkList -}; - -const PPB_Ext_Socket_Dev_0_2 g_ppb_ext_socket_dev_0_2_thunk = { - &Create, - &Destroy, - &Connect, - &Bind, - &Disconnect, - &Read, - &Write, - &RecvFrom, - &SendTo, - &Listen, - &Accept, - &SetKeepAlive, - &SetNoDelay, - &GetInfo, - &GetNetworkList, - &JoinGroup, - &LeaveGroup, - &SetMulticastTimeToLive, - &SetMulticastLoopbackMode, - &GetJoinedGroups -}; -} // namespace - -const PPB_Ext_Socket_Dev_0_1* GetPPB_Ext_Socket_Dev_0_1_Thunk() { - return &g_ppb_ext_socket_dev_0_1_thunk; -} - -const PPB_Ext_Socket_Dev_0_2* GetPPB_Ext_Socket_Dev_0_2_Thunk() { - return &g_ppb_ext_socket_dev_0_2_thunk; -} - -} // namespace thunk -} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc b/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc index fe1aa0dbf77..5d8fae07784 100644 --- a/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_chooser_dev_thunk.cc @@ -2,17 +2,15 @@ // 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 Mon Apr 1 08:24:03 2013. +// From dev/ppb_file_chooser_dev.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_file_chooser_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -76,11 +74,13 @@ const PPB_FileChooser_Dev_0_6 g_ppb_filechooser_dev_thunk_0_6 = { } // namespace -const PPB_FileChooser_Dev_0_5* GetPPB_FileChooser_Dev_0_5_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileChooser_Dev_0_5* + GetPPB_FileChooser_Dev_0_5_Thunk() { return &g_ppb_filechooser_dev_thunk_0_5; } -const PPB_FileChooser_Dev_0_6* GetPPB_FileChooser_Dev_0_6_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileChooser_Dev_0_6* + GetPPB_FileChooser_Dev_0_6_Thunk() { return &g_ppb_filechooser_dev_thunk_0_6; } diff --git a/chromium/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc b/chromium/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc index 552bee08f8f..e3b790b73a9 100644 --- a/chromium/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc @@ -3,17 +3,15 @@ // found in the LICENSE file. // From trusted/ppb_file_chooser_trusted.idl, -// modified Mon Apr 1 08:24:03 2013. +// modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_file_chooser_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -60,11 +58,13 @@ const PPB_FileChooserTrusted_0_6 g_ppb_filechoosertrusted_thunk_0_6 = { } // namespace -const PPB_FileChooserTrusted_0_5* GetPPB_FileChooserTrusted_0_5_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_5* + GetPPB_FileChooserTrusted_0_5_Thunk() { return &g_ppb_filechoosertrusted_thunk_0_5; } -const PPB_FileChooserTrusted_0_6* GetPPB_FileChooserTrusted_0_6_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_6* + GetPPB_FileChooserTrusted_0_6_Thunk() { return &g_ppb_filechoosertrusted_thunk_0_6; } diff --git a/chromium/ppapi/thunk/ppb_file_io_api.h b/chromium/ppapi/thunk/ppb_file_io_api.h index b794f1ca80b..c1e78d4c55f 100644 --- a/chromium/ppapi/thunk/ppb_file_io_api.h +++ b/chromium/ppapi/thunk/ppb_file_io_api.h @@ -42,6 +42,10 @@ class PPAPI_THUNK_EXPORT PPB_FileIO_API { scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t SetLength(int64_t length, scoped_refptr<TrackedCallback> callback) = 0; + virtual int64_t GetMaxWrittenOffset() const = 0; + virtual int64_t GetAppendModeWriteAmount() const = 0; + virtual void SetMaxWrittenOffset(int64_t max_written_offset) = 0; + virtual void SetAppendModeWriteAmount(int64_t append_mode_write_amount) = 0; virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) = 0; virtual void Close() = 0; diff --git a/chromium/ppapi/thunk/ppb_file_io_thunk.cc b/chromium/ppapi/thunk/ppb_file_io_thunk.cc index 331d190ca81..9e5c6e8fed2 100644 --- a/chromium/ppapi/thunk/ppb_file_io_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_io_thunk.cc @@ -2,17 +2,15 @@ // 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 Tue Apr 16 11:25:44 2013. +// From ppb_file_io.idl modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_file_io_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -169,11 +167,11 @@ const PPB_FileIO_1_1 g_ppb_fileio_thunk_1_1 = { } // namespace -const PPB_FileIO_1_0* GetPPB_FileIO_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileIO_1_0* GetPPB_FileIO_1_0_Thunk() { return &g_ppb_fileio_thunk_1_0; } -const PPB_FileIO_1_1* GetPPB_FileIO_1_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileIO_1_1* GetPPB_FileIO_1_1_Thunk() { return &g_ppb_fileio_thunk_1_1; } diff --git a/chromium/ppapi/thunk/ppb_file_mapping_api.h b/chromium/ppapi/thunk/ppb_file_mapping_api.h new file mode 100644 index 00000000000..530d04b61af --- /dev/null +++ b/chromium/ppapi/thunk/ppb_file_mapping_api.h @@ -0,0 +1,46 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_FILE_MAPPING_API_H_ +#define PPAPI_THUNK_PPB_FILE_MAPPING_API_H_ + +#include "base/basictypes.h" +#include "base/memory/ref_counted.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/ppb_file_mapping.h" +#include "ppapi/shared_impl/singleton_resource_id.h" +#include "ppapi/thunk/ppapi_thunk_export.h" + +namespace ppapi { + +class TrackedCallback; + +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_FileMapping_API { + public: + virtual ~PPB_FileMapping_API() {} + + virtual int32_t Map(PP_Instance instance, + PP_Resource file_io, + int64_t length, + uint32_t map_protection, + uint32_t map_flags, + int64_t offset, + void** address, + scoped_refptr<TrackedCallback> callback) = 0; + virtual int32_t Unmap(PP_Instance instance, + const void* address, + int64_t length, + scoped_refptr<TrackedCallback> callback) = 0; + virtual int64_t GetMapPageSize(PP_Instance instance) = 0; + + static const SingletonResourceID kSingletonResourceID = + FILE_MAPPING_SINGLETON_ID; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_FILE_MAPPING_API_H_ diff --git a/chromium/ppapi/thunk/ppb_file_mapping_thunk.cc b/chromium/ppapi/thunk/ppb_file_mapping_thunk.cc new file mode 100644 index 00000000000..bdf29ca06e8 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_file_mapping_thunk.cc @@ -0,0 +1,77 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_file_mapping.idl modified Mon Jan 27 11:00:43 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_file_mapping.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_file_mapping_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +int32_t Map(PP_Instance instance, + PP_Resource file_io, + int64_t length, + uint32_t map_protection, + uint32_t map_flags, + int64_t offset, + void** address, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_FileMapping::Map()"; + EnterInstanceAPI<PPB_FileMapping_API> enter(instance, callback); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.functions()->Map(instance, + file_io, + length, + map_protection, + map_flags, + offset, + address, + enter.callback())); +} + +int32_t Unmap(PP_Instance instance, + const void* address, + int64_t length, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_FileMapping::Unmap()"; + EnterInstanceAPI<PPB_FileMapping_API> enter(instance, callback); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.functions()->Unmap(instance, + address, + length, + enter.callback())); +} + +int64_t GetMapPageSize(PP_Instance instance) { + VLOG(4) << "PPB_FileMapping::GetMapPageSize()"; + EnterInstanceAPI<PPB_FileMapping_API> enter(instance); + if (enter.failed()) + return 0; + return enter.functions()->GetMapPageSize(instance); +} + +const PPB_FileMapping_0_1 g_ppb_filemapping_thunk_0_1 = { + &Map, + &Unmap, + &GetMapPageSize +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_FileMapping_0_1* GetPPB_FileMapping_0_1_Thunk() { + return &g_ppb_filemapping_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_file_ref_api.h b/chromium/ppapi/thunk/ppb_file_ref_api.h index b473ae28721..2a27af5e8cd 100644 --- a/chromium/ppapi/thunk/ppb_file_ref_api.h +++ b/chromium/ppapi/thunk/ppb_file_ref_api.h @@ -28,7 +28,7 @@ class PPAPI_THUNK_EXPORT PPB_FileRef_API { virtual PP_Var GetName() const = 0; virtual PP_Var GetPath() const = 0; virtual PP_Resource GetParent() = 0; - virtual int32_t MakeDirectory(PP_Bool make_ancestors, + virtual int32_t MakeDirectory(int32_t make_directory_flags, scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t Touch(PP_Time last_access_time, PP_Time last_modified_time, diff --git a/chromium/ppapi/thunk/ppb_file_ref_thunk.cc b/chromium/ppapi/thunk/ppb_file_ref_thunk.cc index 64c90b55dbc..ef31e9227c3 100644 --- a/chromium/ppapi/thunk/ppb_file_ref_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_ref_thunk.cc @@ -87,8 +87,21 @@ int32_t MakeDirectory(PP_Resource directory_ref, EnterFileRef enter(directory_ref, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->MakeDirectory(make_ancestors, - enter.callback())); + int32_t flag = make_ancestors ? PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS + : PP_MAKEDIRECTORYFLAG_NONE; + return enter.SetResult(enter.object()->MakeDirectory( + flag, enter.callback())); +} + +int32_t MakeDirectory_1_2(PP_Resource directory_ref, + int32_t make_directory_flags, + PP_CompletionCallback callback) { + VLOG(4) << "PPB_FileRef::MakeDirectory()"; + EnterFileRef enter(directory_ref, callback, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->MakeDirectory( + make_directory_flags, enter.callback())); } int32_t Touch(PP_Resource file_ref, @@ -180,6 +193,21 @@ const PPB_FileRef_1_1 g_ppb_file_ref_thunk_1_1 = { &ReadDirectoryEntries }; +const PPB_FileRef_1_2 g_ppb_file_ref_thunk_1_2 = { + &Create, + &IsFileRef, + &GetFileSystemType, + &GetName, + &GetPath, + &GetParent, + &MakeDirectory_1_2, + &Touch, + &Delete, + &Rename, + &Query, + &ReadDirectoryEntries +}; + const PPB_FileRefPrivate g_ppb_file_ref_private_thunk = { &GetAbsolutePath }; @@ -194,6 +222,10 @@ const PPB_FileRef_1_1* GetPPB_FileRef_1_1_Thunk() { return &g_ppb_file_ref_thunk_1_1; } +const PPB_FileRef_1_2* GetPPB_FileRef_1_2_Thunk() { + return &g_ppb_file_ref_thunk_1_2; +} + const PPB_FileRefPrivate_0_1* GetPPB_FileRefPrivate_0_1_Thunk() { return &g_ppb_file_ref_private_thunk; } diff --git a/chromium/ppapi/thunk/ppb_file_system_api.h b/chromium/ppapi/thunk/ppb_file_system_api.h index f9524dc0fd0..0351bde4c12 100644 --- a/chromium/ppapi/thunk/ppb_file_system_api.h +++ b/chromium/ppapi/thunk/ppb_file_system_api.h @@ -5,6 +5,7 @@ #ifndef PPAPI_THUNK_PPB_FILE_SYSTEM_API_H_ #define PPAPI_THUNK_PPB_FILE_SYSTEM_API_H_ +#include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "ppapi/c/ppb_file_system.h" @@ -21,6 +22,11 @@ class PPB_FileSystem_API { virtual int32_t Open(int64_t expected_size, scoped_refptr<TrackedCallback> callback) = 0; virtual PP_FileSystemType GetType() = 0; + virtual void OpenQuotaFile(PP_Resource file_io) = 0; + virtual void CloseQuotaFile(PP_Resource file_io) = 0; + typedef base::Callback<void(int64_t)> RequestQuotaCallback; + virtual int64_t RequestQuota(int64_t amount, + const RequestQuotaCallback& callback) = 0; }; } // namespace thunk diff --git a/chromium/ppapi/thunk/ppb_file_system_thunk.cc b/chromium/ppapi/thunk/ppb_file_system_thunk.cc index 8a608ac6293..b6dec411d19 100644 --- a/chromium/ppapi/thunk/ppb_file_system_thunk.cc +++ b/chromium/ppapi/thunk/ppb_file_system_thunk.cc @@ -2,17 +2,15 @@ // 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 Thu Dec 20 13:10:26 2012. +// From ppb_file_system.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_system.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_file_system_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -60,7 +58,7 @@ const PPB_FileSystem_1_0 g_ppb_filesystem_thunk_1_0 = { } // namespace -const PPB_FileSystem_1_0* GetPPB_FileSystem_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_FileSystem_1_0* GetPPB_FileSystem_1_0_Thunk() { return &g_ppb_filesystem_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_find_dev_thunk.cc b/chromium/ppapi/thunk/ppb_find_dev_thunk.cc deleted file mode 100644 index 79a10854563..00000000000 --- a/chromium/ppapi/thunk/ppb_find_dev_thunk.cc +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// From dev/ppb_find_dev.idl modified Tue Apr 16 11:25:44 2013. - -#include "ppapi/c/dev/ppb_find_dev.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" - -namespace ppapi { -namespace thunk { - -namespace { - -void NumberOfFindResultsChanged(PP_Instance instance, - int32_t total, - PP_Bool final_result) { - VLOG(4) << "PPB_Find_Dev::NumberOfFindResultsChanged()"; - EnterInstance enter(instance); - if (enter.failed()) - return; - enter.functions()->NumberOfFindResultsChanged(instance, total, final_result); -} - -void SelectedFindResultChanged(PP_Instance instance, int32_t index) { - VLOG(4) << "PPB_Find_Dev::SelectedFindResultChanged()"; - EnterInstance enter(instance); - if (enter.failed()) - return; - enter.functions()->SelectedFindResultChanged(instance, index); -} - -const PPB_Find_Dev_0_3 g_ppb_find_dev_thunk_0_3 = { - &NumberOfFindResultsChanged, - &SelectedFindResultChanged -}; - -} // namespace - -const PPB_Find_Dev_0_3* GetPPB_Find_Dev_0_3_Thunk() { - return &g_ppb_find_dev_thunk_0_3; -} - -} // namespace thunk -} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_find_private_thunk.cc b/chromium/ppapi/thunk/ppb_find_private_thunk.cc new file mode 100644 index 00000000000..ffa50afbe47 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_find_private_thunk.cc @@ -0,0 +1,69 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From private/ppb_find_private.idl modified Wed Mar 19 13:42:13 2014. + +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/private/ppb_find_private.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" + +namespace ppapi { +namespace thunk { + +namespace { + +void SetPluginToHandleFindRequests(PP_Instance instance) { + VLOG(4) << "PPB_Find_Private::SetPluginToHandleFindRequests()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->SetPluginToHandleFindRequests(instance); +} + +void NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) { + VLOG(4) << "PPB_Find_Private::NumberOfFindResultsChanged()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->NumberOfFindResultsChanged(instance, total, final_result); +} + +void SelectedFindResultChanged(PP_Instance instance, int32_t index) { + VLOG(4) << "PPB_Find_Private::SelectedFindResultChanged()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->SelectedFindResultChanged(instance, index); +} + +void SetTickmarks(PP_Instance instance, + const struct PP_Rect tickmarks[], + uint32_t count) { + VLOG(4) << "PPB_Find_Private::SetTickmarks()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->SetTickmarks(instance, tickmarks, count); +} + +const PPB_Find_Private_0_3 g_ppb_find_private_thunk_0_3 = { + &SetPluginToHandleFindRequests, + &NumberOfFindResultsChanged, + &SelectedFindResultChanged, + &SetTickmarks +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_Find_Private_0_3* + GetPPB_Find_Private_0_3_Thunk() { + return &g_ppb_find_private_thunk_0_3; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_flash_clipboard_api.h b/chromium/ppapi/thunk/ppb_flash_clipboard_api.h index 4be9aeefed8..6d39bbefce5 100644 --- a/chromium/ppapi/thunk/ppb_flash_clipboard_api.h +++ b/chromium/ppapi/thunk/ppb_flash_clipboard_api.h @@ -29,6 +29,10 @@ class PPB_Flash_Clipboard_API { uint32_t data_item_count, const uint32_t formats[], const PP_Var data_items[]) = 0; + virtual PP_Bool GetSequenceNumber( + PP_Instance instance, + PP_Flash_Clipboard_Type clipboard_type, + uint64_t* sequence_number) = 0; static const SingletonResourceID kSingletonResourceID = FLASH_CLIPBOARD_SINGLETON_ID; diff --git a/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc b/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc index 359d78f203f..95e4ba55c81 100644 --- a/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc +++ b/chromium/ppapi/thunk/ppb_flash_clipboard_thunk.cc @@ -77,6 +77,16 @@ int32_t WriteData_4_0(PP_Instance instance, new_formats.get(), data_items); } +PP_Bool GetSequenceNumber(PP_Instance instance, + PP_Flash_Clipboard_Type clipboard_type, + uint64_t* sequence_number) { + EnterInstanceAPI<PPB_Flash_Clipboard_API> enter(instance); + if (enter.failed()) + return PP_FALSE; + return enter.functions()->GetSequenceNumber(instance, clipboard_type, + sequence_number); +} + const PPB_Flash_Clipboard_4_0 g_ppb_flash_clipboard_thunk_4_0 = { &IsFormatAvailable_4_0, &ReadData_4_0, @@ -90,6 +100,14 @@ const PPB_Flash_Clipboard_5_0 g_ppb_flash_clipboard_thunk_5_0 = { &WriteData }; +const PPB_Flash_Clipboard_5_1 g_ppb_flash_clipboard_thunk_5_1 = { + &RegisterCustomFormat, + &IsFormatAvailable, + &ReadData, + &WriteData, + &GetSequenceNumber +}; + } // namespace const PPB_Flash_Clipboard_4_0* GetPPB_Flash_Clipboard_4_0_Thunk() { @@ -100,5 +118,9 @@ const PPB_Flash_Clipboard_5_0* GetPPB_Flash_Clipboard_5_0_Thunk() { return &g_ppb_flash_clipboard_thunk_5_0; } +const PPB_Flash_Clipboard_5_1* GetPPB_Flash_Clipboard_5_1_Thunk() { + return &g_ppb_flash_clipboard_thunk_5_1; +} + } // namespace thunk } // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc b/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc index a7a3cbaa3ce..359a014c3d4 100644 --- a/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc +++ b/chromium/ppapi/thunk/ppb_flash_drm_thunk.cc @@ -2,17 +2,15 @@ // 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 Nov 11 14:49:53 2013. +// From private/ppb_flash_drm.idl modified Tue Dec 3 15:22:00 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_flash_drm_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -84,11 +82,11 @@ const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = { } // namespace -const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() { return &g_ppb_flash_drm_thunk_1_0; } -const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() { return &g_ppb_flash_drm_thunk_1_1; } diff --git a/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc b/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc index 9e07356c918..4be20cab50f 100644 --- a/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc +++ b/chromium/ppapi/thunk/ppb_fullscreen_thunk.cc @@ -2,15 +2,13 @@ // 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 1 09:47:29 2013. +// From ppb_fullscreen.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_fullscreen.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -49,7 +47,7 @@ const PPB_Fullscreen_1_0 g_ppb_fullscreen_thunk_1_0 = { } // namespace -const PPB_Fullscreen_1_0* GetPPB_Fullscreen_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Fullscreen_1_0* GetPPB_Fullscreen_1_0_Thunk() { return &g_ppb_fullscreen_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_gamepad_thunk.cc b/chromium/ppapi/thunk/ppb_gamepad_thunk.cc index e36af344106..8e49e521997 100644 --- a/chromium/ppapi/thunk/ppb_gamepad_thunk.cc +++ b/chromium/ppapi/thunk/ppb_gamepad_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_gamepad.idl modified Wed Apr 17 11:16:00 2013. +// From ppb_gamepad.idl modified Fri Nov 15 14:40:57 2013. #include <string.h> @@ -10,10 +10,8 @@ #include "ppapi/c/ppb_gamepad.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_gamepad_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -36,7 +34,7 @@ const PPB_Gamepad_1_0 g_ppb_gamepad_thunk_1_0 = { } // namespace -const PPB_Gamepad_1_0* GetPPB_Gamepad_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Gamepad_1_0* GetPPB_Gamepad_1_0_Thunk() { return &g_ppb_gamepad_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_graphics_2d_api.h b/chromium/ppapi/thunk/ppb_graphics_2d_api.h index 0709a50ba91..cdb07cce807 100644 --- a/chromium/ppapi/thunk/ppb_graphics_2d_api.h +++ b/chromium/ppapi/thunk/ppb_graphics_2d_api.h @@ -6,7 +6,6 @@ #define PPAPI_THUNK_PPB_GRAPHICS_2D_API_H_ #include "base/memory/ref_counted.h" -#include "ppapi/c/dev/ppb_graphics_2d_dev.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_point.h" @@ -33,12 +32,8 @@ class PPAPI_THUNK_EXPORT PPB_Graphics2D_API { const PP_Point* amount) = 0; virtual void ReplaceContents(PP_Resource image_data) = 0; virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) = 0; - - // Dev interface. virtual PP_Bool SetScale(float scale) = 0; virtual float GetScale() = 0; - virtual void SetOffset(const PP_Point* offset) = 0; - virtual void SetResizeMode(PP_Graphics2D_Dev_ResizeMode resize_mode) = 0; // Test only virtual bool ReadImageData(PP_Resource image, const PP_Point* top_left) = 0; diff --git a/chromium/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc b/chromium/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc deleted file mode 100644 index 288215555bb..00000000000 --- a/chromium/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// From dev/ppb_graphics_2d_dev.idl modified Fri Nov 8 13:58:50 2013. - -#include "ppapi/c/dev/ppb_graphics_2d_dev.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_graphics_2d_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" - -namespace ppapi { -namespace thunk { - -namespace { - -PP_Bool SetScale(PP_Resource resource, float scale) { - VLOG(4) << "PPB_Graphics2D_Dev::SetScale()"; - EnterResource<PPB_Graphics2D_API> enter(resource, true); - if (enter.failed()) - return PP_FALSE; - return enter.object()->SetScale(scale); -} - -float GetScale(PP_Resource resource) { - VLOG(4) << "PPB_Graphics2D_Dev::GetScale()"; - EnterResource<PPB_Graphics2D_API> enter(resource, true); - if (enter.failed()) - return 0.0f; - return enter.object()->GetScale(); -} - -void SetOffset(PP_Resource resource, const struct PP_Point* offset) { - VLOG(4) << "PPB_Graphics2D_Dev::SetOffset()"; - EnterResource<PPB_Graphics2D_API> enter(resource, true); - if (enter.failed()) - return; - enter.object()->SetOffset(offset); -} - -void SetResizeMode(PP_Resource resource, - PP_Graphics2D_Dev_ResizeMode resize_mode) { - VLOG(4) << "PPB_Graphics2D_Dev::SetResizeMode()"; - EnterResource<PPB_Graphics2D_API> enter(resource, true); - if (enter.failed()) - return; - enter.object()->SetResizeMode(resize_mode); -} - -const PPB_Graphics2D_Dev_0_1 g_ppb_graphics2d_dev_thunk_0_1 = { - &SetScale, - &GetScale, - &SetResizeMode -}; - -const PPB_Graphics2D_Dev_0_2 g_ppb_graphics2d_dev_thunk_0_2 = { - &SetScale, - &GetScale, - &SetOffset, - &SetResizeMode -}; - -} // namespace - -const PPB_Graphics2D_Dev_0_1* GetPPB_Graphics2D_Dev_0_1_Thunk() { - return &g_ppb_graphics2d_dev_thunk_0_1; -} - -const PPB_Graphics2D_Dev_0_2* GetPPB_Graphics2D_Dev_0_2_Thunk() { - return &g_ppb_graphics2d_dev_thunk_0_2; -} - -} // namespace thunk -} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_graphics_2d_thunk.cc b/chromium/ppapi/thunk/ppb_graphics_2d_thunk.cc index 9eefee2d303..f4446aaa7b2 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 Fri Apr 26 08:49:08 2013. +// From ppb_graphics_2d.idl modified Tue Aug 20 08:13:36 2013. #include <string.h> @@ -11,10 +11,8 @@ #include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_graphics_2d_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -127,11 +125,11 @@ const PPB_Graphics2D_1_1 g_ppb_graphics2d_thunk_1_1 = { } // namespace -const PPB_Graphics2D_1_0* GetPPB_Graphics2D_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Graphics2D_1_0* GetPPB_Graphics2D_1_0_Thunk() { return &g_ppb_graphics2d_thunk_1_0; } -const PPB_Graphics2D_1_1* GetPPB_Graphics2D_1_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Graphics2D_1_1* GetPPB_Graphics2D_1_1_Thunk() { return &g_ppb_graphics2d_thunk_1_1; } diff --git a/chromium/ppapi/thunk/ppb_graphics_3d_api.h b/chromium/ppapi/thunk/ppb_graphics_3d_api.h index 6c6a2417b76..ec0b187f76b 100644 --- a/chromium/ppapi/thunk/ppb_graphics_3d_api.h +++ b/chromium/ppapi/thunk/ppb_graphics_3d_api.h @@ -31,16 +31,14 @@ class PPAPI_THUNK_EXPORT PPB_Graphics3D_API { // Graphics3DTrusted API. virtual PP_Bool SetGetBuffer(int32_t shm_id) = 0; - virtual gpu::CommandBuffer::State GetState() = 0; - virtual int32_t CreateTransferBuffer(uint32_t size) = 0; + virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, + int32_t* id) = 0; virtual PP_Bool DestroyTransferBuffer(int32_t id) = 0; - virtual PP_Bool GetTransferBuffer(int32_t id, - int* shm_handle, - uint32_t* shm_size) = 0; virtual PP_Bool Flush(int32_t put_offset) = 0; - virtual gpu::CommandBuffer::State FlushSync(int32_t put_offset) = 0; - virtual gpu::CommandBuffer::State FlushSyncFast(int32_t put_offset, - int32_t last_known_get) = 0; + virtual gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, + int32_t end) = 0; + virtual gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start, + int32_t end) = 0; // GLESChromiumTextureMapping. virtual void* MapTexSubImage2DCHROMIUM(GLenum target, diff --git a/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc b/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc index cc006965e05..837e2bcb06a 100644 --- a/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc +++ b/chromium/ppapi/thunk/ppb_graphics_3d_thunk.cc @@ -2,17 +2,15 @@ // 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 Mon Apr 1 08:24:03 2013. +// From ppb_graphics_3d.idl modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_graphics_3d.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_graphics_3d_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -101,7 +99,7 @@ const PPB_Graphics3D_1_0 g_ppb_graphics3d_thunk_1_0 = { } // namespace -const PPB_Graphics3D_1_0* GetPPB_Graphics3D_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Graphics3D_1_0* GetPPB_Graphics3D_1_0_Thunk() { return &g_ppb_graphics3d_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc b/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc index 03b8d01be45..bac4007ebc0 100644 --- a/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc +++ b/chromium/ppapi/thunk/ppb_host_resolver_thunk.cc @@ -2,17 +2,15 @@ // 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 Thu Jun 20 15:36:07 2013. +// From ppb_host_resolver.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_host_resolver.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_host_resolver_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -83,7 +81,8 @@ const PPB_HostResolver_1_0 g_ppb_hostresolver_thunk_1_0 = { } // namespace -const PPB_HostResolver_1_0* GetPPB_HostResolver_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_HostResolver_1_0* + GetPPB_HostResolver_1_0_Thunk() { return &g_ppb_hostresolver_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_image_data_thunk.cc b/chromium/ppapi/thunk/ppb_image_data_thunk.cc index 51daa590457..6370185f6fa 100644 --- a/chromium/ppapi/thunk/ppb_image_data_thunk.cc +++ b/chromium/ppapi/thunk/ppb_image_data_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_image_data.idl modified Thu Jun 6 18:05:40 2013. +// From ppb_image_data.idl modified Tue Aug 20 08:13:36 2013. #include <string.h> @@ -11,10 +11,8 @@ #include "ppapi/shared_impl/ppb_image_data_shared.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_image_data_api.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -89,7 +87,7 @@ const PPB_ImageData_1_0 g_ppb_imagedata_thunk_1_0 = { } // namespace -const PPB_ImageData_1_0* GetPPB_ImageData_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_ImageData_1_0* GetPPB_ImageData_1_0_Thunk() { return &g_ppb_imagedata_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_input_event_api.h b/chromium/ppapi/thunk/ppb_input_event_api.h index e2eb3576566..9210c85b9e0 100644 --- a/chromium/ppapi/thunk/ppb_input_event_api.h +++ b/chromium/ppapi/thunk/ppb_input_event_api.h @@ -6,7 +6,6 @@ #define PPAPI_THUNK_PPB_INPUT_EVENT_API_H_ #include "ppapi/c/dev/ppb_ime_input_event_dev.h" -#include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/thunk/ppapi_thunk_export.h" @@ -36,8 +35,6 @@ class PPAPI_THUNK_EXPORT PPB_InputEvent_API { virtual PP_Bool GetWheelScrollByPage() = 0; virtual uint32_t GetKeyCode() = 0; virtual PP_Var GetCharacterText() = 0; - virtual PP_Bool SetUsbKeyCode(uint32_t) = 0; - virtual uint32_t GetUsbKeyCode() = 0; virtual PP_Var GetCode() = 0; virtual uint32_t GetIMESegmentNumber() = 0; virtual uint32_t GetIMESegmentOffset(uint32_t index) = 0; @@ -50,6 +47,9 @@ class PPAPI_THUNK_EXPORT PPB_InputEvent_API { uint32_t index) = 0; virtual PP_TouchPoint GetTouchById(PP_TouchListType list, uint32_t id) = 0; + + // Private API. + virtual PP_Bool TraceInputLatency(PP_Bool has_damage) = 0; }; } // namespace thunk diff --git a/chromium/ppapi/thunk/ppb_input_event_private_thunk.cc b/chromium/ppapi/thunk/ppb_input_event_private_thunk.cc new file mode 100644 index 00000000000..4bc78128fd1 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_input_event_private_thunk.cc @@ -0,0 +1,42 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/private/ppb_input_event_private.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppb_input_event_api.h" +#include "ppapi/thunk/thunk.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Bool TraceInputLatency(PP_Resource event, PP_Bool has_damage) { + EnterResource<PPB_InputEvent_API> enter(event, true); + if (enter.failed()) + return PP_FALSE; + return enter.object()->TraceInputLatency(has_damage); +} + +void StartTrackingLatency(PP_Instance instance) { + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->StartTrackingLatency(instance); +} + +const PPB_InputEvent_Private_0_1 g_ppb_input_event_private_thunk_0_1 = { + &TraceInputLatency, + &StartTrackingLatency +}; + +} // namespace + +const PPB_InputEvent_Private_0_1* GetPPB_InputEvent_Private_0_1_Thunk() { + return &g_ppb_input_event_private_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_input_event_thunk.cc b/chromium/ppapi/thunk/ppb_input_event_thunk.cc index 5a0927da68d..c29b56c3f32 100644 --- a/chromium/ppapi/thunk/ppb_input_event_thunk.cc +++ b/chromium/ppapi/thunk/ppb_input_event_thunk.cc @@ -244,19 +244,37 @@ const PPB_WheelInputEvent g_ppb_wheel_input_event_thunk = { // Keyboard -------------------------------------------------------------------- -PP_Resource CreateKeyboardInputEvent(PP_Instance instance, - PP_InputEvent_Type type, - PP_TimeTicks time_stamp, - uint32_t modifiers, - uint32_t key_code, - struct PP_Var character_text) { +PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + struct PP_Var character_text) { VLOG(4) << "PPB_KeyboardInputEvent::Create()"; EnterResourceCreation enter(instance); if (enter.failed()) return 0; - return enter.functions()->CreateKeyboardInputEvent(instance, type, time_stamp, - modifiers, key_code, - character_text); + return enter.functions()->CreateKeyboardInputEvent_1_0(instance, type, + time_stamp, + modifiers, key_code, + character_text); +} + +PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + struct PP_Var character_text, + struct PP_Var code) { + VLOG(4) << "PPB_KeyboardInputEvent::Create()"; + EnterResourceCreation enter(instance); + if (enter.failed()) + return 0; + return enter.functions()->CreateKeyboardInputEvent_1_2(instance, type, + time_stamp, + modifiers, key_code, + character_text, code); } PP_Bool IsKeyboardInputEvent(PP_Resource resource) { @@ -286,44 +304,27 @@ PP_Var GetCharacterText(PP_Resource character_event) { return enter.object()->GetCharacterText(); } -const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = { - &CreateKeyboardInputEvent, - &IsKeyboardInputEvent, - &GetKeyCode, - &GetCharacterText -}; - -// _Dev interface. - -PP_Bool SetUsbKeyCode(PP_Resource key_event, uint32_t usb_key_code) { - VLOG(4) << "PPB_KeyboardInputEvent_Dev::SetUsbKeyCode()"; - EnterInputEvent enter(key_event, true); - if (enter.failed()) - return PP_FALSE; - return enter.object()->SetUsbKeyCode(usb_key_code); -} - -uint32_t GetUsbKeyCode(PP_Resource key_event) { - VLOG(4) << "PPB_KeyboardInputEvent_Dev::GetUsbKeyCode()"; - EnterInputEvent enter(key_event, true); - if (enter.failed()) - return 0; - return enter.object()->GetUsbKeyCode(); -} - PP_Var GetCode(PP_Resource key_event) { - VLOG(4) << "PPB_KeyboardInputEvent_Dev::GetCode()"; + VLOG(4) << "PPB_KeyboardInputEvent::GetCode()"; EnterInputEvent enter(key_event, true); if (enter.failed()) return PP_MakeUndefined(); return enter.object()->GetCode(); } -const PPB_KeyboardInputEvent_Dev_0_2 - g_ppb_keyboard_input_event_dev_0_2_thunk = { - &SetUsbKeyCode, - &GetUsbKeyCode, - &GetCode, +const PPB_KeyboardInputEvent_1_0 g_ppb_keyboard_input_event_1_0_thunk = { + &CreateKeyboardInputEvent_1_0, + &IsKeyboardInputEvent, + &GetKeyCode, + &GetCharacterText +}; + +const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = { + &CreateKeyboardInputEvent_1_2, + &IsKeyboardInputEvent, + &GetKeyCode, + &GetCharacterText, + &GetCode }; // Composition ----------------------------------------------------------------- @@ -518,12 +519,11 @@ const PPB_MouseInputEvent_1_1* GetPPB_MouseInputEvent_1_1_Thunk() { } const PPB_KeyboardInputEvent_1_0* GetPPB_KeyboardInputEvent_1_0_Thunk() { - return &g_ppb_keyboard_input_event_thunk; + return &g_ppb_keyboard_input_event_1_0_thunk; } -const PPB_KeyboardInputEvent_Dev_0_2* - GetPPB_KeyboardInputEvent_Dev_0_2_Thunk() { - return &g_ppb_keyboard_input_event_dev_0_2_thunk; +const PPB_KeyboardInputEvent_1_2* GetPPB_KeyboardInputEvent_1_2_Thunk() { + return &g_ppb_keyboard_input_event_thunk; } const PPB_WheelInputEvent_1_0* GetPPB_WheelInputEvent_1_0_Thunk() { diff --git a/chromium/ppapi/thunk/ppb_instance_api.h b/chromium/ppapi/thunk/ppb_instance_api.h index bac3f97292a..263b49cc42c 100644 --- a/chromium/ppapi/thunk/ppb_instance_api.h +++ b/chromium/ppapi/thunk/ppb_instance_api.h @@ -30,6 +30,7 @@ struct PP_DecryptedBlockInfo; struct PP_DecryptedFrameInfo; +struct PPP_MessageHandler_0_1; namespace ppapi { @@ -78,11 +79,15 @@ class PPB_Instance_API { PP_Var value) = 0; // Find. + virtual void SetPluginToHandleFindRequests(PP_Instance instance) = 0; virtual void NumberOfFindResultsChanged(PP_Instance instance, int32_t total, PP_Bool final_result) = 0; virtual void SelectedFindResultChanged(PP_Instance instance, int32_t index) = 0; + virtual void SetTickmarks(PP_Instance instance, + const PP_Rect* tickmarks, + uint32_t count) = 0; // Fullscreen. virtual PP_Bool IsFullscreen(PP_Instance instance) = 0; @@ -105,8 +110,16 @@ class PPB_Instance_API { virtual void ClearInputEventRequest(PP_Instance instance, uint32_t event_classes) = 0; + // InputEventPrivate. + virtual void StartTrackingLatency(PP_Instance instance) = 0; + // Messaging. virtual void PostMessage(PP_Instance instance, PP_Var message) = 0; + virtual int32_t RegisterMessageHandler(PP_Instance instance, + void* user_data, + const PPP_MessageHandler_0_1* handler, + PP_Resource message_loop) = 0; + virtual void UnregisterMessageHandler(PP_Instance instance) = 0; // Mouse cursor. virtual PP_Bool SetCursor(PP_Instance instance, @@ -142,19 +155,28 @@ class PPB_Instance_API { PP_URLComponents_Dev* components) = 0; #if !defined(OS_NACL) // Content Decryptor. - virtual void SessionCreated(PP_Instance instance, - uint32 session_id, - PP_Var web_session_id) = 0; + virtual void PromiseResolved(PP_Instance instance, uint32 promise_id) = 0; + virtual void PromiseResolvedWithSession(PP_Instance instance, + uint32 promise_id, + PP_Var web_session_id_var) = 0; + virtual void PromiseRejected(PP_Instance instance, + uint32 promise_id, + PP_CdmExceptionCode exception_code, + uint32 system_code, + PP_Var error_description_var) = 0; virtual void SessionMessage(PP_Instance instance, - uint32 session_id, - PP_Var message, - PP_Var destination_url) = 0; - virtual void SessionReady(PP_Instance instance, uint32 session_id) = 0; - virtual void SessionClosed(PP_Instance instance, uint32 session_id) = 0; + PP_Var web_session_id_var, + PP_Var message_var, + PP_Var destination_url_var) = 0; + virtual void SessionReady(PP_Instance instance, + PP_Var web_session_id_var) = 0; + virtual void SessionClosed(PP_Instance instance, + PP_Var web_session_id_var) = 0; virtual void SessionError(PP_Instance instance, - uint32 session_id, - int32_t media_error, - int32_t system_error) = 0; + PP_Var web_session_id_var, + PP_CdmExceptionCode exception_code, + uint32 system_code, + PP_Var error_description_var) = 0; virtual void DeliverBlock(PP_Instance instance, PP_Resource decrypted_block, const PP_DecryptedBlockInfo* block_info) = 0; diff --git a/chromium/ppapi/thunk/ppb_instance_private_thunk.cc b/chromium/ppapi/thunk/ppb_instance_private_thunk.cc index 0d9c10bcf71..545b4ecf973 100644 --- a/chromium/ppapi/thunk/ppb_instance_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_instance_private_thunk.cc @@ -2,15 +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_instance_private.idl modified Thu Feb 28 11:58:17 2013. +// From private/ppb_instance_private.idl modified Thu Nov 14 08:28:26 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_instance_private.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -51,7 +49,8 @@ const PPB_Instance_Private_0_1 g_ppb_instance_private_thunk_0_1 = { } // namespace -const PPB_Instance_Private_0_1* GetPPB_Instance_Private_0_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Instance_Private_0_1* + GetPPB_Instance_Private_0_1_Thunk() { return &g_ppb_instance_private_thunk_0_1; } diff --git a/chromium/ppapi/thunk/ppb_instance_thunk.cc b/chromium/ppapi/thunk/ppb_instance_thunk.cc index f55c7ee38bf..770998f3710 100644 --- a/chromium/ppapi/thunk/ppb_instance_thunk.cc +++ b/chromium/ppapi/thunk/ppb_instance_thunk.cc @@ -2,15 +2,13 @@ // 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 Thu Feb 28 11:58:17 2013. +// From ppb_instance.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_instance.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -40,7 +38,7 @@ const PPB_Instance_1_0 g_ppb_instance_thunk_1_0 = { } // namespace -const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() { return &g_ppb_instance_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc b/chromium/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc index cd58b24527e..6b328592d15 100644 --- a/chromium/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc @@ -3,17 +3,15 @@ // found in the LICENSE file. // From private/ppb_isolated_file_system_private.idl, -// modified Fri Nov 8 02:21:15 2013. +// modified Mon Nov 25 11:17:07 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_isolated_file_system_private_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -42,7 +40,7 @@ const PPB_IsolatedFileSystem_Private_0_2 } // namespace -const PPB_IsolatedFileSystem_Private_0_2* +PPAPI_THUNK_EXPORT const PPB_IsolatedFileSystem_Private_0_2* GetPPB_IsolatedFileSystem_Private_0_2_Thunk() { return &g_ppb_isolatedfilesystem_private_thunk_0_2; } diff --git a/chromium/ppapi/thunk/ppb_media_stream_audio_track_api.h b/chromium/ppapi/thunk/ppb_media_stream_audio_track_api.h new file mode 100644 index 00000000000..2c43136d329 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_media_stream_audio_track_api.h @@ -0,0 +1,31 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_MEDIA_STREAM_AUDIO_TRACK_API_H_ +#define PPAPI_THUNK_PPB_MEDIA_STREAM_AUDIO_TRACK_API_H_ + +#include "ppapi/c/ppb_media_stream_audio_track.h" + +namespace ppapi { +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_MediaStreamAudioTrack_API { + public: + virtual ~PPB_MediaStreamAudioTrack_API() {} + virtual PP_Var GetId() = 0; + virtual PP_Bool HasEnded() = 0; + virtual int32_t Configure(const int32_t attrib_list[], + scoped_refptr<ppapi::TrackedCallback> callback) = 0; + virtual int32_t GetAttrib(PP_MediaStreamAudioTrack_Attrib attrib, + int32_t* value) = 0; + virtual int32_t GetBuffer(PP_Resource* buffer, + scoped_refptr<ppapi::TrackedCallback> callback) = 0; + virtual int32_t RecycleBuffer(PP_Resource buffer) = 0; + virtual void Close() = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_MEDIA_STREAM_AUDIO_TRACK_API_H_ diff --git a/chromium/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc b/chromium/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc new file mode 100644 index 00000000000..c7140a1c1d3 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_media_stream_audio_track_thunk.cc @@ -0,0 +1,112 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_media_stream_audio_track.idl modified Thu Feb 6 15:43:37 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_media_stream_audio_track.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_media_stream_audio_track_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Bool IsMediaStreamAudioTrack(PP_Resource resource) { + VLOG(4) << "PPB_MediaStreamAudioTrack::IsMediaStreamAudioTrack()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +int32_t Configure(PP_Resource audio_track, + const int32_t attrib_list[], + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_MediaStreamAudioTrack::Configure()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->Configure(attrib_list, + enter.callback())); +} + +int32_t GetAttrib(PP_Resource audio_track, + PP_MediaStreamAudioTrack_Attrib attrib, + int32_t* value) { + VLOG(4) << "PPB_MediaStreamAudioTrack::GetAttrib()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->GetAttrib(attrib, value); +} + +struct PP_Var GetId(PP_Resource audio_track) { + VLOG(4) << "PPB_MediaStreamAudioTrack::GetId()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, true); + if (enter.failed()) + return PP_MakeUndefined(); + return enter.object()->GetId(); +} + +PP_Bool HasEnded(PP_Resource audio_track) { + VLOG(4) << "PPB_MediaStreamAudioTrack::HasEnded()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, true); + if (enter.failed()) + return PP_TRUE; + return enter.object()->HasEnded(); +} + +int32_t GetBuffer(PP_Resource audio_track, + PP_Resource* buffer, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_MediaStreamAudioTrack::GetBuffer()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->GetBuffer(buffer, enter.callback())); +} + +int32_t RecycleBuffer(PP_Resource audio_track, PP_Resource buffer) { + VLOG(4) << "PPB_MediaStreamAudioTrack::RecycleBuffer()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->RecycleBuffer(buffer); +} + +void Close(PP_Resource audio_track) { + VLOG(4) << "PPB_MediaStreamAudioTrack::Close()"; + EnterResource<PPB_MediaStreamAudioTrack_API> enter(audio_track, true); + if (enter.failed()) + return; + enter.object()->Close(); +} + +const PPB_MediaStreamAudioTrack_0_1 g_ppb_mediastreamaudiotrack_thunk_0_1 = { + &IsMediaStreamAudioTrack, + &Configure, + &GetAttrib, + &GetId, + &HasEnded, + &GetBuffer, + &RecycleBuffer, + &Close +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_MediaStreamAudioTrack_0_1* + GetPPB_MediaStreamAudioTrack_0_1_Thunk() { + return &g_ppb_mediastreamaudiotrack_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_media_stream_video_track_api.h b/chromium/ppapi/thunk/ppb_media_stream_video_track_api.h new file mode 100644 index 00000000000..6cee06a5e99 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_media_stream_video_track_api.h @@ -0,0 +1,35 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_MEDIA_STREAM_VIDEO_TRACK_API_H_ +#define PPAPI_THUNK_PPB_MEDIA_STREAM_VIDEO_TRACK_API_H_ + +#include "ppapi/c/ppb_media_stream_video_track.h" + +namespace ppapi { +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_MediaStreamVideoTrack_API { + public: + virtual ~PPB_MediaStreamVideoTrack_API() {} + virtual PP_Var GetId() = 0; + virtual PP_Bool HasEnded() = 0; + virtual int32_t Configure(const int32_t attrib_list[], + scoped_refptr<ppapi::TrackedCallback> callback) = 0; + virtual int32_t GetAttrib(PP_MediaStreamVideoTrack_Attrib attrib, + int32_t* value) = 0; + virtual int32_t GetFrame(PP_Resource* frame, + scoped_refptr<ppapi::TrackedCallback> callback) = 0; + virtual int32_t RecycleFrame(PP_Resource frame) = 0; + virtual void Close() = 0; + virtual int32_t GetEmptyFrame( + PP_Resource* frame, + scoped_refptr<ppapi::TrackedCallback> callback) = 0; + virtual int32_t PutFrame(PP_Resource frame) = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_MEDIA_STREAM_VIDEO_TRACK_API_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 new file mode 100644 index 00000000000..8a26a41426c --- /dev/null +++ b/chromium/ppapi/thunk/ppb_media_stream_video_track_thunk.cc @@ -0,0 +1,160 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_media_stream_video_track.idl modified Mon Mar 31 14:40:45 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_media_stream_video_track.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_media_stream_video_track_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Resource Create(PP_Instance instance) { + VLOG(4) << "PPB_MediaStreamVideoTrack::Create()"; + EnterResourceCreation enter(instance); + if (enter.failed()) + return 0; + return enter.functions()->CreateMediaStreamVideoTrack(instance); +} + +PP_Bool IsMediaStreamVideoTrack(PP_Resource resource) { + VLOG(4) << "PPB_MediaStreamVideoTrack::IsMediaStreamVideoTrack()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +int32_t Configure(PP_Resource video_track, + const int32_t attrib_list[], + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_MediaStreamVideoTrack::Configure()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->Configure(attrib_list, + enter.callback())); +} + +int32_t GetAttrib(PP_Resource video_track, + PP_MediaStreamVideoTrack_Attrib attrib, + int32_t* value) { + VLOG(4) << "PPB_MediaStreamVideoTrack::GetAttrib()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->GetAttrib(attrib, value); +} + +struct PP_Var GetId(PP_Resource video_track) { + VLOG(4) << "PPB_MediaStreamVideoTrack::GetId()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, true); + if (enter.failed()) + return PP_MakeUndefined(); + return enter.object()->GetId(); +} + +PP_Bool HasEnded(PP_Resource video_track) { + VLOG(4) << "PPB_MediaStreamVideoTrack::HasEnded()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, true); + if (enter.failed()) + return PP_TRUE; + return enter.object()->HasEnded(); +} + +int32_t GetFrame(PP_Resource video_track, + PP_Resource* frame, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_MediaStreamVideoTrack::GetFrame()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->GetFrame(frame, enter.callback())); +} + +int32_t RecycleFrame(PP_Resource video_track, PP_Resource frame) { + VLOG(4) << "PPB_MediaStreamVideoTrack::RecycleFrame()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->RecycleFrame(frame); +} + +void Close(PP_Resource video_track) { + VLOG(4) << "PPB_MediaStreamVideoTrack::Close()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, true); + if (enter.failed()) + return; + enter.object()->Close(); +} + +int32_t GetEmptyFrame(PP_Resource video_track, + PP_Resource* frame, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_MediaStreamVideoTrack::GetEmptyFrame()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, + callback, + true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->GetEmptyFrame(frame, + enter.callback())); +} + +int32_t PutFrame(PP_Resource video_track, PP_Resource frame) { + VLOG(4) << "PPB_MediaStreamVideoTrack::PutFrame()"; + EnterResource<PPB_MediaStreamVideoTrack_API> enter(video_track, true); + if (enter.failed()) + return enter.retval(); + return enter.object()->PutFrame(frame); +} + +const PPB_MediaStreamVideoTrack_0_1 g_ppb_mediastreamvideotrack_thunk_0_1 = { + &IsMediaStreamVideoTrack, + &Configure, + &GetAttrib, + &GetId, + &HasEnded, + &GetFrame, + &RecycleFrame, + &Close +}; + +const PPB_MediaStreamVideoTrack_1_0 g_ppb_mediastreamvideotrack_thunk_1_0 = { + &Create, + &IsMediaStreamVideoTrack, + &Configure, + &GetAttrib, + &GetId, + &HasEnded, + &GetFrame, + &RecycleFrame, + &Close, + &GetEmptyFrame, + &PutFrame +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_MediaStreamVideoTrack_0_1* + GetPPB_MediaStreamVideoTrack_0_1_Thunk() { + return &g_ppb_mediastreamvideotrack_thunk_0_1; +} + +PPAPI_THUNK_EXPORT const PPB_MediaStreamVideoTrack_1_0* + GetPPB_MediaStreamVideoTrack_1_0_Thunk() { + return &g_ppb_mediastreamvideotrack_thunk_1_0; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_messaging_thunk.cc b/chromium/ppapi/thunk/ppb_messaging_thunk.cc index d485b3d8643..c35123360a4 100644 --- a/chromium/ppapi/thunk/ppb_messaging_thunk.cc +++ b/chromium/ppapi/thunk/ppb_messaging_thunk.cc @@ -2,15 +2,13 @@ // 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 Apr 16 11:25:44 2013. +// From ppb_messaging.idl modified Thu May 29 15:54:46 2014. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_messaging.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -25,15 +23,47 @@ void PostMessage(PP_Instance instance, struct PP_Var message) { enter.functions()->PostMessage(instance, message); } +int32_t RegisterMessageHandler(PP_Instance instance, + void* user_data, + const struct PPP_MessageHandler_0_1* handler, + PP_Resource message_loop) { + VLOG(4) << "PPB_Messaging::RegisterMessageHandler()"; + EnterInstance enter(instance); + if (enter.failed()) + return enter.retval(); + return enter.functions()->RegisterMessageHandler(instance, + user_data, + handler, + message_loop); +} + +void UnregisterMessageHandler(PP_Instance instance) { + VLOG(4) << "PPB_Messaging::UnregisterMessageHandler()"; + EnterInstance enter(instance); + if (enter.failed()) + return; + enter.functions()->UnregisterMessageHandler(instance); +} + const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = { &PostMessage }; +const PPB_Messaging_1_1 g_ppb_messaging_thunk_1_1 = { + &PostMessage, + &RegisterMessageHandler, + &UnregisterMessageHandler +}; + } // namespace -const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() { return &g_ppb_messaging_thunk_1_0; } +PPAPI_THUNK_EXPORT const PPB_Messaging_1_1* GetPPB_Messaging_1_1_Thunk() { + return &g_ppb_messaging_thunk_1_1; +} + } // namespace thunk } // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc b/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc index beb826302ea..8e4ec359989 100644 --- a/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc +++ b/chromium/ppapi/thunk/ppb_mouse_cursor_thunk.cc @@ -2,15 +2,13 @@ // 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 Apr 1 08:24:03 2013. +// From ppb_mouse_cursor.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_mouse_cursor.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -34,7 +32,7 @@ const PPB_MouseCursor_1_0 g_ppb_mousecursor_thunk_1_0 = { } // namespace -const PPB_MouseCursor_1_0* GetPPB_MouseCursor_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_MouseCursor_1_0* GetPPB_MouseCursor_1_0_Thunk() { return &g_ppb_mousecursor_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_mouse_lock_thunk.cc b/chromium/ppapi/thunk/ppb_mouse_lock_thunk.cc index d9bfa2d635e..586a2297921 100644 --- a/chromium/ppapi/thunk/ppb_mouse_lock_thunk.cc +++ b/chromium/ppapi/thunk/ppb_mouse_lock_thunk.cc @@ -2,16 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_mouse_lock.idl modified Mon May 6 13:58:10 2013. +// From ppb_mouse_lock.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_mouse_lock.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -42,7 +40,7 @@ const PPB_MouseLock_1_0 g_ppb_mouselock_thunk_1_0 = { } // namespace -const PPB_MouseLock_1_0* GetPPB_MouseLock_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_MouseLock_1_0* GetPPB_MouseLock_1_0_Thunk() { return &g_ppb_mouselock_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_network_list_thunk.cc b/chromium/ppapi/thunk/ppb_network_list_thunk.cc index 393a752cc01..3610fe62277 100644 --- a/chromium/ppapi/thunk/ppb_network_list_thunk.cc +++ b/chromium/ppapi/thunk/ppb_network_list_thunk.cc @@ -2,16 +2,14 @@ // 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 Mon Sep 9 11:18:02 2013. +// From ppb_network_list.idl modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_network_list.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_network_list_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -95,7 +93,7 @@ const PPB_NetworkList_1_0 g_ppb_networklist_thunk_1_0 = { } // namespace -const PPB_NetworkList_1_0* GetPPB_NetworkList_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_NetworkList_1_0* GetPPB_NetworkList_1_0_Thunk() { return &g_ppb_networklist_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc b/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc index 089d783b63b..5f7851d8170 100644 --- a/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc +++ b/chromium/ppapi/thunk/ppb_network_monitor_thunk.cc @@ -2,17 +2,15 @@ // 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 Thu Sep 5 12:10:00 2013. +// From ppb_network_monitor.idl modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_network_monitor.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_network_monitor_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -52,7 +50,8 @@ const PPB_NetworkMonitor_1_0 g_ppb_networkmonitor_thunk_1_0 = { } // namespace -const PPB_NetworkMonitor_1_0* GetPPB_NetworkMonitor_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_NetworkMonitor_1_0* + GetPPB_NetworkMonitor_1_0_Thunk() { return &g_ppb_networkmonitor_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_network_proxy_thunk.cc b/chromium/ppapi/thunk/ppb_network_proxy_thunk.cc index 20c14ade989..f041e956bb1 100644 --- a/chromium/ppapi/thunk/ppb_network_proxy_thunk.cc +++ b/chromium/ppapi/thunk/ppb_network_proxy_thunk.cc @@ -2,17 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_network_proxy.idl modified Thu Jun 20 22:03:12 2013. +// From ppb_network_proxy.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_network_proxy.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_network_proxy_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -39,7 +37,8 @@ const PPB_NetworkProxy_1_0 g_ppb_networkproxy_thunk_1_0 = { } // namespace -const PPB_NetworkProxy_1_0* GetPPB_NetworkProxy_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_NetworkProxy_1_0* + GetPPB_NetworkProxy_1_0_Thunk() { return &g_ppb_networkproxy_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc b/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc index 8708806a2a2..0813f99080f 100644 --- a/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc @@ -3,17 +3,15 @@ // found in the LICENSE file. // From private/ppb_output_protection_private.idl, -// modified Thu Aug 29 13:39:04 2013. +// modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_output_protection_private.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_output_protection_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -69,7 +67,7 @@ const PPB_OutputProtection_Private_0_1 } // namespace -const PPB_OutputProtection_Private_0_1* +PPAPI_THUNK_EXPORT const PPB_OutputProtection_Private_0_1* GetPPB_OutputProtection_Private_0_1_Thunk() { return &g_ppb_outputprotection_private_thunk_0_1; } diff --git a/chromium/ppapi/thunk/ppb_pdf_api.h b/chromium/ppapi/thunk/ppb_pdf_api.h index a23c527189e..a37da2b66a2 100644 --- a/chromium/ppapi/thunk/ppb_pdf_api.h +++ b/chromium/ppapi/thunk/ppb_pdf_api.h @@ -32,6 +32,8 @@ class PPB_PDF_API { virtual PP_Resource GetResourceImageForScale(PP_ResourceImage image_id, float scale) = 0; virtual PP_Bool IsOutOfProcess() = 0; + virtual void SetSelectedText(const char* selected_text) = 0; + virtual void SetLinkUnderCursor(const char* url) = 0; static const SingletonResourceID kSingletonResourceID = PDF_SINGLETON_ID; }; diff --git a/chromium/ppapi/thunk/ppb_pdf_thunk.cc b/chromium/ppapi/thunk/ppb_pdf_thunk.cc index 282f8934850..a8aa0806b17 100644 --- a/chromium/ppapi/thunk/ppb_pdf_thunk.cc +++ b/chromium/ppapi/thunk/ppb_pdf_thunk.cc @@ -147,6 +147,20 @@ PP_Bool IsOutOfProcess(PP_Instance instance) { return enter.functions()->IsOutOfProcess(); } +void SetSelectedText(PP_Instance instance, + const char* selected_text) { + EnterInstanceAPI<PPB_PDF_API> enter(instance); + if (enter.succeeded()) + enter.functions()->SetSelectedText(selected_text); +} + +void SetLinkUnderCursor(PP_Instance instance, const char* url) { + EnterInstanceAPI<PPB_PDF_API> enter(instance); + if (enter.failed()) + return; + enter.functions()->SetLinkUnderCursor(url); +} + const PPB_PDF g_ppb_pdf_thunk = { &GetLocalizedString, &GetResourceImage, @@ -165,6 +179,8 @@ const PPB_PDF g_ppb_pdf_thunk = { &GetResourceImageForScale, &ModalPromptForPassword, &IsOutOfProcess, + &SetSelectedText, + &SetLinkUnderCursor, }; } // namespace diff --git a/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc b/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc index 37d842eeb7d..c24e7d4144f 100644 --- a/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc +++ b/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc @@ -3,17 +3,15 @@ // found in the LICENSE file. // From private/ppb_platform_verification_private.idl, -// modified Fri Oct 18 15:02:09 2013. +// modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_platform_verification_private.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_platform_verification_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -63,7 +61,7 @@ const PPB_PlatformVerification_Private_0_2 } // namespace -const PPB_PlatformVerification_Private_0_2* +PPAPI_THUNK_EXPORT const PPB_PlatformVerification_Private_0_2* GetPPB_PlatformVerification_Private_0_2_Thunk() { return &g_ppb_platformverification_private_thunk_0_2; } diff --git a/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc b/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc index 117ef17ca75..96f52f5832c 100644 --- a/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_printing_dev_thunk.cc @@ -2,17 +2,15 @@ // 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 Fri Apr 19 10:45:09 2013. +// From dev/ppb_printing_dev.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/dev/ppb_printing_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_printing_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -46,7 +44,8 @@ const PPB_Printing_Dev_0_7 g_ppb_printing_dev_thunk_0_7 = { } // namespace -const PPB_Printing_Dev_0_7* GetPPB_Printing_Dev_0_7_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Printing_Dev_0_7* + GetPPB_Printing_Dev_0_7_Thunk() { return &g_ppb_printing_dev_thunk_0_7; } diff --git a/chromium/ppapi/thunk/ppb_resource_array_api.h b/chromium/ppapi/thunk/ppb_resource_array_api.h deleted file mode 100644 index ec37f9e0fc3..00000000000 --- a/chromium/ppapi/thunk/ppb_resource_array_api.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef PPAPI_THUNK_PPB_RESOURCE_ARRAY_API_H_ -#define PPAPI_THUNK_PPB_RESOURCE_ARRAY_API_H_ - -#include "ppapi/c/dev/ppb_resource_array_dev.h" -#include "ppapi/thunk/ppapi_thunk_export.h" - -namespace ppapi { -namespace thunk { - -class PPAPI_THUNK_EXPORT PPB_ResourceArray_API { - public: - virtual ~PPB_ResourceArray_API() {} - - virtual uint32_t GetSize() = 0; - virtual PP_Resource GetAt(uint32_t index) = 0; -}; - -} // namespace thunk -} // namespace ppapi - -#endif // PPAPI_THUNK_PPB_RESOURCE_ARRAY_API_H_ diff --git a/chromium/ppapi/thunk/ppb_resource_array_dev_thunk.cc b/chromium/ppapi/thunk/ppb_resource_array_dev_thunk.cc deleted file mode 100644 index 6d51a564d8a..00000000000 --- a/chromium/ppapi/thunk/ppb_resource_array_dev_thunk.cc +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// From dev/ppb_resource_array_dev.idl modified Thu Dec 20 13:10:26 2012. - -#include "ppapi/c/dev/ppb_resource_array_dev.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/shared_impl/tracked_callback.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/ppb_resource_array_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" - -namespace ppapi { -namespace thunk { - -namespace { - -PP_Resource Create(PP_Instance instance, - const PP_Resource elements[], - uint32_t size) { - VLOG(4) << "PPB_ResourceArray_Dev::Create()"; - EnterResourceCreation enter(instance); - if (enter.failed()) - return 0; - return enter.functions()->CreateResourceArray(instance, elements, size); -} - -PP_Bool IsResourceArray(PP_Resource resource) { - VLOG(4) << "PPB_ResourceArray_Dev::IsResourceArray()"; - EnterResource<PPB_ResourceArray_API> enter(resource, false); - return PP_FromBool(enter.succeeded()); -} - -uint32_t GetSize(PP_Resource resource_array) { - VLOG(4) << "PPB_ResourceArray_Dev::GetSize()"; - EnterResource<PPB_ResourceArray_API> enter(resource_array, true); - if (enter.failed()) - return 0; - return enter.object()->GetSize(); -} - -PP_Resource GetAt(PP_Resource resource_array, uint32_t index) { - VLOG(4) << "PPB_ResourceArray_Dev::GetAt()"; - EnterResource<PPB_ResourceArray_API> enter(resource_array, true); - if (enter.failed()) - return 0; - return enter.object()->GetAt(index); -} - -const PPB_ResourceArray_Dev_0_1 g_ppb_resourcearray_dev_thunk_0_1 = { - &Create, - &IsResourceArray, - &GetSize, - &GetAt -}; - -} // namespace - -const PPB_ResourceArray_Dev_0_1* GetPPB_ResourceArray_Dev_0_1_Thunk() { - return &g_ppb_resourcearray_dev_thunk_0_1; -} - -} // namespace thunk -} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc b/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc index afed58e7b6b..fec60115a20 100644 --- a/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc @@ -2,18 +2,16 @@ // 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 Wed Apr 17 15:38:46 2013. +// From dev/ppb_truetype_font_dev.idl modified Thu Oct 31 12:30:06 2013. #include "ppapi/c/dev/ppb_truetype_font_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_truetype_font_api.h" #include "ppapi/thunk/ppb_truetype_font_singleton_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -113,7 +111,8 @@ const PPB_TrueTypeFont_Dev_0_1 g_ppb_truetypefont_dev_thunk_0_1 = { } // namespace -const PPB_TrueTypeFont_Dev_0_1* GetPPB_TrueTypeFont_Dev_0_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_TrueTypeFont_Dev_0_1* + GetPPB_TrueTypeFont_Dev_0_1_Thunk() { return &g_ppb_truetypefont_dev_thunk_0_1; } diff --git a/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc b/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc index 8343d2f8629..212ff93f6fa 100644 --- a/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc +++ b/chromium/ppapi/thunk/ppb_udp_socket_thunk.cc @@ -2,17 +2,15 @@ // 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 Thu Jun 20 14:03:55 2013. +// From ppb_udp_socket.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_udp_socket.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_udp_socket_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -115,7 +113,7 @@ const PPB_UDPSocket_1_0 g_ppb_udpsocket_thunk_1_0 = { } // namespace -const PPB_UDPSocket_1_0* GetPPB_UDPSocket_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_UDPSocket_1_0* GetPPB_UDPSocket_1_0_Thunk() { return &g_ppb_udpsocket_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_uma_private_thunk.cc b/chromium/ppapi/thunk/ppb_uma_private_thunk.cc new file mode 100644 index 00000000000..299b64369b4 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_uma_private_thunk.cc @@ -0,0 +1,95 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From private/ppb_uma_private.idl modified Thu Mar 13 11:54:51 2014. + +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/private/ppb_uma_private.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_uma_singleton_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +void HistogramCustomTimes(PP_Instance instance, + struct PP_Var name, + int64_t sample, + int64_t min, + int64_t max, + uint32_t bucket_count) { + VLOG(4) << "PPB_UMA_Private::HistogramCustomTimes()"; + EnterInstanceAPI<PPB_UMA_Singleton_API> enter(instance); + if (enter.failed()) + return; + enter.functions()->HistogramCustomTimes(instance, + name, + sample, + min, + max, + bucket_count); +} + +void HistogramCustomCounts(PP_Instance instance, + struct PP_Var name, + int32_t sample, + int32_t min, + int32_t max, + uint32_t bucket_count) { + VLOG(4) << "PPB_UMA_Private::HistogramCustomCounts()"; + EnterInstanceAPI<PPB_UMA_Singleton_API> enter(instance); + if (enter.failed()) + return; + enter.functions()->HistogramCustomCounts(instance, + name, + sample, + min, + max, + bucket_count); +} + +void HistogramEnumeration(PP_Instance instance, + struct PP_Var name, + int32_t sample, + int32_t boundary_value) { + VLOG(4) << "PPB_UMA_Private::HistogramEnumeration()"; + EnterInstanceAPI<PPB_UMA_Singleton_API> enter(instance); + if (enter.failed()) + return; + enter.functions()->HistogramEnumeration(instance, + name, + sample, + boundary_value); +} + +int32_t IsCrashReportingEnabled(PP_Instance instance, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_UMA_Private::IsCrashReportingEnabled()"; + EnterInstanceAPI<PPB_UMA_Singleton_API> enter(instance, callback); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.functions()->IsCrashReportingEnabled( + instance, + enter.callback())); +} + +const PPB_UMA_Private_0_3 g_ppb_uma_private_thunk_0_3 = { + &HistogramCustomTimes, + &HistogramCustomCounts, + &HistogramEnumeration, + &IsCrashReportingEnabled +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_UMA_Private_0_3* GetPPB_UMA_Private_0_3_Thunk() { + return &g_ppb_uma_private_thunk_0_3; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_uma_singleton_api.h b/chromium/ppapi/thunk/ppb_uma_singleton_api.h new file mode 100644 index 00000000000..f8414b91a6e --- /dev/null +++ b/chromium/ppapi/thunk/ppb_uma_singleton_api.h @@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_ +#define PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_ + +#include "ppapi/shared_impl/singleton_resource_id.h" +#include "ppapi/thunk/ppapi_thunk_export.h" + +namespace ppapi { +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_UMA_Singleton_API { + public: + virtual ~PPB_UMA_Singleton_API() {} + + virtual void HistogramCustomTimes(PP_Instance instance, + struct PP_Var name, + int64_t sample, + int64_t min, + int64_t max, + uint32_t bucket_count) = 0; + + virtual void HistogramCustomCounts(PP_Instance instance, + struct PP_Var name, + int32_t sample, + int32_t min, + int32_t max, + uint32_t bucket_count) = 0; + + virtual void HistogramEnumeration(PP_Instance instance, + struct PP_Var name, + int32_t sample, + int32_t boundary_value) = 0; + + virtual int32_t IsCrashReportingEnabled( + PP_Instance instance, + scoped_refptr<TrackedCallback> cc) = 0; + + static const SingletonResourceID kSingletonResourceID = UMA_SINGLETON_ID; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_ diff --git a/chromium/ppapi/thunk/ppb_url_loader_thunk.cc b/chromium/ppapi/thunk/ppb_url_loader_thunk.cc index 7df78b9177c..22594298f5d 100644 --- a/chromium/ppapi/thunk/ppb_url_loader_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_loader_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_loader.idl modified Wed Apr 17 11:16:00 2013. +// From ppb_url_loader.idl modified Tue Aug 20 08:13:36 2013. #include <string.h> @@ -11,10 +11,8 @@ #include "ppapi/c/ppb_url_loader.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_url_loader_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -135,7 +133,7 @@ const PPB_URLLoader_1_0 g_ppb_urlloader_thunk_1_0 = { } // namespace -const PPB_URLLoader_1_0* GetPPB_URLLoader_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_URLLoader_1_0* GetPPB_URLLoader_1_0_Thunk() { return &g_ppb_urlloader_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc b/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc index 3082f36ed6a..d0c71e1f5ec 100644 --- a/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_loader_trusted_thunk.cc @@ -2,16 +2,14 @@ // 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 Wed Apr 17 11:16:00 2013. +// From trusted/ppb_url_loader_trusted.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_url_loader_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -42,7 +40,8 @@ const PPB_URLLoaderTrusted_0_3 g_ppb_urlloadertrusted_thunk_0_3 = { } // namespace -const PPB_URLLoaderTrusted_0_3* GetPPB_URLLoaderTrusted_0_3_Thunk() { +PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted_0_3* + GetPPB_URLLoaderTrusted_0_3_Thunk() { return &g_ppb_urlloadertrusted_thunk_0_3; } diff --git a/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc b/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc index c6a73972160..7fa058cf5e8 100644 --- a/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_request_info_thunk.cc @@ -2,16 +2,14 @@ // 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 Apr 1 08:24:03 2013. +// From ppb_url_request_info.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_url_request_info_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -75,7 +73,8 @@ const PPB_URLRequestInfo_1_0 g_ppb_urlrequestinfo_thunk_1_0 = { } // namespace -const PPB_URLRequestInfo_1_0* GetPPB_URLRequestInfo_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_URLRequestInfo_1_0* + GetPPB_URLRequestInfo_1_0_Thunk() { return &g_ppb_urlrequestinfo_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc b/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc index fe6ef08ed3a..48bc04e5c68 100644 --- a/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc +++ b/chromium/ppapi/thunk/ppb_url_response_info_thunk.cc @@ -2,16 +2,14 @@ // 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 Thu Apr 25 13:21:08 2013. +// From ppb_url_response_info.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_url_response_info.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_url_response_info_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -49,7 +47,8 @@ const PPB_URLResponseInfo_1_0 g_ppb_urlresponseinfo_thunk_1_0 = { } // namespace -const PPB_URLResponseInfo_1_0* GetPPB_URLResponseInfo_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_URLResponseInfo_1_0* + GetPPB_URLResponseInfo_1_0_Thunk() { return &g_ppb_urlresponseinfo_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_var_resource_dev_thunk.cc b/chromium/ppapi/thunk/ppb_var_resource_dev_thunk.cc deleted file mode 100644 index e02ea5d14ec..00000000000 --- a/chromium/ppapi/thunk/ppb_var_resource_dev_thunk.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ppapi/c/dev/ppb_var_resource_dev.h" -#include "ppapi/c/pp_var.h" -#include "ppapi/shared_impl/ppapi_globals.h" -#include "ppapi/shared_impl/proxy_lock.h" -#include "ppapi/shared_impl/resource_tracker.h" -#include "ppapi/shared_impl/resource_var.h" -#include "ppapi/shared_impl/var_tracker.h" -#include "ppapi/thunk/thunk.h" - -namespace ppapi { -namespace thunk { - -namespace { - -PP_Resource VarToResource(struct PP_Var var) { - ProxyAutoLock lock; - ResourceVar* resource = ResourceVar::FromPPVar(var); - if (!resource) - return 0; - PP_Resource pp_resource = resource->GetPPResource(); - PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(pp_resource); - return pp_resource; -} - -struct PP_Var VarFromResource(PP_Resource resource) { - ProxyAutoLock lock; - return PpapiGlobals::Get()->GetVarTracker()->MakeResourcePPVar(resource); -} - -const PPB_VarResource_Dev_0_1 g_ppb_varresource_dev_0_1_thunk = { - &VarToResource, - &VarFromResource -}; - -} // namespace - -const PPB_VarResource_Dev_0_1* GetPPB_VarResource_Dev_0_1_Thunk() { - return &g_ppb_varresource_dev_0_1_thunk; -} - -} // namespace thunk -} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_video_capture_api.h b/chromium/ppapi/thunk/ppb_video_capture_api.h index baa7e00e641..2c0089e328c 100644 --- a/chromium/ppapi/thunk/ppb_video_capture_api.h +++ b/chromium/ppapi/thunk/ppb_video_capture_api.h @@ -23,9 +23,6 @@ class PPB_VideoCapture_API { public: virtual ~PPB_VideoCapture_API() {} - virtual int32_t EnumerateDevices0_2( - PP_Resource* devices, - scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t EnumerateDevices(const PP_ArrayOutput& output, scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t MonitorDeviceChange(PP_MonitorDeviceChangeCallback callback, diff --git a/chromium/ppapi/thunk/ppb_video_capture_thunk.cc b/chromium/ppapi/thunk/ppb_video_capture_thunk.cc index 9d6571e8d2c..83772a53f5c 100644 --- a/chromium/ppapi/thunk/ppb_video_capture_thunk.cc +++ b/chromium/ppapi/thunk/ppb_video_capture_thunk.cc @@ -30,17 +30,6 @@ PP_Bool IsVideoCapture(PP_Resource resource) { return PP_FromBool(enter.succeeded()); } -int32_t EnumerateDevices0_2(PP_Resource video_capture, - PP_Resource* devices, - PP_CompletionCallback callback) { - EnterVideoCapture enter(video_capture, callback, true); - if (enter.failed()) - return enter.retval(); - - return enter.SetResult(enter.object()->EnumerateDevices0_2(devices, - enter.callback())); -} - int32_t EnumerateDevices(PP_Resource video_capture, PP_ArrayOutput output, PP_CompletionCallback callback) { @@ -112,17 +101,6 @@ void Close(PP_Resource video_capture) { enter.object()->Close(); } -const PPB_VideoCapture_Dev_0_2 g_ppb_video_capture_0_2_thunk = { - &Create, - &IsVideoCapture, - &EnumerateDevices0_2, - &Open, - &StartCapture, - &ReuseBuffer, - &StopCapture, - &Close -}; - const PPB_VideoCapture_Dev_0_3 g_ppb_video_capture_0_3_thunk = { &Create, &IsVideoCapture, @@ -137,10 +115,6 @@ const PPB_VideoCapture_Dev_0_3 g_ppb_video_capture_0_3_thunk = { } // namespace -const PPB_VideoCapture_Dev_0_2* GetPPB_VideoCapture_Dev_0_2_Thunk() { - return &g_ppb_video_capture_0_2_thunk; -} - const PPB_VideoCapture_Dev_0_3* GetPPB_VideoCapture_Dev_0_3_Thunk() { return &g_ppb_video_capture_0_3_thunk; } diff --git a/chromium/ppapi/thunk/ppb_video_decoder_api.h b/chromium/ppapi/thunk/ppb_video_decoder_api.h index e26c887ebcc..c40845ec1de 100644 --- a/chromium/ppapi/thunk/ppb_video_decoder_api.h +++ b/chromium/ppapi/thunk/ppb_video_decoder_api.h @@ -1,12 +1,13 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PPAPI_THUNK_VIDEO_DECODER_API_H_ -#define PPAPI_THUNK_VIDEO_DECODER_API_H_ +#ifndef PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_ +#define PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_ -#include "base/memory/ref_counted.h" -#include "ppapi/c/dev/ppb_video_decoder_dev.h" +#include "ppapi/c/pp_codecs.h" +#include "ppapi/c/ppb_video_decoder.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { @@ -14,21 +15,26 @@ class TrackedCallback; namespace thunk { -class PPB_VideoDecoder_API { +class PPAPI_THUNK_EXPORT PPB_VideoDecoder_API { public: virtual ~PPB_VideoDecoder_API() {} - virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, + virtual int32_t Initialize(PP_Resource context, + PP_VideoProfile profile, + PP_Bool allow_software_fallback, + scoped_refptr<TrackedCallback> callback) = 0; + virtual int32_t Decode(uint32_t decode_id, + uint32_t size, + const void* buffer, scoped_refptr<TrackedCallback> callback) = 0; - virtual void AssignPictureBuffers(uint32_t no_of_buffers, - const PP_PictureBuffer_Dev* buffers) = 0; - virtual void ReusePictureBuffer(int32_t picture_buffer_id) = 0; + virtual int32_t GetPicture(PP_VideoPicture* picture, + scoped_refptr<TrackedCallback> callback) = 0; + virtual void RecyclePicture(const PP_VideoPicture* picture) = 0; virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) = 0; virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) = 0; - virtual void Destroy() = 0; }; } // namespace thunk } // namespace ppapi -#endif // PPAPI_THUNK_VIDEO_DECODER_API_H_ +#endif // PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_ diff --git a/chromium/ppapi/thunk/ppb_video_decoder_dev_api.h b/chromium/ppapi/thunk/ppb_video_decoder_dev_api.h new file mode 100644 index 00000000000..d652f5f4df6 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_video_decoder_dev_api.h @@ -0,0 +1,34 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_ +#define PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_ + +#include "base/memory/ref_counted.h" +#include "ppapi/c/dev/ppb_video_decoder_dev.h" + +namespace ppapi { + +class TrackedCallback; + +namespace thunk { + +class PPB_VideoDecoder_Dev_API { + public: + virtual ~PPB_VideoDecoder_Dev_API() {} + + virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, + scoped_refptr<TrackedCallback> callback) = 0; + virtual void AssignPictureBuffers(uint32_t no_of_buffers, + const PP_PictureBuffer_Dev* buffers) = 0; + virtual void ReusePictureBuffer(int32_t picture_buffer_id) = 0; + virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) = 0; + virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) = 0; + virtual void Destroy() = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_ diff --git a/chromium/ppapi/thunk/ppb_video_decoder_dev_thunk.cc b/chromium/ppapi/thunk/ppb_video_decoder_dev_thunk.cc new file mode 100644 index 00000000000..bf15dd8abb3 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_video_decoder_dev_thunk.cc @@ -0,0 +1,96 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ppapi/c/pp_errors.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppb_video_decoder_dev_api.h" +#include "ppapi/thunk/resource_creation_api.h" +#include "ppapi/thunk/thunk.h" + +namespace ppapi { +namespace thunk { + +namespace { + +typedef EnterResource<PPB_VideoDecoder_Dev_API> EnterVideoDecoder; + +PP_Resource Create(PP_Instance instance, + PP_Resource graphics_3d, + PP_VideoDecoder_Profile profile) { + EnterResourceCreation enter(instance); + if (enter.failed()) + return 0; + return enter.functions()->CreateVideoDecoderDev( + instance, graphics_3d, profile); +} + +PP_Bool IsVideoDecoder(PP_Resource resource) { + EnterVideoDecoder enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +int32_t Decode(PP_Resource video_decoder, + const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, + PP_CompletionCallback callback) { + EnterVideoDecoder enter(video_decoder, callback, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult( + enter.object()->Decode(bitstream_buffer, enter.callback())); +} + +void AssignPictureBuffers(PP_Resource video_decoder, + uint32_t no_of_buffers, + const PP_PictureBuffer_Dev* buffers) { + EnterVideoDecoder enter(video_decoder, true); + if (enter.succeeded()) + enter.object()->AssignPictureBuffers(no_of_buffers, buffers); +} + +void ReusePictureBuffer(PP_Resource video_decoder, int32_t picture_buffer_id) { + EnterVideoDecoder enter(video_decoder, true); + if (enter.succeeded()) + enter.object()->ReusePictureBuffer(picture_buffer_id); +} + +int32_t Flush(PP_Resource video_decoder, PP_CompletionCallback callback) { + EnterVideoDecoder enter(video_decoder, callback, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->Flush(enter.callback())); +} + +int32_t Reset(PP_Resource video_decoder, PP_CompletionCallback callback) { + EnterVideoDecoder enter(video_decoder, callback, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->Reset(enter.callback())); +} + +void Destroy(PP_Resource video_decoder) { + EnterVideoDecoder enter(video_decoder, true); + if (enter.succeeded()) + enter.object()->Destroy(); +} + +const PPB_VideoDecoder_Dev g_ppb_videodecoder_dev_thunk = { + &Create, + &IsVideoDecoder, + &Decode, + &AssignPictureBuffers, + &ReusePictureBuffer, + &Flush, + &Reset, + &Destroy +}; + +} // namespace + +const PPB_VideoDecoder_Dev_0_16* GetPPB_VideoDecoder_Dev_0_16_Thunk() { + return &g_ppb_videodecoder_dev_thunk; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_video_decoder_thunk.cc b/chromium/ppapi/thunk/ppb_video_decoder_thunk.cc index 2472d8ab321..d84617c696c 100644 --- a/chromium/ppapi/thunk/ppb_video_decoder_thunk.cc +++ b/chromium/ppapi/thunk/ppb_video_decoder_thunk.cc @@ -1,95 +1,119 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// From ppb_video_decoder.idl modified Tue May 6 05:06:35 2014. + +#include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_video_decoder.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_video_decoder_api.h" -#include "ppapi/thunk/resource_creation_api.h" namespace ppapi { namespace thunk { namespace { -typedef EnterResource<PPB_VideoDecoder_API> EnterVideoDecoder; - -PP_Resource Create(PP_Instance instance, - PP_Resource graphics_3d, - PP_VideoDecoder_Profile profile) { +PP_Resource Create(PP_Instance instance) { + VLOG(4) << "PPB_VideoDecoder::Create()"; EnterResourceCreation enter(instance); if (enter.failed()) return 0; - return enter.functions()->CreateVideoDecoder(instance, graphics_3d, profile); + return enter.functions()->CreateVideoDecoder(instance); } PP_Bool IsVideoDecoder(PP_Resource resource) { - EnterVideoDecoder enter(resource, false); + VLOG(4) << "PPB_VideoDecoder::IsVideoDecoder()"; + EnterResource<PPB_VideoDecoder_API> enter(resource, false); return PP_FromBool(enter.succeeded()); } +int32_t Initialize(PP_Resource video_decoder, + PP_Resource graphics3d_context, + PP_VideoProfile profile, + PP_Bool allow_software_fallback, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_VideoDecoder::Initialize()"; + EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->Initialize(graphics3d_context, + profile, + allow_software_fallback, + enter.callback())); +} + int32_t Decode(PP_Resource video_decoder, - const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, - PP_CompletionCallback callback) { - EnterVideoDecoder enter(video_decoder, callback, true); + uint32_t decode_id, + uint32_t size, + const void* buffer, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_VideoDecoder::Decode()"; + EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->Decode(bitstream_buffer, + return enter.SetResult(enter.object()->Decode(decode_id, + size, + buffer, enter.callback())); } -void AssignPictureBuffers(PP_Resource video_decoder, - uint32_t no_of_buffers, - const PP_PictureBuffer_Dev* buffers) { - EnterVideoDecoder enter(video_decoder, true); - if (enter.succeeded()) - enter.object()->AssignPictureBuffers(no_of_buffers, buffers); +int32_t GetPicture(PP_Resource video_decoder, + struct PP_VideoPicture* picture, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_VideoDecoder::GetPicture()"; + EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); + if (enter.failed()) + return enter.retval(); + return enter.SetResult(enter.object()->GetPicture(picture, enter.callback())); } -void ReusePictureBuffer(PP_Resource video_decoder, int32_t picture_buffer_id) { - EnterVideoDecoder enter(video_decoder, true); - if (enter.succeeded()) - enter.object()->ReusePictureBuffer(picture_buffer_id); +void RecyclePicture(PP_Resource video_decoder, + const struct PP_VideoPicture* picture) { + VLOG(4) << "PPB_VideoDecoder::RecyclePicture()"; + EnterResource<PPB_VideoDecoder_API> enter(video_decoder, true); + if (enter.failed()) + return; + enter.object()->RecyclePicture(picture); } -int32_t Flush(PP_Resource video_decoder, PP_CompletionCallback callback) { - EnterVideoDecoder enter(video_decoder, callback, true); +int32_t Flush(PP_Resource video_decoder, + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_VideoDecoder::Flush()"; + EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); if (enter.failed()) return enter.retval(); return enter.SetResult(enter.object()->Flush(enter.callback())); } int32_t Reset(PP_Resource video_decoder, - PP_CompletionCallback callback) { - EnterVideoDecoder enter(video_decoder, callback, true); + struct PP_CompletionCallback callback) { + VLOG(4) << "PPB_VideoDecoder::Reset()"; + EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); if (enter.failed()) return enter.retval(); return enter.SetResult(enter.object()->Reset(enter.callback())); } -void Destroy(PP_Resource video_decoder) { - EnterVideoDecoder enter(video_decoder, true); - if (enter.succeeded()) - enter.object()->Destroy(); -} - -const PPB_VideoDecoder_Dev g_ppb_videodecoder_thunk = { +const PPB_VideoDecoder_0_1 g_ppb_videodecoder_thunk_0_1 = { &Create, &IsVideoDecoder, + &Initialize, &Decode, - &AssignPictureBuffers, - &ReusePictureBuffer, + &GetPicture, + &RecyclePicture, &Flush, - &Reset, - &Destroy + &Reset }; } // namespace -const PPB_VideoDecoder_Dev_0_16* GetPPB_VideoDecoder_Dev_0_16_Thunk() { - return &g_ppb_videodecoder_thunk; +PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_1* + GetPPB_VideoDecoder_0_1_Thunk() { + return &g_ppb_videodecoder_thunk_0_1; } } // namespace thunk diff --git a/chromium/ppapi/thunk/ppb_video_frame_api.h b/chromium/ppapi/thunk/ppb_video_frame_api.h new file mode 100644 index 00000000000..105d72b9988 --- /dev/null +++ b/chromium/ppapi/thunk/ppb_video_frame_api.h @@ -0,0 +1,36 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PPAPI_THUNK_PPB_VIDEO_FRAME_API_H_ +#define PPAPI_THUNK_PPB_VIDEO_FRAME_API_H_ + +#include "ppapi/c/ppb_video_frame.h" +#include "ppapi/thunk/ppapi_thunk_export.h" + +namespace ppapi { + +union MediaStreamBuffer; + +namespace thunk { + +class PPAPI_THUNK_EXPORT PPB_VideoFrame_API { + public: + virtual ~PPB_VideoFrame_API() {} + virtual PP_TimeDelta GetTimestamp() = 0; + virtual void SetTimestamp(PP_TimeDelta timestamp) = 0; + virtual PP_VideoFrame_Format GetFormat() = 0; + virtual PP_Bool GetSize(PP_Size* size) = 0; + virtual void* GetDataBuffer() = 0; + virtual uint32_t GetDataBufferSize() = 0; + + // Methods used by Pepper internal implementation only. + virtual MediaStreamBuffer* GetBuffer() = 0; + virtual int32_t GetBufferIndex() = 0; + virtual void Invalidate() = 0; +}; + +} // namespace thunk +} // namespace ppapi + +#endif // PPAPI_THUNK_PPB_VIDEO_FRAME_API_H_ diff --git a/chromium/ppapi/thunk/ppb_video_frame_thunk.cc b/chromium/ppapi/thunk/ppb_video_frame_thunk.cc new file mode 100644 index 00000000000..762e260e56b --- /dev/null +++ b/chromium/ppapi/thunk/ppb_video_frame_thunk.cc @@ -0,0 +1,90 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// From ppb_video_frame.idl modified Mon Jan 13 12:02:23 2014. + +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_video_frame.h" +#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/enter.h" +#include "ppapi/thunk/ppapi_thunk_export.h" +#include "ppapi/thunk/ppb_video_frame_api.h" + +namespace ppapi { +namespace thunk { + +namespace { + +PP_Bool IsVideoFrame(PP_Resource resource) { + VLOG(4) << "PPB_VideoFrame::IsVideoFrame()"; + EnterResource<PPB_VideoFrame_API> enter(resource, false); + return PP_FromBool(enter.succeeded()); +} + +PP_TimeDelta GetTimestamp(PP_Resource frame) { + VLOG(4) << "PPB_VideoFrame::GetTimestamp()"; + EnterResource<PPB_VideoFrame_API> enter(frame, true); + if (enter.failed()) + return 0.0; + return enter.object()->GetTimestamp(); +} + +void SetTimestamp(PP_Resource frame, PP_TimeDelta timestamp) { + VLOG(4) << "PPB_VideoFrame::SetTimestamp()"; + EnterResource<PPB_VideoFrame_API> enter(frame, true); + if (enter.failed()) + return; + enter.object()->SetTimestamp(timestamp); +} + +PP_VideoFrame_Format GetFormat(PP_Resource frame) { + VLOG(4) << "PPB_VideoFrame::GetFormat()"; + EnterResource<PPB_VideoFrame_API> enter(frame, true); + if (enter.failed()) + return PP_VIDEOFRAME_FORMAT_UNKNOWN; + return enter.object()->GetFormat(); +} + +PP_Bool GetSize(PP_Resource frame, struct PP_Size* size) { + VLOG(4) << "PPB_VideoFrame::GetSize()"; + EnterResource<PPB_VideoFrame_API> enter(frame, true); + if (enter.failed()) + return PP_FALSE; + return enter.object()->GetSize(size); +} + +void* GetDataBuffer(PP_Resource frame) { + VLOG(4) << "PPB_VideoFrame::GetDataBuffer()"; + EnterResource<PPB_VideoFrame_API> enter(frame, true); + if (enter.failed()) + return NULL; + return enter.object()->GetDataBuffer(); +} + +uint32_t GetDataBufferSize(PP_Resource frame) { + VLOG(4) << "PPB_VideoFrame::GetDataBufferSize()"; + EnterResource<PPB_VideoFrame_API> enter(frame, true); + if (enter.failed()) + return 0; + return enter.object()->GetDataBufferSize(); +} + +const PPB_VideoFrame_0_1 g_ppb_videoframe_thunk_0_1 = { + &IsVideoFrame, + &GetTimestamp, + &SetTimestamp, + &GetFormat, + &GetSize, + &GetDataBuffer, + &GetDataBufferSize +}; + +} // namespace + +PPAPI_THUNK_EXPORT const PPB_VideoFrame_0_1* GetPPB_VideoFrame_0_1_Thunk() { + return &g_ppb_videoframe_thunk_0_1; +} + +} // namespace thunk +} // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_view_api.h b/chromium/ppapi/thunk/ppb_view_api.h index 756134422cb..8fb9386e073 100644 --- a/chromium/ppapi/thunk/ppb_view_api.h +++ b/chromium/ppapi/thunk/ppb_view_api.h @@ -27,6 +27,7 @@ class PPAPI_THUNK_EXPORT PPB_View_API { virtual PP_Bool GetClipRect(PP_Rect* clip) const = 0; virtual float GetDeviceScale() const = 0; virtual float GetCSSScale() const = 0; + virtual PP_Bool GetScrollOffset(PP_Point* offset) const = 0; }; } // namespace thunk diff --git a/chromium/ppapi/thunk/ppb_view_dev_thunk.cc b/chromium/ppapi/thunk/ppb_view_dev_thunk.cc index d3a637451ae..7ec98f924fb 100644 --- a/chromium/ppapi/thunk/ppb_view_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_view_dev_thunk.cc @@ -2,16 +2,14 @@ // 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 Thu Mar 28 11:12:59 2013. +// From dev/ppb_view_dev.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/dev/ppb_view_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_view_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -41,7 +39,7 @@ const PPB_View_Dev_0_1 g_ppb_view_dev_thunk_0_1 = { } // namespace -const PPB_View_Dev_0_1* GetPPB_View_Dev_0_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_View_Dev_0_1* GetPPB_View_Dev_0_1_Thunk() { return &g_ppb_view_dev_thunk_0_1; } diff --git a/chromium/ppapi/thunk/ppb_view_thunk.cc b/chromium/ppapi/thunk/ppb_view_thunk.cc index 3014099dda8..c6bd195cbde 100644 --- a/chromium/ppapi/thunk/ppb_view_thunk.cc +++ b/chromium/ppapi/thunk/ppb_view_thunk.cc @@ -2,16 +2,14 @@ // 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 Apr 10 14:15:15 2013. +// From ppb_view.idl modified Wed Jun 11 15:42:26 2014. #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_view.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_view_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -80,6 +78,14 @@ float GetCSSScale(PP_Resource resource) { return enter.object()->GetCSSScale(); } +PP_Bool GetScrollOffset(PP_Resource resource, struct PP_Point* offset) { + VLOG(4) << "PPB_View::GetScrollOffset()"; + EnterResource<PPB_View_API> enter(resource, true); + if (enter.failed()) + return PP_FALSE; + return enter.object()->GetScrollOffset(offset); +} + const PPB_View_1_0 g_ppb_view_thunk_1_0 = { &IsView, &GetRect, @@ -100,15 +106,31 @@ const PPB_View_1_1 g_ppb_view_thunk_1_1 = { &GetCSSScale }; +const PPB_View_1_2 g_ppb_view_thunk_1_2 = { + &IsView, + &GetRect, + &IsFullscreen, + &IsVisible, + &IsPageVisible, + &GetClipRect, + &GetDeviceScale, + &GetCSSScale, + &GetScrollOffset +}; + } // namespace -const PPB_View_1_0* GetPPB_View_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_View_1_0* GetPPB_View_1_0_Thunk() { return &g_ppb_view_thunk_1_0; } -const PPB_View_1_1* GetPPB_View_1_1_Thunk() { +PPAPI_THUNK_EXPORT const PPB_View_1_1* GetPPB_View_1_1_Thunk() { return &g_ppb_view_thunk_1_1; } +PPAPI_THUNK_EXPORT const PPB_View_1_2* GetPPB_View_1_2_Thunk() { + return &g_ppb_view_thunk_1_2; +} + } // namespace thunk } // namespace ppapi diff --git a/chromium/ppapi/thunk/ppb_websocket_thunk.cc b/chromium/ppapi/thunk/ppb_websocket_thunk.cc index 10406657383..fa7ed561643 100644 --- a/chromium/ppapi/thunk/ppb_websocket_thunk.cc +++ b/chromium/ppapi/thunk/ppb_websocket_thunk.cc @@ -2,17 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From ppb_websocket.idl modified Thu Feb 28 11:58:17 2013. +// From ppb_websocket.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_websocket.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_websocket_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -161,7 +159,7 @@ const PPB_WebSocket_1_0 g_ppb_websocket_thunk_1_0 = { } // namespace -const PPB_WebSocket_1_0* GetPPB_WebSocket_1_0_Thunk() { +PPAPI_THUNK_EXPORT const PPB_WebSocket_1_0* GetPPB_WebSocket_1_0_Thunk() { return &g_ppb_websocket_thunk_1_0; } diff --git a/chromium/ppapi/thunk/ppb_widget_dev_thunk.cc b/chromium/ppapi/thunk/ppb_widget_dev_thunk.cc index 2232371a69e..2b27d048dba 100644 --- a/chromium/ppapi/thunk/ppb_widget_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_widget_dev_thunk.cc @@ -2,16 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_widget_dev.idl modified Tue Apr 16 11:25:44 2013. +// From dev/ppb_widget_dev.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/dev/ppb_widget_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" +#include "ppapi/thunk/ppapi_thunk_export.h" #include "ppapi/thunk/ppb_widget_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -85,11 +83,11 @@ const PPB_Widget_Dev_0_4 g_ppb_widget_dev_thunk_0_4 = { } // namespace -const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() { return &g_ppb_widget_dev_thunk_0_3; } -const PPB_Widget_Dev_0_4* GetPPB_Widget_Dev_0_4_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Widget_Dev_0_4* GetPPB_Widget_Dev_0_4_Thunk() { return &g_ppb_widget_dev_thunk_0_4; } diff --git a/chromium/ppapi/thunk/ppb_zoom_dev_thunk.cc b/chromium/ppapi/thunk/ppb_zoom_dev_thunk.cc index ab0c874d107..6ff9fac6d80 100644 --- a/chromium/ppapi/thunk/ppb_zoom_dev_thunk.cc +++ b/chromium/ppapi/thunk/ppb_zoom_dev_thunk.cc @@ -2,15 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_zoom_dev.idl modified Wed Apr 24 13:31:08 2013. +// From dev/ppb_zoom_dev.idl modified Tue Aug 20 08:13:36 2013. #include "ppapi/c/dev/ppb_zoom_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" +#include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { namespace thunk { @@ -44,7 +42,7 @@ const PPB_Zoom_Dev_0_2 g_ppb_zoom_dev_thunk_0_2 = { } // namespace -const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() { return &g_ppb_zoom_dev_thunk_0_2; } diff --git a/chromium/ppapi/thunk/resource_creation_api.h b/chromium/ppapi/thunk/resource_creation_api.h index 61eaa973f02..90261667326 100644 --- a/chromium/ppapi/thunk/resource_creation_api.h +++ b/chromium/ppapi/thunk/resource_creation_api.h @@ -63,13 +63,21 @@ class ResourceCreationAPI { int32_t target_segment, uint32_t selection_start, uint32_t selection_end) = 0; - virtual PP_Resource CreateKeyboardInputEvent( + virtual PP_Resource CreateKeyboardInputEvent_1_0( PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers, uint32_t key_code, struct PP_Var character_text) = 0; + virtual PP_Resource CreateKeyboardInputEvent_1_2( + PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + struct PP_Var character_text, + struct PP_Var code) = 0; virtual PP_Resource CreateMouseInputEvent( PP_Instance instance, PP_InputEvent_Type type, @@ -84,9 +92,6 @@ class ResourceCreationAPI { PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers) = 0; - virtual PP_Resource CreateResourceArray(PP_Instance instance, - const PP_Resource elements[], - uint32_t size) = 0; virtual PP_Resource CreateTrueTypeFont( PP_Instance instance, const PP_TrueTypeFontDesc_Dev* desc) = 0; @@ -114,6 +119,7 @@ class ResourceCreationAPI { virtual PP_Resource CreateAudioConfig(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) = 0; + virtual PP_Resource CreateCompositor(PP_Instance instance) = 0; virtual PP_Resource CreateFileChooser(PP_Instance instance, PP_FileChooserMode_Dev mode, const PP_Var& accept_types) = 0; @@ -136,6 +142,7 @@ class ResourceCreationAPI { PP_ImageDataFormat format, const PP_Size* size, PP_Bool init_to_zero) = 0; + virtual PP_Resource CreateMediaStreamVideoTrack(PP_Instance instance) = 0; virtual PP_Resource CreateNetAddressFromIPv4Address( PP_Instance instance, const PP_NetAddress_IPv4* ipv4_addr) = 0; @@ -154,6 +161,7 @@ class ResourceCreationAPI { virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instace) = 0; virtual PP_Resource CreateUDPSocket(PP_Instance instace) = 0; virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instace) = 0; + virtual PP_Resource CreateVideoDecoder(PP_Instance instance) = 0; virtual PP_Resource CreateVideoDestination(PP_Instance instance) = 0; virtual PP_Resource CreateVideoSource(PP_Instance instance) = 0; virtual PP_Resource CreateWebSocket(PP_Instance instance) = 0; @@ -179,7 +187,7 @@ class ResourceCreationAPI { PP_Bool vertical) = 0; virtual PP_Resource CreateTalk(PP_Instance instance) = 0; virtual PP_Resource CreateVideoCapture(PP_Instance instance) = 0; - virtual PP_Resource CreateVideoDecoder( + virtual PP_Resource CreateVideoDecoderDev( PP_Instance instance, PP_Resource context3d_id, PP_VideoDecoder_Profile profile) = 0; diff --git a/chromium/ppapi/thunk/thunk.h b/chromium/ppapi/thunk/thunk.h index f454be7368b..3d4a77f3f77 100644 --- a/chromium/ppapi/thunk/thunk.h +++ b/chromium/ppapi/thunk/thunk.h @@ -12,23 +12,20 @@ // // const PPB_Foo* ppapi::thunk::GetPPB_Foo_Thunk(); // -#define IFACE(api_name, interface_name, InterfaceType) \ +#define PROXIED_IFACE(interface_name, InterfaceType) \ struct InterfaceType; \ namespace ppapi { namespace thunk { \ PPAPI_THUNK_EXPORT const InterfaceType* Get##InterfaceType##_Thunk(); \ } } -#define PROXIED_IFACE IFACE -#define UNPROXIED_IFACE IFACE #include "ppapi/thunk/interfaces_ppb_private.h" #include "ppapi/thunk/interfaces_ppb_private_no_permissions.h" #include "ppapi/thunk/interfaces_ppb_private_flash.h" #include "ppapi/thunk/interfaces_ppb_public_stable.h" #include "ppapi/thunk/interfaces_ppb_public_dev.h" +#include "ppapi/thunk/interfaces_ppb_public_dev_channel.h" -#undef UNPROXIED_IFACE #undef PROXIED_IFACE -#undef IFACE namespace ppapi { namespace thunk { |