Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Side by Side Diff: ppapi/thunk/ppb_messaging_thunk.cc

Issue 1014723007: Remove deprecated PPB_Messaging_1_1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert change to histograms.xml Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ppapi/thunk/ppb_instance_api.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // From ppb_messaging.idl modified Wed Sep 10 15:41:14 2014. 5 // From ppb_messaging.idl modified Tue Mar 24 16:53:47 2015.
6 6
7 #include "ppapi/c/dev/ppb_messaging_deprecated.h"
8 #include "ppapi/c/pp_errors.h" 7 #include "ppapi/c/pp_errors.h"
9 #include "ppapi/c/ppb_messaging.h" 8 #include "ppapi/c/ppb_messaging.h"
10 #include "ppapi/shared_impl/tracked_callback.h" 9 #include "ppapi/shared_impl/tracked_callback.h"
11 #include "ppapi/thunk/enter.h" 10 #include "ppapi/thunk/enter.h"
12 #include "ppapi/thunk/ppapi_thunk_export.h" 11 #include "ppapi/thunk/ppapi_thunk_export.h"
13 12
14 namespace ppapi { 13 namespace ppapi {
15 namespace thunk { 14 namespace thunk {
16 15
17 namespace { 16 namespace {
18 17
19 void PostMessage(PP_Instance instance, struct PP_Var message) { 18 void PostMessage(PP_Instance instance, struct PP_Var message) {
20 VLOG(4) << "PPB_Messaging::PostMessage()"; 19 VLOG(4) << "PPB_Messaging::PostMessage()";
21 EnterInstance enter(instance); 20 EnterInstance enter(instance);
22 if (enter.failed()) 21 if (enter.failed())
23 return; 22 return;
24 enter.functions()->PostMessage(instance, message); 23 enter.functions()->PostMessage(instance, message);
25 } 24 }
26 25
27 int32_t RegisterMessageHandler_1_1_Deprecated( 26 int32_t RegisterMessageHandler(PP_Instance instance,
28 PP_Instance instance, 27 void* user_data,
29 void* user_data, 28 const struct PPP_MessageHandler_0_2* handler,
30 const struct PPP_MessageHandler_0_1_Deprecated* handler, 29 PP_Resource message_loop) {
31 PP_Resource message_loop) {
32 VLOG(4) << "PPB_Messaging::RegisterMessageHandler_1_1()";
33 EnterInstance enter(instance);
34 if (enter.failed())
35 return enter.retval();
36 return enter.functions()->RegisterMessageHandler_1_1_Deprecated(instance,
37 user_data,
38 handler,
39 message_loop);
40 }
41
42 int32_t RegisterMessageHandler_1_2(PP_Instance instance,
43 void* user_data,
44 const struct PPP_MessageHandler_0_2* handler,
45 PP_Resource message_loop) {
46 VLOG(4) << "PPB_Messaging::RegisterMessageHandler()"; 30 VLOG(4) << "PPB_Messaging::RegisterMessageHandler()";
47 EnterInstance enter(instance); 31 EnterInstance enter(instance);
48 if (enter.failed()) 32 if (enter.failed())
49 return enter.retval(); 33 return enter.retval();
50 return enter.functions()->RegisterMessageHandler(instance, 34 return enter.functions()->RegisterMessageHandler(instance, user_data, handler,
51 user_data,
52 handler,
53 message_loop); 35 message_loop);
54 } 36 }
55 37
56 void UnregisterMessageHandler(PP_Instance instance) { 38 void UnregisterMessageHandler(PP_Instance instance) {
57 VLOG(4) << "PPB_Messaging::UnregisterMessageHandler()"; 39 VLOG(4) << "PPB_Messaging::UnregisterMessageHandler()";
58 EnterInstance enter(instance); 40 EnterInstance enter(instance);
59 if (enter.failed()) 41 if (enter.failed())
60 return; 42 return;
61 enter.functions()->UnregisterMessageHandler(instance); 43 enter.functions()->UnregisterMessageHandler(instance);
62 } 44 }
63 45
64 const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = { 46 const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = {&PostMessage};
65 &PostMessage
66 };
67 47
68 const PPB_Messaging_1_1_Deprecated g_ppb_messaging_thunk_1_1_deprecated = { 48 const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = {&PostMessage,
69 &PostMessage, 49 &RegisterMessageHandler,
70 &RegisterMessageHandler_1_1_Deprecated, 50 &UnregisterMessageHandler};
71 &UnregisterMessageHandler
72 };
73
74 const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = {
75 &PostMessage,
76 &RegisterMessageHandler_1_2,
77 &UnregisterMessageHandler
78 };
79 51
80 } // namespace 52 } // namespace
81 53
82 PPAPI_THUNK_EXPORT const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() { 54 PPAPI_THUNK_EXPORT const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() {
83 return &g_ppb_messaging_thunk_1_0; 55 return &g_ppb_messaging_thunk_1_0;
84 } 56 }
85 57
86 PPAPI_THUNK_EXPORT
87 const PPB_Messaging_1_1_Deprecated* GetPPB_Messaging_1_1_Deprecated_Thunk() {
88 return &g_ppb_messaging_thunk_1_1_deprecated;
89 }
90
91 PPAPI_THUNK_EXPORT const PPB_Messaging_1_2* GetPPB_Messaging_1_2_Thunk() { 58 PPAPI_THUNK_EXPORT const PPB_Messaging_1_2* GetPPB_Messaging_1_2_Thunk() {
92 return &g_ppb_messaging_thunk_1_2; 59 return &g_ppb_messaging_thunk_1_2;
93 } 60 }
94 61
95 } // namespace thunk 62 } // namespace thunk
96 } // namespace ppapi 63 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/thunk/ppb_instance_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698