diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 19:06:46 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 19:06:46 +0000 |
| commit | 2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a (patch) | |
| tree | ade68b35681035ecf8afe89618b18af1797cc0b8 /chrome/app | |
| parent | 97762c74a812d0ed2028fa9397746fe17597ef47 (diff) | |
| download | chromium_src-2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a.zip chromium_src-2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a.tar.gz chromium_src-2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a.tar.bz2 | |
Revert 90805 - I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@ because he is on vacation. He previously LGTMed the reverted CL (link below) and there are not substantive changes since then.
Modify the Chrome Linux zygote to support a nacl_helper executable,
facilitating a special address-space layout as required by NaCl on ARM
and ATOM CPUs. In passing, simplify some shared elements of launching
NaCl modules in Chrome.
This is an update to a previously reverted CL. Please see
http://codereview.chromium.org/6995121 for the earlier reviews.
Patching nacl_helper CL into fresh branch.
BUG=nativeclient:480
TEST=nativeclient in-browser tests
TBR=jam@chromium.org
TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7230057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 5130195..ed3827b 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -47,11 +47,6 @@ #include "ui/base/ui_base_paths.h" #include "ui/base/ui_base_switches.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) -#include "chrome/common/nacl_fork_delegate_linux.h" -#include "content/common/zygote_fork_delegate_linux.h" -#endif - #if defined(OS_WIN) #include <algorithm> #include <malloc.h> @@ -117,9 +112,7 @@ extern int WorkerMain(const MainFunctionParams&); extern int NaClMain(const MainFunctionParams&); extern int UtilityMain(const MainFunctionParams&); extern int ProfileImportMain(const MainFunctionParams&); -#if defined(OS_POSIX) && !defined(OS_MACOSX) -extern int ZygoteMain(const MainFunctionParams&, const ZygoteForkDelegate&); -#endif +extern int ZygoteMain(const MainFunctionParams&); #if defined(_WIN64) extern int NaClBrokerMain(const MainFunctionParams&); #endif @@ -457,8 +450,7 @@ int RunZygote(const MainFunctionParams& main_function_params) { media::InitializeMediaLibrary(media_path); // This function call can return multiple times, once per fork(). - NaClForkDelegate nacl_fork_delegate; - if (!ZygoteMain(main_function_params, nacl_fork_delegate)) + if (!ZygoteMain(main_function_params)) return 1; // Zygote::HandleForkRequest may have reallocated the command |