PPAPI: Make PPP_MessageHandler work in PNaCl

ppapi/thunk/ppb_messaging_thunk.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.
 
-// From ppb_messaging.idl modified Thu May 29 15:54:46 2014.
+// From ppb_messaging.idl modified Wed Sep 10 15:41:14 2014.
 
+#include "ppapi/c/dev/ppb_messaging_deprecated.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_messaging.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
 void PostMessage(PP_Instance instance, struct PP_Var message) {
   VLOG(4) << "PPB_Messaging::PostMessage()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->PostMessage(instance, message);
 }
 
-int32_t RegisterMessageHandler(PP_Instance instance,
-                               void* user_data,
-                               const struct PPP_MessageHandler_0_1* handler,
-                               PP_Resource message_loop) {
+int32_t RegisterMessageHandler_1_1_Deprecated(
+    PP_Instance instance,
+    void* user_data,
+    const struct PPP_MessageHandler_0_1_Deprecated* handler,
+    PP_Resource message_loop) {
+  VLOG(4) << "PPB_Messaging::RegisterMessageHandler_1_1()";
+  EnterInstance enter(instance);
+  if (enter.failed())
+    return enter.retval();
+  return enter.functions()->RegisterMessageHandler_1_1_Deprecated(instance,
+                                                                  user_data,
+                                                                  handler,
+                                                                  message_loop);
+}
+
+int32_t RegisterMessageHandler_1_2(PP_Instance instance,
+                                   void* user_data,
+                                   const struct PPP_MessageHandler_0_2* handler,
+                                   PP_Resource message_loop) {
   VLOG(4) << "PPB_Messaging::RegisterMessageHandler()";
   EnterInstance enter(instance);
   if (enter.failed())
     return enter.retval();
   return enter.functions()->RegisterMessageHandler(instance,
                                                    user_data,
                                                    handler,
                                                    message_loop);
 }
 
 void UnregisterMessageHandler(PP_Instance instance) {
   VLOG(4) << "PPB_Messaging::UnregisterMessageHandler()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->UnregisterMessageHandler(instance);
 }
 
 const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = {
   &PostMessage
 };
 
-const PPB_Messaging_1_1 g_ppb_messaging_thunk_1_1 = {
+const PPB_Messaging_1_1_Deprecated g_ppb_messaging_thunk_1_1_deprecated = {
   &PostMessage,
-  &RegisterMessageHandler,
+  &RegisterMessageHandler_1_1_Deprecated,
   &UnregisterMessageHandler
 };
 
+const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = {
+  &PostMessage,
+  &RegisterMessageHandler_1_2,
+  &UnregisterMessageHandler
+};
+
 }  // namespace
 
 PPAPI_THUNK_EXPORT const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() {
   return &g_ppb_messaging_thunk_1_0;
 }
 
-PPAPI_THUNK_EXPORT const PPB_Messaging_1_1* GetPPB_Messaging_1_1_Thunk() {
-  return &g_ppb_messaging_thunk_1_1;
+PPAPI_THUNK_EXPORT
+const PPB_Messaging_1_1_Deprecated* GetPPB_Messaging_1_1_Deprecated_Thunk() {
+  return &g_ppb_messaging_thunk_1_1_deprecated;
+}
+
+PPAPI_THUNK_EXPORT const PPB_Messaging_1_2* GetPPB_Messaging_1_2_Thunk() {
+  return &g_ppb_messaging_thunk_1_2;
 }
 
 }  // namespace thunk
 }  // namespace ppapi