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

Unified Diff: mojo/public/platform/native/system_thunks.cc

Issue 830593003: Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick mojo 9d3b8dd17f12d20035a14737fdc38dd926890ff8 Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/public/platform/native/system_thunks.h ('k') | mojo/public/python/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/platform/native/system_thunks.cc
diff --git a/mojo/public/platform/native/system_thunks.cc b/mojo/public/platform/native/system_thunks.cc
index 23f123f9355687c4b43bf4ea7320736f7787a2d8..ed3227f0dd27445d000f90a78bcc6fbe90fbcb10 100644
--- a/mojo/public/platform/native/system_thunks.cc
+++ b/mojo/public/platform/native/system_thunks.cc
@@ -24,36 +24,21 @@ MojoResult MojoClose(MojoHandle handle) {
MojoResult MojoWait(MojoHandle handle,
MojoHandleSignals signals,
- MojoDeadline deadline) {
+ MojoDeadline deadline,
+ struct MojoHandleSignalsState* signals_state) {
assert(g_thunks.Wait);
- return g_thunks.Wait(handle, signals, deadline);
+ return g_thunks.Wait(handle, signals, deadline, signals_state);
}
MojoResult MojoWaitMany(const MojoHandle* handles,
const MojoHandleSignals* signals,
uint32_t num_handles,
- MojoDeadline deadline) {
+ MojoDeadline deadline,
+ uint32_t* result_index,
+ struct MojoHandleSignalsState* signals_states) {
assert(g_thunks.WaitMany);
- return g_thunks.WaitMany(handles, signals, num_handles, deadline);
-}
-
-MojoResult MojoNewWait(MojoHandle handle,
- MojoHandleSignals signals,
- MojoDeadline deadline,
- struct MojoHandleSignalsState* signals_state) {
- assert(g_thunks.NewWait);
- return g_thunks.NewWait(handle, signals, deadline, signals_state);
-}
-
-MojoResult MojoNewWaitMany(const MojoHandle* handles,
- const MojoHandleSignals* signals,
- uint32_t num_handles,
- MojoDeadline deadline,
- uint32_t* result_index,
- struct MojoHandleSignalsState* signals_states) {
- assert(g_thunks.NewWaitMany);
- return g_thunks.NewWaitMany(handles, signals, num_handles, deadline,
- result_index, signals_states);
+ return g_thunks.WaitMany(handles, signals, num_handles, deadline,
+ result_index, signals_states);
}
MojoResult MojoCreateMessagePipe(const MojoCreateMessagePipeOptions* options,
« no previous file with comments | « mojo/public/platform/native/system_thunks.h ('k') | mojo/public/python/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698