Backed out changeset 8ef30ebad16c (bug 1541130) build bustages a=backout
authorAndreea Pavel <apavel@mozilla.com>
Mon, 08 Apr 2019 22:25:14 +0300
changeset 468404 395a65d512e38c304f5228357de7cade57799175
parent 468403 facb0f655f03a8c3a9c02cec2dc7e607ebbc2514
child 468428 759745dda57e472022902510ee408e7f30b582e0
child 468486 5cc56532ff4a4b2b896f84e4b6e7889837acb42d
push id35836
push userapavel@mozilla.com
push dateMon, 08 Apr 2019 19:30:06 +0000
treeherdermozilla-central@395a65d512e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1541130
milestone68.0a1
backs out8ef30ebad16c538e39b9fb4648a551a3257d9729
first release with
nightly linux32
395a65d512e3 / 68.0a1 / 20190408193006 / files
nightly linux64
395a65d512e3 / 68.0a1 / 20190408193006 / files
nightly mac
395a65d512e3 / 68.0a1 / 20190408193006 / files
nightly win32
395a65d512e3 / 68.0a1 / 20190408193006 / files
nightly win64
395a65d512e3 / 68.0a1 / 20190408193006 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8ef30ebad16c (bug 1541130) build bustages a=backout
ipc/glue/CrashReporterHost.cpp
xpcom/build/GeckoProcessTypes.h
xpcom/build/nsXULAppAPI.h
--- a/ipc/glue/CrashReporterHost.cpp
+++ b/ipc/glue/CrashReporterHost.cpp
@@ -121,19 +121,19 @@ bool CrashReporterHost::FinalizeCrashRep
   if (mProcessType == GeckoProcessType_GMPlugin) {
     type.AssignLiteral("plugin");
   } else if (mProcessType == GeckoProcessType_Content) {
     type.AssignLiteral("content");
   } else {
     // This check will pick up some cases that will never happen (e.g. IPDL
     // unit tests), but that's OK.
     switch (mProcessType) {
-#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name, bin_type) \
-  case GeckoProcessType_##enum_name:                                   \
-    type.AssignLiteral(string_name);                                   \
+#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name) \
+  case GeckoProcessType_##enum_name:                         \
+    type.AssignLiteral(string_name);                         \
     break;
 #include "mozilla/GeckoProcessTypes.h"
 #undef GECKO_PROCESS_TYPE
       default:
         NS_ERROR("unknown process type");
         break;
     }
   }
@@ -194,19 +194,19 @@ void CrashReporterHost::NotifyCrashServi
       break;
   }
 
   if (aProcessType == GeckoProcessType_Plugin &&
       aCrashType == nsICrashService::CRASH_TYPE_HANG) {
     telemetryKey.AssignLiteral("pluginhang");
   } else {
     switch (aProcessType) {
-#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name, bin_type) \
-  case GeckoProcessType_##enum_name:                                   \
-    telemetryKey.AssignLiteral(string_name);                           \
+#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name) \
+  case GeckoProcessType_##enum_name:                         \
+    telemetryKey.AssignLiteral(string_name);                 \
     break;
 #include "mozilla/GeckoProcessTypes.h"
 #undef GECKO_PROCESS_TYPE
       // We can't really hit this, thanks to the above switch, but having it
       // here will placate the compiler.
       default:
         NS_ERROR("unknown process type");
         return;
--- a/xpcom/build/GeckoProcessTypes.h
+++ b/xpcom/build/GeckoProcessTypes.h
@@ -1,38 +1,31 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// GECKO_PROCESS_TYPE(enum-name, string-name, XRE_Is${NAME}Process, process-bin-type)
+// GECKO_PROCESS_TYPE(enum-name, string-name, XRE_Is${NAME}Process)
 // Note that string-name is exposed to various things like telemetry
 // and the crash reporter, so it should not be changed casually.
 //
-// process-bin-type should be either Self or PluginContainer, and determines
-// whether the child process may be started using the same binary as the parent
-// process, or whether to use plugin-container (Note that whether or not this
-// value is actually obeyed depends on platform and build configuration. Do not
-// use this value directly, but rather use XRE_GetChildProcBinPathType to
-// resolve this).
-//
 // The values generated for the GeckoProcessType enum are dependent on
 // the ordering of the GECKO_PROCESS_TYPE invocations in this file, and
 // said values are exposed to things like telemetry as well, so please
 // do not reorder lines in this file.
 //
 // Please add new process types at the end of this list.
-GECKO_PROCESS_TYPE(Default, "default", Parent, Self)
-GECKO_PROCESS_TYPE(Plugin, "plugin", Plugin, PluginContainer)
-GECKO_PROCESS_TYPE(Content, "tab", Content, Self)
-GECKO_PROCESS_TYPE(IPDLUnitTest, "ipdlunittest", IPDLUnitTest, PluginContainer)
+GECKO_PROCESS_TYPE(Default, "default", Parent)
+GECKO_PROCESS_TYPE(Plugin, "plugin", Plugin)
+GECKO_PROCESS_TYPE(Content, "tab", Content)
+GECKO_PROCESS_TYPE(IPDLUnitTest, "ipdlunittest", IPDLUnitTest)
 // Gecko Media Plugin process.
-GECKO_PROCESS_TYPE(GMPlugin, "gmplugin", GMPlugin, PluginContainer)
+GECKO_PROCESS_TYPE(GMPlugin, "gmplugin", GMPlugin)
 // GPU and compositor process.
-GECKO_PROCESS_TYPE(GPU, "gpu", GPU, Self)
+GECKO_PROCESS_TYPE(GPU, "gpu", GPU)
 // VR process.
-GECKO_PROCESS_TYPE(VR, "vr", VR, Self)
+GECKO_PROCESS_TYPE(VR, "vr", VR)
 // Remote Data Decoder process.
-GECKO_PROCESS_TYPE(RDD, "rdd", RDD, Self)
+GECKO_PROCESS_TYPE(RDD, "rdd", RDD)
 // Socket process
-GECKO_PROCESS_TYPE(Socket, "socket", Socket, Self)
-GECKO_PROCESS_TYPE(RemoteSandboxBroker, "sandbox", RemoteSandboxBroker, PluginContainer)
+GECKO_PROCESS_TYPE(Socket, "socket", Socket)
+GECKO_PROCESS_TYPE(RemoteSandboxBroker, "sandbox", RemoteSandboxBroker)
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -360,27 +360,26 @@ XRE_API(void, XRE_TermEmbedding, ())
  *
  * @param aINIFile The INI file to parse
  * @param aAppData The nsXREAppData structure to fill.
  */
 XRE_API(nsresult, XRE_ParseAppData,
         (nsIFile * aINIFile, mozilla::XREAppData& aAppData))
 
 enum GeckoProcessType {
-#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name, bin_type) \
+#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name) \
   GeckoProcessType_##enum_name,
 #include "mozilla/GeckoProcessTypes.h"
 #undef GECKO_PROCESS_TYPE
   GeckoProcessType_End,
   GeckoProcessType_Invalid = GeckoProcessType_End
 };
 
 static const char* const kGeckoProcessTypeString[] = {
-#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name, bin_type) \
-  string_name,
+#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name) string_name,
 #include "mozilla/GeckoProcessTypes.h"
 #undef GECKO_PROCESS_TYPE
 };
 
 static_assert(MOZ_ARRAY_LENGTH(kGeckoProcessTypeString) == GeckoProcessType_End,
               "Array length mismatch");
 
 XRE_API(const char*, XRE_ChildProcessTypeToString,
@@ -434,17 +433,17 @@ XRE_API(bool, XRE_IsE10sParentProcess, (
 
 /**
  * Defines XRE_IsParentProcess, XRE_IsContentProcess, etc.
  *
  * XRE_IsParentProcess is unique in that it returns true when called in
  * the e10s parent process or called in the main process when e10s is
  * disabled.
  */
-#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name, bin_type) \
+#define GECKO_PROCESS_TYPE(enum_name, string_name, xre_name) \
   XRE_API(bool, XRE_Is##xre_name##Process, ())
 #include "mozilla/GeckoProcessTypes.h"
 #undef GECKO_PROCESS_TYPE
 
 XRE_API(bool, XRE_IsSocketProcess, ())
 
 /**
  * Returns true if the appshell should run its own native event loop. Returns
@@ -490,22 +489,16 @@ XRE_API(void, XRE_TelemetryAccumulate, (
 
 XRE_API(void, XRE_StartupTimelineRecord, (int aEvent, mozilla::TimeStamp aWhen))
 
 XRE_API(void, XRE_InitOmnijar, (nsIFile * aGreOmni, nsIFile* aAppOmni))
 XRE_API(void, XRE_StopLateWriteChecks, (void))
 
 XRE_API(void, XRE_EnableSameExecutableForContentProc, ())
 
-namespace mozilla {
-enum class BinPathType { Self, PluginContainer };
-}
-XRE_API(mozilla::BinPathType, XRE_GetChildProcBinPathType,
-        (GeckoProcessType aProcessType));
-
 XRE_API(int, XRE_XPCShellMain,
         (int argc, char** argv, char** envp, const XREShellData* aShellData))
 
 #ifdef LIBFUZZER
 #  include "FuzzerRegistry.h"
 
 XRE_API(void, XRE_LibFuzzerSetDriver, (LibFuzzerDriver))