Backed out 2 changesets (bug 1632794) for build bustages on ChromeUtils.cpp . CLOSED TREE

Backed out changeset 28f67adaba65 (bug 1632794)
Backed out changeset e3c323874e2e (bug 1632794)

Author: nbeleuzu

docshell/base/nsAboutRedirector.cpp

@@ -101,8 +101,6 @@ static const RedirEntry kRedirMap[] = {
      nsIAboutModule::ALLOW_SCRIPT},
     {"plugins", "chrome://global/content/plugins.html",
      nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
-    {"processes", "chrome://global/content/aboutProcesses.html",
-     nsIAboutModule::ALLOW_SCRIPT},
     // about:serviceworkers always wants to load in the parent process because
     // when dom.serviceWorkers.parent_intercept is set to true (the new default)
     // then the only place nsIServiceWorkerManager has any data is in the

docshell/build/components.conf

@@ -36,8 +36,6 @@ if defined('MOZ_CRASHREPORTER'):
     about_pages.append('crashes')
 if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':
     about_pages.append('profiles')
-if defined('NIGHTLY_BUILD'):
-    about_pages.append('processes')
 
 Headers = ['/docshell/build/nsDocShellModule.h']
 

dom/base/ChromeUtils.cpp

@@ -741,12 +741,9 @@ static WebIDLProcType ProcTypeToWebIDL(mozilla::ProcType aType) {
 
   switch (aType) {
     PROCTYPE_TO_WEBIDL_CASE(Web, Web);
-    PROCTYPE_TO_WEBIDL_CASE(WebIsolated, WebIsolated);
     PROCTYPE_TO_WEBIDL_CASE(File, File);
     PROCTYPE_TO_WEBIDL_CASE(Extension, Extension);
     PROCTYPE_TO_WEBIDL_CASE(PrivilegedAbout, Privilegedabout);
-    PROCTYPE_TO_WEBIDL_CASE(PrivilegedMozilla, Privilegedmozilla);
-    PROCTYPE_TO_WEBIDL_CASE(WebCOOPCOEP, WithCoopCoep);
     PROCTYPE_TO_WEBIDL_CASE(WebLargeAllocation, WebLargeAllocation);
     PROCTYPE_TO_WEBIDL_CASE(Browser, Browser);
     PROCTYPE_TO_WEBIDL_CASE(Plugin, Plugin);
@@ -792,7 +789,7 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
       global->EventTargetFor(TaskCategory::Performance);
 
   // Getting the parent proc info
-  mozilla::GetProcInfo(parentPid, 0, mozilla::ProcType::Browser, NS_LITERAL_STRING(""))
+  mozilla::GetProcInfo(parentPid, 0, mozilla::ProcType::Browser)
       ->Then(
           target, __func__,
           [target, domPromise, parentPid](ProcInfo aParentInfo) {
@@ -806,7 +803,7 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
                   if (!aGeckoProcess->GetChildProcessHandle()) {
                     return;
                   }
-                  nsAutoString origin;
+
                   base::ProcessId childPid =
                       base::GetProcId(aGeckoProcess->GetChildProcessHandle());
                   int32_t childId = 0;
@@ -826,51 +823,22 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
                       if (!contentParent) {
                         return;
                       }
-                      // Converting the remoteType into a ProcType.
-                      // Ideally, the remoteType should be strongly typed
-                      // upstream, this would make the conversion less brittle.
-                      nsAutoString remoteType(contentParent->GetRemoteType());
-                      if (StringBeginsWith(
-                              remoteType,
-                              NS_LITERAL_STRING(FISSION_WEB_REMOTE_TYPE))) {
-                        // WARNING: Do not change the order, as
-                        // `DEFAULT_REMOTE_TYPE` is a prefix of
-                        // `FISSION_WEB_REMOTE_TYPE`.
-                        type = mozilla::ProcType::WebIsolated;
-                      } else if (StringBeginsWith(
-                                     remoteType,
-                                     NS_LITERAL_STRING(DEFAULT_REMOTE_TYPE))) {
+                      // Converting the Content Type into a ProcType
+                      nsAutoString processType;
+                      processType.Assign(contentParent->GetRemoteType());
+                      if (IsWebRemoteType(processType)) {
                         type = mozilla::ProcType::Web;
-                      } else if (remoteType.EqualsLiteral(FILE_REMOTE_TYPE)) {
+                      } else if (processType.EqualsLiteral(FILE_REMOTE_TYPE)) {
                         type = mozilla::ProcType::File;
-                      } else if (remoteType.EqualsLiteral(
+                      } else if (processType.EqualsLiteral(
                                      EXTENSION_REMOTE_TYPE)) {
                         type = mozilla::ProcType::Extension;
-                      } else if (remoteType.EqualsLiteral(
+                      } else if (processType.EqualsLiteral(
                                      PRIVILEGEDABOUT_REMOTE_TYPE)) {
                         type = mozilla::ProcType::PrivilegedAbout;
-                      } else if (remoteType.EqualsLiteral(
-                                     PRIVILEGEDMOZILLA_REMOTE_TYPE)) {
-                        type = mozilla::ProcType::PrivilegedMozilla;
-                      } else if (StringBeginsWith(
-                                     remoteType,
-                                     NS_LITERAL_STRING(
-                                         WITH_COOP_COEP_REMOTE_TYPE_PREFIX))) {
-                        type = mozilla::ProcType::WebCOOPCOEP;
-                      } else if (remoteType.EqualsLiteral(
+                      } else if (processType.EqualsLiteral(
                                      LARGE_ALLOCATION_REMOTE_TYPE)) {
                         type = mozilla::ProcType::WebLargeAllocation;
-                      } else {
-                        MOZ_CRASH("Unknown remoteType");
-                      }
-
-                      // By convention, everything after '=' is the origin.
-                      nsAString::const_iterator cursor;
-                      nsAString::const_iterator end;
-                      remoteType.BeginReading(cursor);
-                      remoteType.EndReading(end);
-                      if (FindCharInReadable(u'=', cursor, end)) {
-                        origin = Substring(++cursor, end);
                       }
                       childId = contentParent->ChildID();
                       break;
@@ -911,10 +879,10 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
 
                   promises.AppendElement(
 #ifdef XP_MACOSX
-                      mozilla::GetProcInfo(childPid, childId, type, origin,
+                      mozilla::GetProcInfo(childPid, childId, type,
                                            aGeckoProcess->GetChildTask())
 #else
-                      mozilla::GetProcInfo(childPid, childId, type, origin)
+                      mozilla::GetProcInfo(childPid, childId, type)
 #endif
                   );
                 });
@@ -960,7 +928,6 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
                     // Basic info.
                     childProcInfo->mChildID = info.childId;
                     childProcInfo->mType = ProcTypeToWebIDL(info.type);
-                    childProcInfo->mOrigin = info.origin;
                     childProcInfo->mPid = info.pid;
                     childProcInfo->mFilename.Assign(info.filename);
                     childProcInfo->mVirtualMemorySize = info.virtualMemorySize;

dom/chrome-webidl/ChromeUtils.webidl

@@ -498,13 +498,10 @@ partial namespace ChromeUtils {
  */
 enum WebIDLProcType {
  "web",
- "webIsolated",
  "file",
  "extension",
  "privilegedabout",
- "privilegedmozilla",
  "webLargeAllocation",
- "withCoopCoep",
  "browser",
  "plugin",
  "ipdlUnitTest",
@@ -544,7 +541,6 @@ dictionary ChildProcInfoDictionary {
   sequence<ThreadInfoDictionary> threads = [];
   // Firefox info
   unsigned long long ChildID = 0;
-  DOMString origin = "";
   WebIDLProcType type = "web";
 };