Commit 0062b28a authored by Dsmith's avatar Dsmith
Browse files

Backed out 2 changesets (bug 1726804) for causing bug 1744533. 

Backed out changeset beed6924c87a (bug 1726804)
Backed out changeset d76685524336 (bug 1726804)
parent 6f0fe412

.eslintignore

+0 −3
Original line number Diff line number Diff line
@@ -221,8 +221,5 @@ tools/update-packaging/**/*refs.js 
# Ignore backgroundtasks preferences files.

toolkit/components/backgroundtasks/defaults



# Uses preprocessing

toolkit/components/crashes/CrashManager.jsm



# Ignore pre-generated webpack and typescript transpiled files for translations

browser/extensions/translations/extension/

build/common_virtualenv_packages.txt

+0 −1
Original line number Diff line number Diff line
@@ -123,5 +123,4 @@ pth:toolkit/components/telemetry/tests/marionette/harness 
pth:tools

pth:tools/moztreedocs

pth:xpcom/ds/tools

pth:xpcom/geckoprocesstypes_generator

pth:xpcom/idl-parser

dom/base/ChromeUtils.cpp

+37 −32
Original line number Diff line number Diff line
@@ -864,20 +864,17 @@ static WebIDLProcType ProcTypeToWebIDL(mozilla::ProcType aType) { 
    PROCTYPE_TO_WEBIDL_CASE(WebCOOPCOEP, WithCoopCoep);

    PROCTYPE_TO_WEBIDL_CASE(WebServiceWorker, WebServiceWorker);

    PROCTYPE_TO_WEBIDL_CASE(WebLargeAllocation, WebLargeAllocation);

#define GECKO_PROCESS_TYPE(enum_value, enum_name, string_name, proc_typename, \

                           process_bin_type, procinfo_typename,               \

                           webidl_typename, allcaps_name)                     \

  PROCTYPE_TO_WEBIDL_CASE(procinfo_typename, webidl_typename);

#define SKIP_PROCESS_TYPE_CONTENT

#ifndef MOZ_ENABLE_FORKSERVER

#  define SKIP_PROCESS_TYPE_FORKSERVER

#endif  // MOZ_ENABLE_FORKSERVER

#include "mozilla/GeckoProcessTypes.h"

#undef SKIP_PROCESS_TYPE_CONTENT

#ifndef MOZ_ENABLE_FORKSERVER

#  undef SKIP_PROCESS_TYPE_FORKSERVER

#endif  // MOZ_ENABLE_FORKSERVER

#undef GECKO_PROCESS_TYPE

    PROCTYPE_TO_WEBIDL_CASE(Browser, Browser);

    PROCTYPE_TO_WEBIDL_CASE(IPDLUnitTest, IpdlUnitTest);

    PROCTYPE_TO_WEBIDL_CASE(GMPlugin, GmpPlugin);

    PROCTYPE_TO_WEBIDL_CASE(GPU, Gpu);

    PROCTYPE_TO_WEBIDL_CASE(VR, Vr);

    PROCTYPE_TO_WEBIDL_CASE(RDD, Rdd);

    PROCTYPE_TO_WEBIDL_CASE(Socket, Socket);

    PROCTYPE_TO_WEBIDL_CASE(RemoteSandboxBroker, RemoteSandboxBroker);

#ifdef MOZ_ENABLE_FORKSERVER

    PROCTYPE_TO_WEBIDL_CASE(ForkServer, ForkServer);

#endif

    PROCTYPE_TO_WEBIDL_CASE(Preallocated, Preallocated);

    PROCTYPE_TO_WEBIDL_CASE(Unknown, Unknown);

  }
@@ -948,28 +945,36 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal, 
            // These processes are handled separately.

            return;

          }

#define GECKO_PROCESS_TYPE(enum_value, enum_name, string_name, proc_typename, \

                           process_bin_type, procinfo_typename,               \

                           webidl_typename, allcaps_name)                     \

  case GeckoProcessType::GeckoProcessType_##enum_name: {                      \

    type = mozilla::ProcType::procinfo_typename;                              \

    break;                                                                    \

  }

#define SKIP_PROCESS_TYPE_CONTENT

#ifndef MOZ_ENABLE_FORKSERVER

#  define SKIP_PROCESS_TYPE_FORKSERVER

#endif  // MOZ_ENABLE_FORKSERVER

#include "mozilla/GeckoProcessTypes.h"

#ifndef MOZ_ENABLE_FORKSERVER

#  undef SKIP_PROCESS_TYPE_FORKSERVER

#endif  // MOZ_ENABLE_FORKSERVER

#undef SKIP_PROCESS_TYPE_CONTENT

#undef GECKO_PROCESS_TYPE

          case GeckoProcessType::GeckoProcessType_Default:

            type = mozilla::ProcType::Browser;

            break;

          case GeckoProcessType::GeckoProcessType_GMPlugin:

            type = mozilla::ProcType::GMPlugin;

            break;

          case GeckoProcessType::GeckoProcessType_GPU:

            type = mozilla::ProcType::GPU;

            break;

          case GeckoProcessType::GeckoProcessType_VR:

            type = mozilla::ProcType::VR;

            break;

          case GeckoProcessType::GeckoProcessType_RDD:

            type = mozilla::ProcType::RDD;

            break;

          case GeckoProcessType::GeckoProcessType_Socket:

            type = mozilla::ProcType::Socket;

            break;

          case GeckoProcessType::GeckoProcessType_RemoteSandboxBroker:

            type = mozilla::ProcType::RemoteSandboxBroker;

            break;

#ifdef MOZ_ENABLE_FORKSERVER

          case GeckoProcessType::GeckoProcessType_ForkServer:

            type = mozilla::ProcType::ForkServer;

            break;

#endif

          default:

            // Leave the default Unknown value in |type|.

            break;

        }



        requests.EmplaceBack(

            /* aPid = */ childPid,

            /* aProcessType = */ type,

ipc/glue/CrashReporterHost.cpp

+42 −5
Original line number Diff line number Diff line
@@ -14,6 +14,44 @@ 
#include "nsXULAppAPI.h"

#include "nsIFile.h"



// Consistency checking for nsICrashService constants.  We depend on the

// equivalence between nsICrashService values and GeckoProcessType values

// in the code below.  Making them equal also ensures that if new process

// types are added, people will know they may need to add crash reporting

// support in various places because compilation errors will be triggered here.

static_assert(nsICrashService::PROCESS_TYPE_MAIN ==

                  (int)GeckoProcessType_Default,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_CONTENT ==

                  (int)GeckoProcessType_Content,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_IPDLUNITTEST ==

                  (int)GeckoProcessType_IPDLUnitTest,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_GMPLUGIN ==

                  (int)GeckoProcessType_GMPlugin,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_GPU == (int)GeckoProcessType_GPU,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_VR == (int)GeckoProcessType_VR,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_RDD == (int)GeckoProcessType_RDD,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_SOCKET ==

                  (int)GeckoProcessType_Socket,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_SANDBOX_BROKER ==

                  (int)GeckoProcessType_RemoteSandboxBroker,

              "GeckoProcessType enum is out of sync with nsICrashService!");

static_assert(nsICrashService::PROCESS_TYPE_FORKSERVER ==

                  (int)GeckoProcessType_ForkServer,

              "GeckoProcessType enum is out of sync with nsICrashService!");

// Add new static asserts here if you add more process types.

// Update this static assert as well.

static_assert(nsICrashService::PROCESS_TYPE_FORKSERVER + 1 ==

                  (int)GeckoProcessType_End,

              "GeckoProcessType enum is out of sync with nsICrashService!");



namespace mozilla {

namespace ipc {
@@ -102,9 +140,8 @@ void CrashReporterHost::RecordCrashWithTelemetry(GeckoProcessType aProcessType, 
  nsCString key;



  switch (aProcessType) {

#define GECKO_PROCESS_TYPE(enum_value, enum_name, string_name, proc_typename, \

                           process_bin_type, procinfo_typename,               \

                           webidl_typename, allcaps_name)                     \

#define GECKO_PROCESS_TYPE(enum_value, enum_name, string_name, xre_name, \

                           bin_type)                                     \

  case GeckoProcessType_##enum_name:                                     \

    key.AssignLiteral(string_name);                                      \

    break;

js/src/make-source-package.py

+0 −2
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ rsync_filter_list = """ 
+ /toolkit/crashreporter/tools/symbolstore.py

+ /toolkit/mozapps/installer/package-name.mk



+ /xpcom/geckoprocesstypes_generator/**



# SpiderMonkey itself



+ /js/src/**