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

Unified Diff: content/app/android/sandboxed_process_service.cc

Issue 12321131: Renamed Sandboxed process to Child process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaesed and removed stub SandboxedProcessService Created 7 years, 9 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
Index: content/app/android/sandboxed_process_service.cc
diff --git a/content/app/android/sandboxed_process_service.cc b/content/app/android/sandboxed_process_service.cc
deleted file mode 100644
index e7118ffcc6ffd7b8982cfd94d14735ec8e217f05..0000000000000000000000000000000000000000
--- a/content/app/android/sandboxed_process_service.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "content/app/android/sandboxed_process_service.h"
-
-#include <cpu-features.h>
-
-#include "base/android/jni_array.h"
-#include "base/logging.h"
-#include "base/posix/global_descriptors.h"
-#include "content/common/android/surface_texture_peer.h"
-#include "content/common/child_process.h"
-#include "content/common/child_thread.h"
-#include "content/public/app/android_library_loader_hooks.h"
-#include "content/public/common/content_descriptors.h"
-#include "ipc/ipc_descriptors.h"
-#include "jni/SandboxedProcessService_jni.h"
-
-using base::android::AttachCurrentThread;
-using base::android::CheckException;
-using base::android::JavaIntArrayToIntVector;
-
-namespace {
-
-class SurfaceTexturePeerSandboxedImpl : public content::SurfaceTexturePeer {
- public:
- // |service| is the instance of
- // org.chromium.content.app.SandboxedProcessService.
- SurfaceTexturePeerSandboxedImpl(jobject service)
- : service_(service) {
- }
-
- virtual ~SurfaceTexturePeerSandboxedImpl() {
- }
-
- virtual void EstablishSurfaceTexturePeer(
- base::ProcessHandle pid,
- scoped_refptr<content::SurfaceTextureBridge> surface_texture_bridge,
- int primary_id,
- int secondary_id) {
- JNIEnv* env = base::android::AttachCurrentThread();
- content::Java_SandboxedProcessService_establishSurfaceTexturePeer(
- env, service_, pid,
- surface_texture_bridge->j_surface_texture().obj(), primary_id,
- secondary_id);
- CheckException(env);
- }
-
- private:
- // The instance of org.chromium.content.app.SandboxedProcessService.
- jobject service_;
-
- DISALLOW_COPY_AND_ASSIGN(SurfaceTexturePeerSandboxedImpl);
-};
-
-// Chrome actually uses the renderer code path for all of its sandboxed
-// processes such as renderers, plugins, etc.
-void InternalInitSandboxedProcess(const std::vector<int>& file_ids,
- const std::vector<int>& file_fds,
- JNIEnv* env,
- jclass clazz,
- jobject context,
- jobject service,
- jint cpu_count,
- jlong cpu_features) {
- // Set the CPU properties.
- android_setCpu(cpu_count, cpu_features);
- // Register the file descriptors.
- // This includes the IPC channel, the crash dump signals and resource related
- // files.
- DCHECK(file_fds.size() == file_ids.size());
- for (size_t i = 0; i < file_ids.size(); ++i)
- base::GlobalDescriptors::GetInstance()->Set(file_ids[i], file_fds[i]);
-
- content::SurfaceTexturePeer::InitInstance(
- new SurfaceTexturePeerSandboxedImpl(service));
-
-}
-
-void QuitSandboxMainThreadMessageLoop() {
- MessageLoop::current()->Quit();
-}
-
-} // namespace <anonymous>
-
-namespace content {
-
-void InitSandboxedProcess(JNIEnv* env,
- jclass clazz,
- jobject context,
- jobject service,
- jintArray j_file_ids,
- jintArray j_file_fds,
- jint cpu_count,
- jlong cpu_features) {
- std::vector<int> file_ids;
- std::vector<int> file_fds;
- JavaIntArrayToIntVector(env, j_file_ids, &file_ids);
- JavaIntArrayToIntVector(env, j_file_fds, &file_fds);
-
- InternalInitSandboxedProcess(
- file_ids, file_fds, env, clazz, context, service,
- cpu_count, cpu_features);
-}
-
-void ExitSandboxedProcess(JNIEnv* env, jclass clazz) {
- LOG(INFO) << "SandboxedProcessService: Exiting sandboxed process.";
- LibraryLoaderExitHook();
- _exit(0);
-}
-
-bool RegisterSandboxedProcessService(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-void ShutdownSandboxMainThread(JNIEnv* env, jobject obj) {
- ChildProcess* current_process = ChildProcess::current();
- if (!current_process)
- return;
- ChildThread* main_child_thread = current_process->main_thread();
- if (main_child_thread && main_child_thread->message_loop())
- main_child_thread->message_loop()->PostTask(FROM_HERE,
- base::Bind(&QuitSandboxMainThreadMessageLoop));
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698