Delete FunctionGroupBase from Pepper.

ppapi/proxy/ppb_instance_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_instance_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_audio_config.h"
@@ skipping 14 matching lines @@
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
 // Windows headers interfere with this file.
 #ifdef PostMessage
 #undef PostMessage
 #endif
 
 using ppapi::thunk::EnterInstanceNoLock;
 using ppapi::thunk::EnterResourceNoLock;
-using ppapi::thunk::PPB_Instance_FunctionAPI;
+using ppapi::thunk::PPB_Instance_API;
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 InterfaceProxy* CreateInstanceProxy(Dispatcher* dispatcher) {
   return new PPB_Instance_Proxy(dispatcher);
 }
 
@@ skipping 103 matching lines @@
 
     // Host -> Plugin messages.
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBInstance_MouseLockComplete,
                         OnPluginMsgMouseLockComplete)
 
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-PPB_Instance_FunctionAPI* PPB_Instance_Proxy::AsPPB_Instance_FunctionAPI() {
-  return this;
-}
-
 PP_Bool PPB_Instance_Proxy::BindGraphics(PP_Instance instance,
                                          PP_Resource device) {
   Resource* object =
       PpapiGlobals::Get()->GetResourceTracker()->GetResource(device);
   if (!object || object->pp_instance() != instance)
     return PP_FALSE;
 
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_BindGraphics(
       API_ID_PPB_INSTANCE, instance, object->host_resource(),
@@ skipping 449 matching lines @@
 
 void PPB_Instance_Proxy::OnHostMsgPostMessage(
     PP_Instance instance,
     SerializedVarReceiveInput message) {
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded())
     enter.functions()->PostMessage(instance, message.Get(dispatcher()));
 }
 
 void PPB_Instance_Proxy::OnHostMsgLockMouse(PP_Instance instance) {
-  EnterHostFunctionForceCallback<PPB_Instance_FunctionAPI> enter(
-      instance,
-      callback_factory_.NewCallback(
-          &PPB_Instance_Proxy::MouseLockCompleteInHost,
-          instance));
-  if (enter.succeeded())
-    enter.SetResult(enter.functions()->LockMouse(instance, enter.callback()));
+  // Need to be careful to always issue the callback.
+  pp::CompletionCallback cb = callback_factory_.NewCallback(

[brettw, 2012/04/21 19:50:01]

This changed because I deleted EnterHostFunctionForceCallback since this was the
only place that class was used and I don't expect other cases (since I don't
think we should have callbacks without a resource).

+      &PPB_Instance_Proxy::MouseLockCompleteInHost, instance);
+
+  EnterInstanceNoLock enter(instance);
+  if (enter.failed()) {
+    cb.Run(PP_ERROR_BADARGUMENT);
+    return;
+  }
+  int32_t result = enter.functions()->LockMouse(instance,
+                                                cb.pp_completion_callback());
+  if (result != PP_OK_COMPLETIONPENDING)
+    cb.Run(result);
 }
 
 void PPB_Instance_Proxy::OnHostMsgUnlockMouse(PP_Instance instance) {
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded())
     enter.functions()->UnlockMouse(instance);
 }
 
 #if !defined(OS_NACL)
 void PPB_Instance_Proxy::OnHostMsgResolveRelativeToDocument(
@@ skipping 109 matching lines @@
 }
 
 void PPB_Instance_Proxy::MouseLockCompleteInHost(int32_t result,
                                                  PP_Instance instance) {
   dispatcher()->Send(new PpapiMsg_PPBInstance_MouseLockComplete(
       API_ID_PPB_INSTANCE, instance, result));
 }
 
 }  // namespace proxy
 }  // namespace ppapi