diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
| commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
| tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/content/zygote | |
| parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
| download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz | |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/content/zygote')
| -rw-r--r-- | chromium/content/zygote/zygote_linux.cc | 5 | ||||
| -rw-r--r-- | chromium/content/zygote/zygote_linux.h | 1 | ||||
| -rw-r--r-- | chromium/content/zygote/zygote_main_linux.cc | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/chromium/content/zygote/zygote_linux.cc b/chromium/content/zygote/zygote_linux.cc index c196a7fc2fa..900463e4cea 100644 --- a/chromium/content/zygote/zygote_linux.cc +++ b/chromium/content/zygote/zygote_linux.cc @@ -562,8 +562,9 @@ base::ProcessId Zygote::ReadArgsAndFork(base::PickleIterator iter, base::GlobalDescriptors::Mapping mapping; std::string process_type; std::string channel_id; - const std::string channel_id_prefix = std::string("--") - + switches::kMojoChannelToken + std::string("="); + const std::string channel_id_prefix = std::string("--") + + switches::kServiceRequestChannelToken + + std::string("="); if (!iter.ReadString(&process_type)) return -1; diff --git a/chromium/content/zygote/zygote_linux.h b/chromium/content/zygote/zygote_linux.h index b1eecd60086..af2c1005af3 100644 --- a/chromium/content/zygote/zygote_linux.h +++ b/chromium/content/zygote/zygote_linux.h @@ -20,7 +20,6 @@ #include "base/time/time.h" namespace base { -class Pickle; class PickleIterator; } diff --git a/chromium/content/zygote/zygote_main_linux.cc b/chromium/content/zygote/zygote_main_linux.cc index 40260cd208b..02beffae8a8 100644 --- a/chromium/content/zygote/zygote_main_linux.cc +++ b/chromium/content/zygote/zygote_main_linux.cc @@ -44,6 +44,8 @@ #include "content/public/common/sandbox_linux.h" #include "content/public/common/zygote_fork_delegate_linux.h" #include "content/zygote/zygote_linux.h" +#include "media/media_features.h" +#include "ppapi/features/features.h" #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/init_process_reaper.h" #include "sandbox/linux/services/namespace_sandbox.h" @@ -60,12 +62,12 @@ #include <sys/prctl.h> #endif -#if defined(ENABLE_PLUGINS) +#if BUILDFLAG(ENABLE_PLUGINS) #include "content/common/pepper_plugin_list.h" #include "content/public/common/pepper_plugin_info.h" #endif -#if defined(ENABLE_WEBRTC) +#if BUILDFLAG(ENABLE_WEBRTC) #include "third_party/webrtc_overrides/init_webrtc.h" #endif @@ -311,7 +313,7 @@ struct tm* localtime64_r_override(const time_t* timep, struct tm* result) { return res; } -#if defined(ENABLE_PLUGINS) +#if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not // call PPP_InitializeModule). This is needed by the zygote on Linux to get // access to the plugins before entering the sandbox. @@ -357,11 +359,11 @@ static void ZygotePreSandboxInit() { // will work inside the sandbox. RAND_set_urandom_fd(base::GetUrandomFD()); -#if defined(ENABLE_PLUGINS) +#if BUILDFLAG(ENABLE_PLUGINS) // Ensure access to the Pepper plugins before the sandbox is turned on. PreloadPepperPlugins(); #endif -#if defined(ENABLE_WEBRTC) +#if BUILDFLAG(ENABLE_WEBRTC) InitializeWebRtcModule(); #endif |