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

src/shared/ppapi_proxy/browser_ppp_instance.cc

 /*
  * Copyright 2010 The Native Client 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 "native_client/src/shared/ppapi_proxy/browser_ppp_instance.h"
 
 #include <stdio.h>
 #include <string.h>
@@ skipping 52 matching lines @@
     strncpy(serial_array + pos, array[i], len);
     pos += len;
   }
   return serial_array;
 }
 
 PP_Bool DidCreate(PP_Instance instance,
                   uint32_t argc,
                   const char* argn[],
                   const char* argv[]) {
-  DebugPrintf("Browser::PPP_Instance::DidCreate(%"NACL_PRId64")\n", instance);
+  DebugPrintf("Browser::PPP_Instance::DidCreate(%"NACL_PRId32")\n", instance);

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

Is PP_Instance 32 bit or is this left over from the other CL to convert 64->32 ?

[polina, 2010/12/23 21:58:30]

Same question. I think this is premature.

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

Whoops, stale edit.  Done.
On 2010/12/23 21:37:00, nfullagar wrote:

   uint32_t argn_size;
   scoped_array<char> argn_serial(ArgArraySerialize(argc, argn, &argn_size));
   if (argn_serial.get() == NULL) {
     return PP_FALSE;
   }
   uint32_t argv_size;
   scoped_array<char> argv_serial(ArgArraySerialize(argc, argv, &argv_size));
   if (argv_serial.get() == NULL) {
     return PP_FALSE;
   }
   NaClSrpcChannel* channel = LookupBrowserPppForInstance(instance)->channel();
   int32_t int_argc = static_cast<int32_t>(argc);
   int32_t success;
   NaClSrpcError retval =
       PppInstanceRpcClient::PPP_Instance_DidCreate(channel,
                                                    instance,
                                                    int_argc,
                                                    argn_size,
                                                    argn_serial.get(),
                                                    argv_size,
                                                    argv_serial.get(),
                                                    &success);
   if (retval != NACL_SRPC_RESULT_OK) {
     return PP_FALSE;
   }
   return static_cast<PP_Bool>(success != 0);
 }
 
 void DidDestroy(PP_Instance instance) {
-  DebugPrintf("Browser::PPP_Instance::Delete(%"NACL_PRId64")\n", instance);
+  DebugPrintf("Browser::PPP_Instance::Delete(%"NACL_PRId32")\n", instance);
   NaClSrpcChannel* channel = LookupBrowserPppForInstance(instance)->channel();
   (void) PppInstanceRpcClient::PPP_Instance_DidDestroy(channel, instance);
 }
 
 void DidChangeView(PP_Instance instance,
                    const PP_Rect* position,
                    const PP_Rect* clip) {
-  DebugPrintf("Browser::PPP_Instance::DidChangeView(%"NACL_PRId64")\n",
+  DebugPrintf("Browser::PPP_Instance::DidChangeView(%"NACL_PRId32")\n",
               instance);
   NaClSrpcChannel* channel = LookupBrowserPppForInstance(instance)->channel();
   int32_t position_array[4];
   const uint32_t kPositionArraySize = NACL_ARRAY_SIZE(position_array);
   position_array[0] = position->point.x;
   position_array[1] = position->point.y;
   position_array[2] = position->size.width;
   position_array[3] = position->size.height;
   int32_t clip_array[4];
   const uint32_t kClipArraySize = NACL_ARRAY_SIZE(clip_array);
   clip_array[0] = clip->point.x;
   clip_array[1] = clip->point.y;
   clip_array[2] = clip->size.width;
   clip_array[3] = clip->size.height;
   (void) PppInstanceRpcClient::PPP_Instance_DidChangeView(channel,
                                                           instance,
                                                           kPositionArraySize,
                                                           position_array,
                                                           kClipArraySize,
                                                           clip_array);
 }
 
 void DidChangeFocus(PP_Instance instance, PP_Bool has_focus) {
-  DebugPrintf("Browser::PPP_Instance::DidChangeFocus(%"NACL_PRId64")\n",
+  DebugPrintf("Browser::PPP_Instance::DidChangeFocus(%"NACL_PRId32")\n",
               instance);
   NaClSrpcChannel* channel = LookupBrowserPppForInstance(instance)->channel();
   // DidChangeFocus() always succeeds, no need to check the SRPC return value.
   (void) PppInstanceRpcClient::PPP_Instance_DidChangeFocus(channel,
       instance, static_cast<bool>(PP_TRUE == has_focus));
 }
 
 PP_Bool HandleInputEvent(PP_Instance instance, const PP_InputEvent* event) {
-  DebugPrintf("Browser::PPP_Instance::HandleInputEvent(%"NACL_PRId64")\n",
+  DebugPrintf("Browser::PPP_Instance::HandleInputEvent(%"NACL_PRId32")\n",
               instance);
   NaClSrpcChannel* channel = LookupBrowserPppForInstance(instance)->channel();
   int32_t success;
   char* event_data = const_cast<char*>(reinterpret_cast<const char*>(event));
   NaClSrpcError retval =
       PppInstanceRpcClient::PPP_Instance_HandleInputEvent(channel,
                                                           instance,
                                                           sizeof(*event),
                                                           event_data,
                                                           &success);
   if (retval != NACL_SRPC_RESULT_OK) {
     return PP_FALSE;
   }
   return static_cast<PP_Bool>(success != 0);
 }
 
 PP_Bool HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader) {
-  DebugPrintf("Browser::PPP_Instance::HandleDocumentLoad(%"NACL_PRId64")\n",
+  DebugPrintf("Browser::PPP_Instance::HandleDocumentLoad(%"NACL_PRId32")\n",
               instance);
   // TODO(sehr): implement HandleDocumentLoad.
   UNREFERENCED_PARAMETER(instance);
   UNREFERENCED_PARAMETER(url_loader);
   return PP_FALSE;
 }
 
 PP_Var GetInstanceObject(PP_Instance instance) {
-  DebugPrintf("Browser::PPP_Instance::GetInstanceObject(%"NACL_PRId64")\n",
+  DebugPrintf("Browser::PPP_Instance::GetInstanceObject(%"NACL_PRId32")\n",
               instance);
   NaClSrpcChannel* channel = LookupBrowserPppForInstance(instance)->channel();
   ObjectCapability capability;
   uint32_t capability_bytes = static_cast<uint32_t>(sizeof(capability));
   NaClSrpcError retval =
       PppInstanceRpcClient::PPP_Instance_GetInstanceObject(
           channel,
           instance,
           &capability_bytes,
           reinterpret_cast<char*>(&capability));
@@ skipping 11 matching lines @@
     DidChangeView,
     DidChangeFocus,
     HandleInputEvent,
     HandleDocumentLoad,
     GetInstanceObject
   };
   return &instance_interface;
 }
 
 }  // namespace ppapi_proxy