OLD | NEW |
1 /* -*- c++ -*- */ | 1 /* -*- c++ -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 // A class containing information regarding a socket connection to a | 8 // A class containing information regarding a socket connection to a |
9 // service runtime instance. | 9 // service runtime instance. |
10 | 10 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 OpenManifestEntryAsyncCallback* callback) | 82 OpenManifestEntryAsyncCallback* callback) |
83 : url(target_url), | 83 : url(target_url), |
84 file_info(finfo), | 84 file_info(finfo), |
85 op_complete_ptr(op_complete), | 85 op_complete_ptr(op_complete), |
86 callback(callback) {} | 86 callback(callback) {} |
87 ~OpenManifestEntryResource(); | 87 ~OpenManifestEntryResource(); |
88 void MaybeRunCallback(int32_t pp_error); | 88 void MaybeRunCallback(int32_t pp_error); |
89 | 89 |
90 std::string url; | 90 std::string url; |
91 struct NaClFileInfo* file_info; | 91 struct NaClFileInfo* file_info; |
| 92 PP_NaClFileInfo pp_file_info; |
92 bool* op_complete_ptr; | 93 bool* op_complete_ptr; |
93 OpenManifestEntryAsyncCallback* callback; | 94 OpenManifestEntryAsyncCallback* callback; |
94 }; | 95 }; |
95 | 96 |
96 // Do not invoke from the main thread, since the main methods will | 97 // Do not invoke from the main thread, since the main methods will |
97 // invoke CallOnMainThread and then wait on a condvar for the task to | 98 // invoke CallOnMainThread and then wait on a condvar for the task to |
98 // complete: if invoked from the main thread, the main method not | 99 // complete: if invoked from the main thread, the main method not |
99 // returning (and thus unblocking the main thread) means that the | 100 // returning (and thus unblocking the main thread) means that the |
100 // main-thread continuation methods will never get called, and thus | 101 // main-thread continuation methods will never get called, and thus |
101 // we'd get a deadlock. | 102 // we'd get a deadlock. |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 | 243 |
243 // Mutex and CondVar to protect start_sel_ldr_done_. | 244 // Mutex and CondVar to protect start_sel_ldr_done_. |
244 NaClMutex mu_; | 245 NaClMutex mu_; |
245 NaClCondVar cond_; | 246 NaClCondVar cond_; |
246 bool start_sel_ldr_done_; | 247 bool start_sel_ldr_done_; |
247 }; | 248 }; |
248 | 249 |
249 } // namespace plugin | 250 } // namespace plugin |
250 | 251 |
251 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ | 252 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ |
OLD | NEW |