| Index: ppapi/proxy/ppb_instance_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
|
| index 5f0c163306a624c15b495279a352d5f0dbb66d92..373451237eb3dd105b87e54054757c6c5a144c3a 100644
|
| --- a/ppapi/proxy/ppb_instance_proxy.cc
|
| +++ b/ppapi/proxy/ppb_instance_proxy.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "ppapi/proxy/ppb_instance_proxy.h"
|
|
|
| +#include "build/build_config.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/pp_time.h"
|
| #include "ppapi/c/pp_var.h"
|
| @@ -14,6 +15,7 @@
|
| #include "ppapi/c/private/pp_content_decryptor.h"
|
| #include "ppapi/proxy/content_decryptor_private_serializer.h"
|
| #include "ppapi/proxy/enter_proxy.h"
|
| +#include "ppapi/proxy/flash_resource.h"
|
| #include "ppapi/proxy/gamepad_resource.h"
|
| #include "ppapi/proxy/host_dispatcher.h"
|
| #include "ppapi/proxy/plugin_dispatcher.h"
|
| @@ -313,6 +315,28 @@ thunk::PPB_Flash_API* PPB_Instance_Proxy::GetFlashAPI() {
|
| return static_cast<PPB_Flash_Proxy*>(ip);
|
| }
|
|
|
| +thunk::PPB_Flash_Functions_API* PPB_Instance_Proxy::GetFlashFunctionsAPI(
|
| + PP_Instance instance) {
|
| +#if !defined(OS_NACL) && !defined(NACL_WIN64)
|
| + InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
|
| + GetInstanceData(instance);
|
| + if (!data)
|
| + return NULL;
|
| +
|
| + if (!data->flash_resource.get()) {
|
| + Connection connection(
|
| + PluginGlobals::Get()->plugin_proxy_delegate()->GetBrowserSender(),
|
| + dispatcher());
|
| + data->flash_resource = new FlashResource(connection, instance);
|
| + }
|
| + return data->flash_resource.get();
|
| +#else
|
| + // Flash functions aren't implemented for nacl.
|
| + NOTIMPLEMENTED();
|
| + return NULL;
|
| +#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
|
| +}
|
| +
|
| thunk::PPB_Gamepad_API* PPB_Instance_Proxy::GetGamepadAPI(
|
| PP_Instance instance) {
|
| InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
|
|
|