Minimal number of if-def changes to support OS_IOS in content_main_runner.cc

content/app/content_main_runner.cc

 // 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/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 39 matching lines @@
 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
 #endif
 
 #if defined(OS_WIN)
 #include <cstring>
 #include <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
+#if !defined(OS_IOS)
 #include "base/mach_ipc_mac.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/browser/mach_broker_mac.h"
 #include "content/common/sandbox_init_mac.h"
+#endif  // !OS_IOS
 #endif  // OS_WIN
 
 #if defined(OS_POSIX)
 #include <signal.h>
 
 #include "base/global_descriptors_posix.h"
 #include "content/public/common/content_descriptors.h"
 
 #if !defined(OS_MACOSX)
 #include "content/public/common/zygote_fork_delegate_linux.h"
@@ skipping 29 matching lines @@
     g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ContentRendererClient>
     g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ContentUtilityClient>
     g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER;
 
 #if defined(OS_WIN)
 
 static CAppModule _Module;
 
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) && !defined(OS_IOS)
 
 // Completes the Mach IPC handshake by sending this process' task port to the
 // parent process.  The parent is listening on the Mach port given by
 // |GetMachPortName()|.  The task port is used by the parent to get CPU/memory
 // stats to display in the task manager.
 void SendTaskPortToParentProcess() {
   const mach_msg_timeout_t kTimeoutMs = 100;
   const int32_t kMessageId = 0;
   std::string mach_port_name = MachBroker::GetMachPortName();
 
@@ skipping 56 matching lines @@
   // when presenting them to the user), reset the locale for numeric
   // formatting.
   // Note that this is not correct for plugin processes -- they can
   // surface UI -- but it's likely they get this wrong too so why not.
   setlocale(LC_NUMERIC, "C");
 #endif
 }
 
 static base::ProcessId GetBrowserPid(const CommandLine& command_line) {
   base::ProcessId browser_pid = base::GetCurrentProcId();
+#if !defined(OS_IOS)
   if (command_line.HasSwitch(switches::kProcessChannelID)) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
     std::string channel_name =
         command_line.GetSwitchValueASCII(switches::kProcessChannelID);
 
     int browser_pid_int;
     base::StringToInt(channel_name, &browser_pid_int);
     browser_pid = static_cast<base::ProcessId>(browser_pid_int);
     DCHECK_NE(browser_pid_int, 0);
 #elif defined(OS_ANDROID)
     // On Android, the browser process isn't the parent. A bunch
     // of work will be required before callers of this routine will
     // get what they want.
     //
     // Note: On Linux, base::GetParentProcessId() is defined in
     // process_util_linux.cc. Note that *_linux.cc is excluded from
     // Android builds but a special exception is made in base.gypi
     // for a few files including process_util_linux.cc.
     LOG(ERROR) << "GetBrowserPid() not implemented for Android().";
 #elif defined(OS_POSIX)
     // On linux, we're in a process forked from the zygote here; so we need the
     // parent's parent process' id.
     browser_pid =
         base::GetParentProcessId(
             base::GetParentProcessId(base::GetCurrentProcId()));
 #endif
   }
+#endif  // !OS_IOS
   return browser_pid;
 }
 
 static void InitializeStatsTable(const CommandLine& command_line) {
   // Initialize the Stats Counters table.  With this initialized,
   // the StatsViewer can be utilized to read counters outside of
   // Chrome.  These lines can be commented out to effectively turn
   // counters 'off'.  The table is created and exists for the life
   // of the process.  It is not cleaned up.
   if (command_line.HasSwitch(switches::kEnableStatsTable)) {
@@ skipping 111 matching lines @@
     return delegate->RunProcess(process_type, main_params);
 
   NOTREACHED() << "Unknown zygote process type: " << process_type;
   return 1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
 // Run the FooMain() for a given process type.
 // If |process_type| is empty, runs BrowserMain().
 // Returns the exit code for this process.
 int RunNamedProcessTypeMain(

[jam, 2012/09/04 19:38:49]

nit: i would just put this whole method behind an ifdef, since it's odd to have
this on ios even though it doesn't make sense.

[leng, 2012/09/05 11:57:10]

Done.

     const std::string& process_type,
     const MainFunctionParams& main_function_params,
     ContentMainDelegate* delegate) {
+#if defined(OS_IOS)
+  // None of the *Main processes exist on iOS.
+  NOTREACHED();
+#else
   static const MainFunction kMainFunctions[] = {
     { "",                            BrowserMain },
     { switches::kRendererProcess,    RendererMain },
     { switches::kPluginProcess,      PluginMain },
     { switches::kWorkerProcess,      WorkerMain },
     { switches::kPpapiPluginProcess, PpapiPluginMain },
     { switches::kPpapiBrokerProcess, PpapiBrokerMain },
     { switches::kUtilityProcess,     UtilityMain },
     { switches::kGpuProcess,         GpuMain },
   };
@@ skipping 23 matching lines @@
   // for why we don't use ZygoteMain directly.
   if (process_type == switches::kZygoteProcess)
     return RunZygote(main_function_params, delegate);
 #endif
 
   // If it's a process we don't know about, the embedder should know.
   if (delegate)
     return delegate->RunProcess(process_type, main_function_params);
 
   NOTREACHED() << "Unknown process type: " << process_type;
+#endif  // !OS_IOS
   return 1;
 }
 
 class ContentMainRunnerImpl : public ContentMainRunner {
  public:
   ContentMainRunnerImpl()
       : is_initialized_(false),
         is_shutdown_(false),
         completed_basic_startup_(false),
         delegate_(NULL) {
@@ skipping 63 matching lines @@
 
     // On Android,
     // - setlocale() is not supported.
     // - We do not override the signal handlers so that we can get
     //   stack trace when crashing.
     // - The ipc_fd is passed through the Java service.
     // Thus, these are all disabled.
 #if !defined(OS_ANDROID)
     // Set C library locale to make sure CommandLine can parse argument values
     // in correct encoding.
     setlocale(LC_ALL, "");

[jam, 2012/09/04 19:38:49]

do you really need this on ios? if not, then just make this

#if !defined(OS_ANDROID) && !defined(OS_IOS)

[leng, 2012/09/05 11:57:10]

All our tests passed without it.
Done.

 
+#if !defined(OS_IOS)
     SetupSignalHandlers();
 
     base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance();
     g_fds->Set(kPrimaryIPCChannel,
                kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
-#endif
+#endif  // !OS_IOS
+#endif  // !OS_ANDROID
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
     g_fds->Set(kCrashDumpSignal,
                kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
 #endif
 
 #endif  // !OS_WIN
 
     is_initialized_ = true;
     delegate_ = delegate;
 
     base::EnableTerminationOnHeapCorruption();
     base::EnableTerminationOnOutOfMemory();
 
     // On Android, AtExitManager is set up when library is loaded.
-#if !defined(OS_ANDROID)
+    // On iOS, it's set up in main(), which can't call directly through to here.
+#if !defined(OS_ANDROID) && !defined(OS_IOS)

[jam, 2012/09/04 19:38:49]

i would then combined this with the ifdef at 484 (i.e move 505-509 below this

[leng, 2012/09/05 11:57:10]

Done.

     // The exit manager is in charge of calling the dtors of singleton objects.
     exit_manager_.reset(new base::AtExitManager);
 #endif
 
 #if defined(OS_MACOSX)
     // We need this pool for all the objects created before we get to the
     // event loop, but we don't want to leave them hanging around until the
     // app quits. Each "main" needs to flush this pool right before it goes into
     // its main event loop to get rid of the cruft.
     autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool());
@@ skipping 24 matching lines @@
       base::RouteStdioToConsole();
 #endif
 
     // Enable startup tracing asap to avoid early TRACE_EVENT calls being
     // ignored.
     if (command_line.HasSwitch(switches::kTraceStartup)) {
       base::debug::TraceLog::GetInstance()->SetEnabled(
           command_line.GetSwitchValueASCII(switches::kTraceStartup));
     }
 
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
     // We need to allocate the IO Ports before the Sandbox is initialized or
     // the first instance of SystemMonitor is created.
     // It's important not to allocate the ports for processes which don't
     // register with the system monitor - see crbug.com/88867.
     if (process_type.empty() ||
         process_type == switches::kPluginProcess ||
         process_type == switches::kRendererProcess ||
         process_type == switches::kUtilityProcess ||
         process_type == switches::kWorkerProcess ||
         (delegate &&
@@ skipping 51 matching lines @@
     if (command_line.HasSwitch(switches::kUserAgent)) {
       webkit_glue::SetUserAgent(
           command_line.GetSwitchValueASCII(switches::kUserAgent), true);
     }
 
     if (!process_type.empty())
       CommonSubprocessInit(process_type);
 
 #if defined(OS_WIN)
     CHECK(InitializeSandbox(sandbox_info));
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) && !defined(OS_IOS)
     if (process_type == switches::kRendererProcess ||
         process_type == switches::kPpapiPluginProcess ||
         (delegate && delegate->DelaySandboxInitialization(process_type))) {
       // On OS X the renderer sandbox needs to be initialized later in the
       // startup sequence in RendererMainPlatformDelegate::EnableSandbox().
     } else {
       CHECK(InitializeSandbox());
     }
 #endif
 
     if (delegate)
       delegate->SandboxInitialized(process_type);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_IOS)
     SetProcessTitleFromCommandLine(argv);
 #endif
 
     // Return -1 to indicate no early termination.
     return -1;
   }
 
   virtual int Run() OVERRIDE {
     DCHECK(is_initialized_);
     DCHECK(!is_shutdown_);
@@ skipping 66 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content