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

Unified Diff: third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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
Index: third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc
diff --git a/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc b/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc
deleted file mode 100644
index e4d9f0067ec51fd5b95ccb67e63b074b0b1f393d..0000000000000000000000000000000000000000
--- a/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// WARNING this file was generated by generate_nacl_bindings.py
-// Do not edit by hand.
-
-#include "native_client/src/public/chrome_main.h"
-#include "native_client/src/public/imc_syscalls.h"
-#include "native_client/src/public/imc_types.h"
-#include "native_client/src/untrusted/irt/irt.h"
-#include "third_party/mojo/src/mojo/public/c/system/core.h"
-#include "third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.h"
-
-// The value for this FD must not conflict with uses inside Chromium. However,
-// mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define
-// from there.
-#define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 3)
-
-bool g_irt_mojo_valid = false;
-struct nacl_irt_mojo g_irt_mojo;
-
-struct nacl_irt_mojo* get_irt_mojo() {
- if (!g_irt_mojo_valid) {
- size_t rc = nacl_interface_query(NACL_IRT_MOJO_v0_1, &g_irt_mojo,
- sizeof(g_irt_mojo));
- if (rc != sizeof(g_irt_mojo))
- return NULL;
- else
- g_irt_mojo_valid = true;
- }
- return &g_irt_mojo;
-}
-
-MojoResult MojoCreateSharedBuffer(
- const struct MojoCreateSharedBufferOptions* options,
- uint64_t num_bytes,
- MojoHandle* shared_buffer_handle) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoCreateSharedBuffer(options, num_bytes,
- shared_buffer_handle);
-}
-
-MojoResult MojoDuplicateBufferHandle(
- MojoHandle buffer_handle,
- const struct MojoDuplicateBufferHandleOptions* options,
- MojoHandle* new_buffer_handle) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoDuplicateBufferHandle(buffer_handle, options,
- new_buffer_handle);
-}
-
-MojoResult MojoMapBuffer(MojoHandle buffer_handle,
- uint64_t offset,
- uint64_t num_bytes,
- void** buffer,
- MojoMapBufferFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoMapBuffer(buffer_handle, offset, num_bytes, buffer,
- flags);
-}
-
-MojoResult MojoUnmapBuffer(void* buffer) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoUnmapBuffer(buffer);
-}
-
-MojoResult MojoCreateDataPipe(const struct MojoCreateDataPipeOptions* options,
- MojoHandle* data_pipe_producer_handle,
- MojoHandle* data_pipe_consumer_handle) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoCreateDataPipe(options, data_pipe_producer_handle,
- data_pipe_consumer_handle);
-}
-
-MojoResult MojoWriteData(MojoHandle data_pipe_producer_handle,
- const void* elements,
- uint32_t* num_bytes,
- MojoWriteDataFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoWriteData(data_pipe_producer_handle, elements, num_bytes,
- flags);
-}
-
-MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
- void** buffer,
- uint32_t* buffer_num_bytes,
- MojoWriteDataFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoBeginWriteData(data_pipe_producer_handle, buffer,
- buffer_num_bytes, flags);
-}
-
-MojoResult MojoEndWriteData(MojoHandle data_pipe_producer_handle,
- uint32_t num_bytes_written) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoEndWriteData(data_pipe_producer_handle,
- num_bytes_written);
-}
-
-MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
- void* elements,
- uint32_t* num_bytes,
- MojoReadDataFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoReadData(data_pipe_consumer_handle, elements, num_bytes,
- flags);
-}
-
-MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
- const void** buffer,
- uint32_t* buffer_num_bytes,
- MojoReadDataFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoBeginReadData(data_pipe_consumer_handle, buffer,
- buffer_num_bytes, flags);
-}
-
-MojoResult MojoEndReadData(MojoHandle data_pipe_consumer_handle,
- uint32_t num_bytes_read) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoEndReadData(data_pipe_consumer_handle, num_bytes_read);
-}
-
-MojoTimeTicks MojoGetTimeTicksNow() {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoGetTimeTicksNow();
-}
-
-MojoResult MojoClose(MojoHandle handle) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoClose(handle);
-}
-
-MojoResult MojoWait(MojoHandle handle,
- MojoHandleSignals signals,
- MojoDeadline deadline,
- struct MojoHandleSignalsState* signals_state) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoWait(handle, signals, deadline, signals_state);
-}
-
-MojoResult MojoWaitMany(const MojoHandle* handles,
- const MojoHandleSignals* signals,
- uint32_t num_handles,
- MojoDeadline deadline,
- uint32_t* result_index,
- struct MojoHandleSignalsState* signals_states) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoWaitMany(handles, signals, num_handles, deadline,
- result_index, signals_states);
-}
-
-MojoResult MojoCreateMessagePipe(
- const struct MojoCreateMessagePipeOptions* options,
- MojoHandle* message_pipe_handle0,
- MojoHandle* message_pipe_handle1) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoCreateMessagePipe(options, message_pipe_handle0,
- message_pipe_handle1);
-}
-
-MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
- const void* bytes,
- uint32_t num_bytes,
- const MojoHandle* handles,
- uint32_t num_handles,
- MojoWriteMessageFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoWriteMessage(message_pipe_handle, bytes, num_bytes,
- handles, num_handles, flags);
-}
-
-MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
- void* bytes,
- uint32_t* num_bytes,
- MojoHandle* handles,
- uint32_t* num_handles,
- MojoReadMessageFlags flags) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->MojoReadMessage(message_pipe_handle, bytes, num_bytes,
- handles, num_handles, flags);
-}
-
-MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
- struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
- if (irt_mojo == NULL)
- return MOJO_RESULT_INTERNAL;
- return irt_mojo->_MojoGetInitialHandle(handle);
-}
-

Powered by Google App Engine
This is Rietveld 408576698