Bug 1531376 - #ifdef out isWidevine if sandbox disabled in GeckoChildProcessHost.cpp. r=dmajor
authorChris Pearce <cpearce@mozilla.com>
Thu, 28 Feb 2019 21:35:25 +0000
changeset 519701 f2d1cb9ce0c9b427e242ec2b5e8066af82a7afca
parent 519700 1b3f624ca31a091a86b9bfd045589de388354b7b
child 519702 16440861d3fcc2ff0026c850c54e9373c5359cfb
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1531376
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1531376 - #ifdef out isWidevine if sandbox disabled in GeckoChildProcessHost.cpp. r=dmajor Differential Revision: https://phabricator.services.mozilla.com/D21600
ipc/glue/GeckoChildProcessHost.cpp
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -1014,27 +1014,29 @@ bool GeckoChildProcessHost::PerformAsync
 #  endif  // MOZ_WIDGET_COCOA
 
 //--------------------------------------------------
 #elif defined(OS_WIN)  // defined(OS_POSIX)
 
   FilePath exePath;
   BinaryPathType pathType = GetPathToBinary(exePath, mProcessType);
 
+#  if defined(MOZ_SANDBOX) || (defined(_ARM64_) && defined(XP_WIN))
   const bool isGMP = mProcessType == GeckoProcessType_GMPlugin;
   const bool isWidevine = isGMP && Contains(aExtraOpts, "gmp-widevinecdm");
-#  if defined(_ARM64_) && defined(XP_WIN)
+#    if defined(_ARM64_) && defined(XP_WIN)
   const bool isClearKey = isGMP && Contains(aExtraOpts, "gmp-clearkey");
   if (isGMP && (isClearKey || isWidevine)) {
     // On Windows on ARM64 for ClearKey and Widevine, we want to run the
     // x86 plugin-container.exe in the "i686" subdirectory, instead of the
     // aarch64 plugin-container.exe. So insert "i686" into the exePath.
     exePath = exePath.DirName().AppendASCII("i686").Append(exePath.BaseName());
   }
-#  endif
+#    endif
+#  endif  // defined(MOZ_SANDBOX) || (defined(_ARM64_) && defined(XP_WIN))
 
   CommandLine cmdLine(exePath.ToWStringHack());
 
   if (pathType == BinaryPathType::Self) {
     cmdLine.AppendLooseValue(UTF8ToWide("-contentproc"));
   }
 
   cmdLine.AppendSwitchWithValue(switches::kProcessChannelID, channel_id());