Remove the proxy callback tracker.

ppapi/proxy/ppb_instance_proxy.h

Index: ppapi/proxy/ppb_instance_proxy.h
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index b22b6d1d21f360f0f488fe22c368a00ba2424797..0fb2a531fb781ef3a0dde2d6f1d31fd016d59f96 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -8,12 +8,19 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
+#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/instance_impl.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 
+// Windows headers interfere with this file.
+#ifdef PostMessage
+#undef PostMessage

[viettrungluu, 2011/10/20 23:29:46]

This makes this header incompatible with using Windows's PostMessage, which is
unfortunate. Probably we can make this file compile properly on Windows by
renaming ppapi::thunk::PPB_Instance_FunctionAPI's PostMessage method.

Users of ppb_messaging.h are potentially more screwed. Maybe we should do
something like:

#ifdef PostMessage
#error "crap"
#endif

(I'd suggest "#warning", but that's apparently nonstandard.)

Let's deal with this in a separate CL.

+#endif
+
 namespace ppapi {
 namespace proxy {
 
@@ -99,7 +106,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   static const InterfaceID kInterfaceID = INTERFACE_ID_PPB_INSTANCE;
 
  private:
-  // Message handlers.
+  // Plugin -> Host message handlers.
   void OnMsgGetWindowObject(PP_Instance instance,
                             SerializedVarReturnValue result);
   void OnMsgGetOwnerElementObject(PP_Instance instance,
@@ -140,8 +147,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                              uint32_t event_classes);
   void OnMsgPostMessage(PP_Instance instance,
                         SerializedVarReceiveInput message);
-  void OnMsgLockMouse(PP_Instance instance,
-                      uint32_t serialized_callback);
+  void OnMsgLockMouse(PP_Instance instance);
   void OnMsgUnlockMouse(PP_Instance instance);
   void OnMsgResolveRelativeToDocument(PP_Instance instance,
                                       SerializedVarReceiveInput relative,
@@ -156,6 +162,14 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                            SerializedVarReturnValue result);
   void OnMsgGetPluginInstanceURL(PP_Instance instance,
                                  SerializedVarReturnValue result);
+
+  // Host -> Plugin message handlers.
+  void OnMsgMouseLockComplete(PP_Instance instance, int32_t result);
+
+  void MouseLockCompleteInHost(int32_t result, PP_Instance instance);
+
+  pp::CompletionCallbackFactory<PPB_Instance_Proxy,
+                                ProxyNonThreadSafeRefCount> callback_factory_;
 };
 
 }  // namespace proxy