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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 OpenManifestEntryAsyncCallback* callback) | 78 OpenManifestEntryAsyncCallback* callback) |
79 : url(target_url), | 79 : url(target_url), |
80 file_info(finfo), | 80 file_info(finfo), |
81 op_complete_ptr(op_complete), | 81 op_complete_ptr(op_complete), |
82 callback(callback) {} | 82 callback(callback) {} |
83 ~OpenManifestEntryResource(); | 83 ~OpenManifestEntryResource(); |
84 void MaybeRunCallback(int32_t pp_error); | 84 void MaybeRunCallback(int32_t pp_error); |
85 | 85 |
86 std::string url; | 86 std::string url; |
87 struct NaClFileInfo* file_info; | 87 struct NaClFileInfo* file_info; |
| 88 PP_NaClFileInfo pp_file_info; |
88 bool* op_complete_ptr; | 89 bool* op_complete_ptr; |
89 OpenManifestEntryAsyncCallback* callback; | 90 OpenManifestEntryAsyncCallback* callback; |
90 }; | 91 }; |
91 | 92 |
92 // Do not invoke from the main thread, since the main methods will | 93 // Do not invoke from the main thread, since the main methods will |
93 // invoke CallOnMainThread and then wait on a condvar for the task to | 94 // invoke CallOnMainThread and then wait on a condvar for the task to |
94 // complete: if invoked from the main thread, the main method not | 95 // complete: if invoked from the main thread, the main method not |
95 // returning (and thus unblocking the main thread) means that the | 96 // returning (and thus unblocking the main thread) means that the |
96 // main-thread continuation methods will never get called, and thus | 97 // main-thread continuation methods will never get called, and thus |
97 // we'd get a deadlock. | 98 // we'd get a deadlock. |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 | 232 |
232 // Mutex and CondVar to protect start_sel_ldr_done_. | 233 // Mutex and CondVar to protect start_sel_ldr_done_. |
233 NaClMutex mu_; | 234 NaClMutex mu_; |
234 NaClCondVar cond_; | 235 NaClCondVar cond_; |
235 bool start_sel_ldr_done_; | 236 bool start_sel_ldr_done_; |
236 }; | 237 }; |
237 | 238 |
238 } // namespace plugin | 239 } // namespace plugin |
239 | 240 |
240 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ | 241 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ |
OLD | NEW |