OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ | 5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ |
6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ | 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ |
7 | 7 |
8 #include <stdarg.h> | 8 #include <stdarg.h> |
9 | 9 |
10 #include "native_client/src/include/nacl_macros.h" | 10 #include "native_client/src/include/nacl_macros.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 public: | 30 public: |
31 BrowserPpp(NaClSrpcChannel* main_channel, plugin::Plugin* plugin) | 31 BrowserPpp(NaClSrpcChannel* main_channel, plugin::Plugin* plugin) |
32 : main_channel_(main_channel), | 32 : main_channel_(main_channel), |
33 is_nexe_alive_(true), | 33 is_nexe_alive_(true), |
34 plugin_pid_(0), | 34 plugin_pid_(0), |
35 plugin_(plugin), | 35 plugin_(plugin), |
36 ppp_instance_interface_(NULL), | 36 ppp_instance_interface_(NULL), |
37 ppp_messaging_interface_(NULL), | 37 ppp_messaging_interface_(NULL), |
38 ppp_input_event_interface_(NULL) { | 38 ppp_input_event_interface_(NULL) { |
39 CHECK(main_channel_ != NULL); | 39 CHECK(main_channel_ != NULL); |
| 40 upcall_thread_.tid = 0; |
40 } | 41 } |
41 | 42 |
42 ~BrowserPpp() {} | 43 ~BrowserPpp() {} |
43 | 44 |
44 int32_t InitializeModule(PP_Module module_id, | 45 int32_t InitializeModule(PP_Module module_id, |
45 PPB_GetInterface get_browser_interface); | 46 PPB_GetInterface get_browser_interface); |
46 | 47 |
47 // Joins upcall thread, drops references to channel (owned by plugin), | 48 // Joins upcall thread, drops references to channel (owned by plugin), |
48 // calls plugin side shutdown, but not user's PPP_ShutdownModule. | 49 // calls plugin side shutdown, but not user's PPP_ShutdownModule. |
49 void ShutdownModule(); | 50 void ShutdownModule(); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 const PPP_InputEvent* ppp_input_event_interface_; | 94 const PPP_InputEvent* ppp_input_event_interface_; |
94 | 95 |
95 // The thread used to handle calls on other than the main thread. | 96 // The thread used to handle calls on other than the main thread. |
96 struct NaClThread upcall_thread_; | 97 struct NaClThread upcall_thread_; |
97 NACL_DISALLOW_COPY_AND_ASSIGN(BrowserPpp); | 98 NACL_DISALLOW_COPY_AND_ASSIGN(BrowserPpp); |
98 }; | 99 }; |
99 | 100 |
100 } // namespace ppapi_proxy | 101 } // namespace ppapi_proxy |
101 | 102 |
102 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ | 103 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ |
OLD | NEW |