| Index: ppapi/proxy/ppb_instance_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_instance_proxy.cc (revision 99979)
|
| +++ ppapi/proxy/ppb_instance_proxy.cc (working copy)
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ppapi/c/dev/ppb_fullscreen_dev.h"
|
| #include "ppapi/c/pp_var.h"
|
| +#include "ppapi/c/ppb_fullscreen.h"
|
| #include "ppapi/c/ppb_instance.h"
|
| #include "ppapi/c/ppb_messaging.h"
|
| #include "ppapi/proxy/host_dispatcher.h"
|
| @@ -97,6 +98,17 @@
|
| const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoFullscreen() {
|
| static const Info info = {
|
| ppapi::thunk::GetPPB_Fullscreen_Thunk(),
|
| + PPB_FULLSCREEN_INTERFACE,
|
| + INTERFACE_ID_NONE, // 1_0 is the canonical one.
|
| + false,
|
| + &CreateInstanceProxy,
|
| + };
|
| + return &info;
|
| +}
|
| +
|
| +const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoFullscreen_Dev() {
|
| + static const Info info = {
|
| + ppapi::thunk::GetPPB_Fullscreen_Dev_Thunk(),
|
| PPB_FULLSCREEN_DEV_INTERFACE,
|
| INTERFACE_ID_NONE, // 1_0 is the canonical one.
|
| false,
|
| @@ -128,8 +140,12 @@
|
| OnMsgPostMessage)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_SetFullscreen,
|
| OnMsgSetFullscreen)
|
| + IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_SetFullscreen_Dev,
|
| + OnMsgSetFullscreen_Dev)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_GetScreenSize,
|
| OnMsgGetScreenSize)
|
| + IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_GetScreenSize_Dev,
|
| + OnMsgGetScreenSize_Dev)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_RequestInputEvents,
|
| OnMsgRequestInputEvents)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_ClearInputEvents,
|
| @@ -199,6 +215,10 @@
|
| return data->fullscreen;
|
| }
|
|
|
| +PP_Bool PPB_Instance_Proxy::IsFullscreen_Dev(PP_Instance instance) {
|
| + return IsFullscreen(instance);
|
| +}
|
| +
|
| PP_Bool PPB_Instance_Proxy::SetFullscreen(PP_Instance instance,
|
| PP_Bool fullscreen) {
|
| PP_Bool result = PP_FALSE;
|
| @@ -207,6 +227,14 @@
|
| return result;
|
| }
|
|
|
| +PP_Bool PPB_Instance_Proxy::SetFullscreen_Dev(PP_Instance instance,
|
| + PP_Bool fullscreen) {
|
| + PP_Bool result = PP_FALSE;
|
| + dispatcher()->Send(new PpapiHostMsg_PPBInstance_SetFullscreen_Dev(
|
| + INTERFACE_ID_PPB_INSTANCE, instance, fullscreen, &result));
|
| + return result;
|
| +}
|
| +
|
| PP_Bool PPB_Instance_Proxy::GetScreenSize(PP_Instance instance,
|
| PP_Size* size) {
|
| PP_Bool result = PP_FALSE;
|
| @@ -215,6 +243,14 @@
|
| return result;
|
| }
|
|
|
| +PP_Bool PPB_Instance_Proxy::GetScreenSize_Dev(PP_Instance instance,
|
| + PP_Size* size) {
|
| + PP_Bool result = PP_FALSE;
|
| + dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetScreenSize_Dev(
|
| + INTERFACE_ID_PPB_INSTANCE, instance, &result, size));
|
| + return result;
|
| +}
|
| +
|
| int32_t PPB_Instance_Proxy::RequestInputEvents(PP_Instance instance,
|
| uint32_t event_classes) {
|
| dispatcher()->Send(new PpapiHostMsg_PPBInstance_RequestInputEvents(
|
| @@ -332,6 +368,14 @@
|
| *result = enter.functions()->SetFullscreen(instance, fullscreen);
|
| }
|
|
|
| +void PPB_Instance_Proxy::OnMsgSetFullscreen_Dev(PP_Instance instance,
|
| + PP_Bool fullscreen,
|
| + PP_Bool* result) {
|
| + EnterFunctionNoLock<PPB_Instance_FunctionAPI> enter(instance, false);
|
| + if (enter.succeeded())
|
| + *result = enter.functions()->SetFullscreen_Dev(instance, fullscreen);
|
| +}
|
| +
|
| void PPB_Instance_Proxy::OnMsgGetScreenSize(PP_Instance instance,
|
| PP_Bool* result,
|
| PP_Size* size) {
|
| @@ -340,6 +384,14 @@
|
| *result = enter.functions()->GetScreenSize(instance, size);
|
| }
|
|
|
| +void PPB_Instance_Proxy::OnMsgGetScreenSize_Dev(PP_Instance instance,
|
| + PP_Bool* result,
|
| + PP_Size* size) {
|
| + EnterFunctionNoLock<PPB_Instance_FunctionAPI> enter(instance, false);
|
| + if (enter.succeeded())
|
| + *result = enter.functions()->GetScreenSize_Dev(instance, size);
|
| +}
|
| +
|
| void PPB_Instance_Proxy::OnMsgRequestInputEvents(PP_Instance instance,
|
| bool is_filtering,
|
| uint32_t event_classes) {
|
|
|