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

Unified Diff: mojo/edk/embedder/entrypoints.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/edk/embedder/embedder_unittest.cc ('k') | mojo/edk/embedder/platform_channel_pair_posix_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/embedder/entrypoints.cc
diff --git a/mojo/edk/embedder/entrypoints.cc b/mojo/edk/embedder/entrypoints.cc
index 6ecdd1475b96e9fcd551a01945dc51169ca54cd1..9338cc7b534f7aba4ba2714a9b46235d7905ad56 100644
--- a/mojo/edk/embedder/entrypoints.cc
+++ b/mojo/edk/embedder/entrypoints.cc
@@ -23,25 +23,6 @@ MojoResult MojoClose(MojoHandle handle) {
}
MojoResult MojoWait(MojoHandle handle,
- MojoHandleSignals signals,
- MojoDeadline deadline) {
- return g_core->Wait(handle, signals, deadline,
- mojo::system::NullUserPointer());
-}
-
-MojoResult MojoWaitMany(const MojoHandle* handles,
- const MojoHandleSignals* signals,
- uint32_t num_handles,
- MojoDeadline deadline) {
- uint32_t result_index = static_cast<uint32_t>(-1);
- MojoResult result = g_core->WaitMany(
- MakeUserPointer(handles), MakeUserPointer(signals), num_handles, deadline,
- MakeUserPointer(&result_index), mojo::system::NullUserPointer());
- return (result == MOJO_RESULT_OK) ? static_cast<MojoResult>(result_index)
- : result;
-}
-
-MojoResult MojoNewWait(MojoHandle handle,
MojoHandleSignals signals,
MojoDeadline deadline,
MojoHandleSignalsState* signals_state) {
@@ -49,12 +30,12 @@ MojoResult MojoNewWait(MojoHandle handle,
MakeUserPointer(signals_state));
}
-MojoResult MojoNewWaitMany(const MojoHandle* handles,
- const MojoHandleSignals* signals,
- uint32_t num_handles,
- MojoDeadline deadline,
- uint32_t* result_index,
- MojoHandleSignalsState* signals_states) {
+MojoResult MojoWaitMany(const MojoHandle* handles,
+ const MojoHandleSignals* signals,
+ uint32_t num_handles,
+ MojoDeadline deadline,
+ uint32_t* result_index,
+ MojoHandleSignalsState* signals_states) {
return g_core->WaitMany(MakeUserPointer(handles), MakeUserPointer(signals),
num_handles, deadline, MakeUserPointer(result_index),
MakeUserPointer(signals_states));
« no previous file with comments | « mojo/edk/embedder/embedder_unittest.cc ('k') | mojo/edk/embedder/platform_channel_pair_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698