| Index: ppapi/proxy/ppb_instance_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_instance_proxy.cc (revision 161336)
|
| +++ ppapi/proxy/ppb_instance_proxy.cc (working copy)
|
| @@ -96,10 +96,13 @@
|
| // This must happen OUTSIDE of ExecuteScript since the SerializedVars use
|
| // the dispatcher upon return of the function (converting the
|
| // SerializedVarReturnValue/OutParam to a SerializedVar in the destructor).
|
| +#if !defined(OS_NACL)
|
| ScopedModuleReference death_grip(dispatcher());
|
| +#endif
|
|
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(PPB_Instance_Proxy, msg)
|
| +#if !defined(OS_NACL)
|
| // Plugin -> Host messages.
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_GetWindowObject,
|
| OnHostMsgGetWindowObject)
|
| @@ -145,8 +148,6 @@
|
| OnHostMsgCancelCompositionText)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_UpdateSurroundingText,
|
| OnHostMsgUpdateSurroundingText)
|
| -
|
| -#if !defined(OS_NACL)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument,
|
| OnHostMsgResolveRelativeToDocument)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_DocumentCanRequest,
|
| @@ -686,6 +687,7 @@
|
| API_ID_PPB_INSTANCE, instance, text, caret, anchor));
|
| }
|
|
|
| +#if !defined(OS_NACL)
|
| void PPB_Instance_Proxy::OnHostMsgGetWindowObject(
|
| PP_Instance instance,
|
| SerializedVarReturnValue result) {
|
| @@ -1026,6 +1028,7 @@
|
| anchor);
|
| }
|
| }
|
| +#endif // !defined(OS_NACL)
|
|
|
| void PPB_Instance_Proxy::OnPluginMsgMouseLockComplete(PP_Instance instance,
|
| int32_t result) {
|
| @@ -1041,11 +1044,13 @@
|
| TrackedCallback::ClearAndRun(&(data->mouse_lock_callback), result);
|
| }
|
|
|
| +#if !defined(OS_NACL)
|
| void PPB_Instance_Proxy::MouseLockCompleteInHost(int32_t result,
|
| PP_Instance instance) {
|
| dispatcher()->Send(new PpapiMsg_PPBInstance_MouseLockComplete(
|
| API_ID_PPB_INSTANCE, instance, result));
|
| }
|
| +#endif // !defined(OS_NACL)
|
|
|
| void PPB_Instance_Proxy::CancelAnyPendingRequestSurroundingText(
|
| PP_Instance instance) {
|
|
|