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

Unified Diff: mojo/edk/embedder/entrypoints.cc

Issue 728553002: Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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.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/system/entrypoints.cc b/mojo/edk/embedder/entrypoints.cc
similarity index 70%
rename from mojo/edk/system/entrypoints.cc
rename to mojo/edk/embedder/entrypoints.cc
index 7ec5bb488e1c7d93325d6bf4fcab7c4356b56a4f..7b2e53fe29ad078db19b6a7d12bf23e76dfdc7ce 100644
--- a/mojo/edk/system/entrypoints.cc
+++ b/mojo/edk/embedder/entrypoints.cc
@@ -2,35 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/edk/system/entrypoints.h"
-
-#include "base/logging.h"
+#include "mojo/edk/embedder/embedder_internal.h"
#include "mojo/edk/system/core.h"
#include "mojo/public/c/system/buffer.h"
#include "mojo/public/c/system/data_pipe.h"
#include "mojo/public/c/system/functions.h"
#include "mojo/public/c/system/message_pipe.h"
-static mojo::system::Core* g_core = nullptr;
-
+using mojo::embedder::internal::g_core;
using mojo::system::MakeUserPointer;
-namespace mojo {
-namespace system {
-namespace entrypoints {
-
-void SetCore(Core* core) {
- g_core = core;
-}
-
-Core* GetCore() {
- return g_core;
-}
-
-} // namespace entrypoints
-} // namepace system
-} // namespace mojo
-
// Definitions of the system functions.
extern "C" {
MojoTimeTicks MojoGetTimeTicksNow() {
@@ -44,8 +25,8 @@ MojoResult MojoClose(MojoHandle handle) {
MojoResult MojoWait(MojoHandle handle,
MojoHandleSignals signals,
MojoDeadline deadline) {
- return g_core->Wait(
- handle, signals, deadline, mojo::system::NullUserPointer());
+ return g_core->Wait(handle, signals, deadline,
+ mojo::system::NullUserPointer());
}
MojoResult MojoWaitMany(const MojoHandle* handles,
@@ -53,12 +34,9 @@ MojoResult MojoWaitMany(const MojoHandle* handles,
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());
+ 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;
}
@@ -77,11 +55,8 @@ MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
const MojoHandle* handles,
uint32_t num_handles,
MojoWriteMessageFlags flags) {
- return g_core->WriteMessage(message_pipe_handle,
- MakeUserPointer(bytes),
- num_bytes,
- MakeUserPointer(handles),
- num_handles,
+ return g_core->WriteMessage(message_pipe_handle, MakeUserPointer(bytes),
+ num_bytes, MakeUserPointer(handles), num_handles,
flags);
}
@@ -91,12 +66,9 @@ MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
MojoHandle* handles,
uint32_t* num_handles,
MojoReadMessageFlags flags) {
- return g_core->ReadMessage(message_pipe_handle,
- MakeUserPointer(bytes),
- MakeUserPointer(num_bytes),
- MakeUserPointer(handles),
- MakeUserPointer(num_handles),
- flags);
+ return g_core->ReadMessage(
+ message_pipe_handle, MakeUserPointer(bytes), MakeUserPointer(num_bytes),
+ MakeUserPointer(handles), MakeUserPointer(num_handles), flags);
}
MojoResult MojoCreateDataPipe(const MojoCreateDataPipeOptions* options,
@@ -111,10 +83,8 @@ MojoResult MojoWriteData(MojoHandle data_pipe_producer_handle,
const void* elements,
uint32_t* num_elements,
MojoWriteDataFlags flags) {
- return g_core->WriteData(data_pipe_producer_handle,
- MakeUserPointer(elements),
- MakeUserPointer(num_elements),
- flags);
+ return g_core->WriteData(data_pipe_producer_handle, MakeUserPointer(elements),
+ MakeUserPointer(num_elements), flags);
}
MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
@@ -123,8 +93,7 @@ MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
MojoWriteDataFlags flags) {
return g_core->BeginWriteData(data_pipe_producer_handle,
MakeUserPointer(buffer),
- MakeUserPointer(buffer_num_elements),
- flags);
+ MakeUserPointer(buffer_num_elements), flags);
}
MojoResult MojoEndWriteData(MojoHandle data_pipe_producer_handle,
@@ -136,10 +105,8 @@ MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
void* elements,
uint32_t* num_elements,
MojoReadDataFlags flags) {
- return g_core->ReadData(data_pipe_consumer_handle,
- MakeUserPointer(elements),
- MakeUserPointer(num_elements),
- flags);
+ return g_core->ReadData(data_pipe_consumer_handle, MakeUserPointer(elements),
+ MakeUserPointer(num_elements), flags);
}
MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
@@ -148,8 +115,7 @@ MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
MojoReadDataFlags flags) {
return g_core->BeginReadData(data_pipe_consumer_handle,
MakeUserPointer(buffer),
- MakeUserPointer(buffer_num_elements),
- flags);
+ MakeUserPointer(buffer_num_elements), flags);
}
MojoResult MojoEndReadData(MojoHandle data_pipe_consumer_handle,
@@ -161,8 +127,7 @@ MojoResult MojoCreateSharedBuffer(
const struct MojoCreateSharedBufferOptions* options,
uint64_t num_bytes,
MojoHandle* shared_buffer_handle) {
- return g_core->CreateSharedBuffer(MakeUserPointer(options),
- num_bytes,
+ return g_core->CreateSharedBuffer(MakeUserPointer(options), num_bytes,
MakeUserPointer(shared_buffer_handle));
}
@@ -170,8 +135,7 @@ MojoResult MojoDuplicateBufferHandle(
MojoHandle buffer_handle,
const struct MojoDuplicateBufferHandleOptions* options,
MojoHandle* new_buffer_handle) {
- return g_core->DuplicateBufferHandle(buffer_handle,
- MakeUserPointer(options),
+ return g_core->DuplicateBufferHandle(buffer_handle, MakeUserPointer(options),
MakeUserPointer(new_buffer_handle));
}
@@ -180,8 +144,8 @@ MojoResult MojoMapBuffer(MojoHandle buffer_handle,
uint64_t num_bytes,
void** buffer,
MojoMapBufferFlags flags) {
- return g_core->MapBuffer(
- buffer_handle, offset, num_bytes, MakeUserPointer(buffer), flags);
+ return g_core->MapBuffer(buffer_handle, offset, num_bytes,
+ MakeUserPointer(buffer), flags);
}
MojoResult MojoUnmapBuffer(void* buffer) {
« no previous file with comments | « mojo/edk/embedder/embedder_unittest.cc ('k') | mojo/edk/embedder/platform_channel_pair_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698