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

Unified Diff: chrome/browser/renderer_host/browser_render_process_host.cc

Issue 199105: Continue with the FreeBSD port - this version builds and links, though... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 3 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: chrome/browser/renderer_host/browser_render_process_host.cc
===================================================================
--- chrome/browser/renderer_host/browser_render_process_host.cc (revision 25977)
+++ chrome/browser/renderer_host/browser_render_process_host.cc (working copy)
@@ -63,7 +63,7 @@
#if defined(OS_WIN)
#include "app/win_util.h"
#include "chrome/browser/sandbox_policy.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
#include "base/linux_util.h"
#include "chrome/browser/zygote_host_linux.h"
#include "chrome/browser/renderer_host/render_crash_handler_host_linux.h"
@@ -238,7 +238,7 @@
if (process_.handle() && !run_renderer_in_process()) {
if (zygote_child_) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
Singleton<ZygoteHost>()->EnsureProcessTerminated(process_.handle());
#endif
} else {
@@ -397,11 +397,11 @@
in_process_renderer_.reset(new RendererMainThread(channel_id));
base::Thread::Options options;
-#if !defined(OS_LINUX)
+#if !defined(USE_X11)
// In-process plugins require this to be a UI message loop.
options.message_loop_type = MessageLoop::TYPE_UI;
#else
- // We can't have multiple UI loops on Linux, so we don't support
+ // We can't have multiple UI loops on X, so we don't support
// in-process plugins.
options.message_loop_type = MessageLoop::TYPE_DEFAULT;
#endif
@@ -411,7 +411,7 @@
#if defined(OS_WIN)
process = sandbox::StartProcess(&cmd_line);
#elif defined(OS_POSIX)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
if (!has_cmd_prefix) {
base::GlobalDescriptors::Mapping mapping;
const int ipcfd = channel_->GetClientFileDescriptor();
@@ -431,7 +431,7 @@
base::file_handle_mapping_vector fds_to_map;
const int ipcfd = channel_->GetClientFileDescriptor();
fds_to_map.push_back(std::make_pair(ipcfd, kPrimaryIPCChannel + 3));
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
const int crash_signal_fd =
Singleton<RenderCrashHandlerHostLinux>()->GetDeathSignalSocket();
if (crash_signal_fd >= 0) {
@@ -444,7 +444,7 @@
#endif // defined(OS_LINUX)
base::LaunchApp(cmd_line.argv(), fds_to_map, false, &process);
zygote_child_ = false;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
}
#endif // defined(OS_LINUX)
#endif // defined(OS_WIN)
@@ -661,9 +661,9 @@
// On OSX, the browser allocates all DIBs and keeps a file descriptor around
// for each.
return widget_helper_->MapTransportDIB(dib_id);
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
return TransportDIB::Map(dib_id);
-#endif // defined(OS_LINUX)
+#endif // defined(USE_X11)
}
TransportDIB* BrowserRenderProcessHost::GetTransportDIB(
@@ -816,7 +816,7 @@
bool child_exited;
bool did_crash;
if (zygote_child_) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
did_crash = Singleton<ZygoteHost>()->DidProcessCrash(
process_.handle(), &child_exited);
#else
« no previous file with comments | « chrome/browser/renderer_host/backing_store_x.cc ('k') | chrome/browser/renderer_host/resource_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698