Convert srpc definitions from using int64 to using PP_Instance, PP_Module, an...

src/shared/ppapi_proxy/browser_ppb_instance_rpc_server.cc

Index: src/shared/ppapi_proxy/browser_ppb_instance_rpc_server.cc
===================================================================
--- src/shared/ppapi_proxy/browser_ppb_instance_rpc_server.cc	(revision 4034)
+++ src/shared/ppapi_proxy/browser_ppb_instance_rpc_server.cc	(working copy)
@@ -13,7 +13,7 @@
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
     // inputs
-    int64_t instance,
+    PP_Instance instance,
     // outputs
     nacl_abi_size_t* window_size, char* window_bytes) {
   NACL_UNTESTED();
@@ -21,8 +21,7 @@
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
 
   PP_Var window =
-      ppapi_proxy::PPBInstanceInterface()->GetWindowObject(
-          static_cast<PP_Instance>(instance));
+      ppapi_proxy::PPBInstanceInterface()->GetWindowObject(instance);
   if (!ppapi_proxy::SerializeTo(&window, window_bytes, window_size))
     return;
 
@@ -33,7 +32,7 @@
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
     // inputs
-    int64_t instance,
+    PP_Instance instance,
     // outputs
     nacl_abi_size_t* owner_size, char* owner_bytes) {
   NACL_UNTESTED();
@@ -41,8 +40,7 @@
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
 
   PP_Var owner =
-      ppapi_proxy::PPBInstanceInterface()->GetOwnerElementObject(
-          static_cast<PP_Instance>(instance));
+      ppapi_proxy::PPBInstanceInterface()->GetOwnerElementObject(instance);
   if (!ppapi_proxy::SerializeTo(&owner, owner_bytes, owner_size))
     return;
 
@@ -53,8 +51,8 @@
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
     // inputs
-    int64_t instance,
-    int64_t graphics_device,
+    PP_Instance instance,
+    PP_Resource graphics_device,
     // outputs
     int32_t* success) {
   NACL_UNTESTED();
@@ -63,8 +61,8 @@
 
   PP_Bool pp_success =
       ppapi_proxy::PPBInstanceInterface()->BindGraphics(
-          static_cast<PP_Instance>(instance),
-          static_cast<PP_Resource>(graphics_device));
+        instance,
+        graphics_device);
   *success = (pp_success == PP_TRUE);
 
   rpc->result = NACL_SRPC_RESULT_OK;
@@ -74,7 +72,7 @@
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
     // inputs
-    int64_t instance,
+    PP_Instance instance,
     // outputs
     int32_t* is_full_frame) {
   NACL_UNTESTED();
@@ -82,8 +80,7 @@
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
 
   PP_Bool pp_is_full_frame =
-      ppapi_proxy::PPBInstanceInterface()->IsFullFrame(
-          static_cast<PP_Instance>(instance));
+      ppapi_proxy::PPBInstanceInterface()->IsFullFrame(instance);
   *is_full_frame = (pp_is_full_frame == PP_TRUE);
 
   rpc->result = NACL_SRPC_RESULT_OK;
@@ -93,7 +90,7 @@
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
     // inputs
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t script_size, char* script_bytes,
     nacl_abi_size_t exception_in_size, char* exception_in_bytes,
     // outputs
@@ -113,7 +110,7 @@
     return;
   PP_Var result =
       ppapi_proxy::PPBInstanceInterface()->ExecuteScript(
-          static_cast<PP_Instance>(instance),
+          instance,

[nfullagar, 2010/12/23 21:37:00]

line above and two below could fit on one line?

[noelallen_use_chromium, 2010/12/23 22:23:23]

Done.

           script,
           &exception);
   if (!ppapi_proxy::SerializeTo(&result, result_bytes, result_size))