Proxy PPB_Input_Event, PPP_Input_Event, and associated IFs.

src/shared/ppapi_proxy/browser_ppp_instance.cc

 // Copyright (c) 2011 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>
 #include <limits>
 
-// Include file order cannot be observed because ppp_instance declares a
-// structure return type that causes an error on Windows.
-// TODO(sehr, brettw): fix the return types and include order in PPAPI.
-#include "native_client/src/third_party/ppapi/c/pp_input_event.h"
-#include "native_client/src/third_party/ppapi/c/pp_resource.h"
-#include "native_client/src/third_party/ppapi/c/pp_var.h"
-#include "native_client/src/third_party/ppapi/c/ppp_instance.h"
-#include "srpcgen/ppp_rpc.h"
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/ppapi_proxy/browser_globals.h"
 #include "native_client/src/shared/ppapi_proxy/browser_ppp.h"
+#include "native_client/src/shared/ppapi_proxy/browser_ppp_input_event.h"
+#include "native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppp_rpc.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
+#include "native_client/src/third_party/ppapi/c/pp_input_event.h"
+#include "native_client/src/third_party/ppapi/c/pp_resource.h"
+#include "native_client/src/third_party/ppapi/c/pp_var.h"
+#include "native_client/src/third_party/ppapi/c/ppp_instance.h"
 
 using nacl::scoped_array;
 
 namespace ppapi_proxy {
 
 namespace {
 
 char* ArgArraySerialize(int argc,
                         const char* array[],
                         uint32_t* serial_size) {
@@ skipping 56 matching lines @@
   DebugPrintf("PPP_Instance::DidCreate: %s\n",
               NaClSrpcErrorString(srpc_result));
   if (srpc_result != NACL_SRPC_RESULT_OK) {
     return PP_FALSE;
   }
   return static_cast<PP_Bool>(success != 0);
 }
 
 void DidDestroy(PP_Instance instance) {
   DebugPrintf("PPP_Instance::DidDestroy: instance=%"NACL_PRIu32"\n", instance);
+  // Inform BrowserInputEvent that the instance was destroyed.
+  // TODO(NaCl team): It would probably make sense to use observer pattern for
+  // instance creation/deletion events if we have much of this kind of stuff.
+  BrowserInputEvent::InstanceDestroyed(instance);
   NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidDestroy(
       GetMainSrpcChannel(instance), instance);
   DebugPrintf("PPP_Instance::DidDestroy: %s\n",
               NaClSrpcErrorString(srpc_result));
 }
 
 void DidChangeView(PP_Instance instance,
                    const PP_Rect* position,
                    const PP_Rect* clip) {
   DebugPrintf("PPP_Instance::DidChangeView: instance=%"NACL_PRIu32"\n",
@@ skipping 79 matching lines @@
     DidDestroy,
     DidChangeView,
     DidChangeFocus,
     HandleInputEvent,
     HandleDocumentLoad
   };
   return &instance_interface;
 }
 
 }  // namespace ppapi_proxy