From 9904bad8e006dd71204a973f0d91d0737ec917a5 Mon Sep 17 00:00:00 2001
From: Daosheng Mu <daoshengmu@gmail.com>
Date: Tue, 2 Apr 2019 05:13:15 +0000
Subject: [PATCH 01/46] Bug 1520339 - Part 1: adding ensure VR process ready
 mechanism. r=kip

Differential Revision: https://phabricator.services.mozilla.com/D25320

--HG--
extra : moz-landing-system : lando
---
 gfx/thebes/gfxPrefs.h           |  1 +
 gfx/vr/ipc/PVR.ipdl             |  3 +++
 gfx/vr/ipc/VRChild.h            |  3 +++
 gfx/vr/ipc/VRParent.cpp         |  3 +++
 gfx/vr/ipc/VRProcessManager.cpp | 31 +++++++++++++++++++++++-
 gfx/vr/ipc/VRProcessManager.h   |  7 ++++++
 gfx/vr/ipc/VRProcessParent.cpp  | 43 +++++++++++++++++++++++++++++++--
 gfx/vr/ipc/VRProcessParent.h    | 10 ++++++++
 8 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index a7ce1aaef99a..b0ab53ae669d 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -403,6 +403,7 @@ class gfxPrefs final {
   DECL_GFX_PREF(Live, "dom.vr.puppet.submitframe",             VRPuppetSubmitFrame, uint32_t, 0);
   DECL_GFX_PREF(Live, "dom.vr.display.rafMaxDuration",         VRDisplayRafMaxDuration, uint32_t, 50);
   DECL_GFX_PREF(Once, "dom.vr.process.enabled",                VRProcessEnabled, bool, false);
+  DECL_GFX_PREF(Once, "dom.vr.process.startup_timeout_ms",     VRProcessTimeoutMs, int32_t, 5000);
   DECL_GFX_PREF(Once, "dom.vr.service.enabled",                VRServiceEnabled, bool, true);
   DECL_GFX_PREF(Live, "dom.w3c_pointer_events.enabled",        PointerEventsEnabled, bool, false);
 
diff --git a/gfx/vr/ipc/PVR.ipdl b/gfx/vr/ipc/PVR.ipdl
index 0628918a1178..52ccfdb61bca 100644
--- a/gfx/vr/ipc/PVR.ipdl
+++ b/gfx/vr/ipc/PVR.ipdl
@@ -29,6 +29,9 @@ parent:
   async OpenVRControllerManifestPathToVR(OpenVRControllerType aType, nsCString aPath);
 
 child:
+  // Sent when the GPU process has initialized devices. This occurs once, after
+  // Init().
+  async InitComplete();
   async OpenVRControllerActionPathToParent(nsCString aPath);
   async OpenVRControllerManifestPathToParent(OpenVRControllerType aType, nsCString aPath);
   async InitCrashReporter(Shmem shmem, NativeThreadId threadId);
diff --git a/gfx/vr/ipc/VRChild.h b/gfx/vr/ipc/VRChild.h
index 9b2c2c77f3ec..7e7e2a5ff8e1 100644
--- a/gfx/vr/ipc/VRChild.h
+++ b/gfx/vr/ipc/VRChild.h
@@ -30,6 +30,7 @@ class VRChild final : public PVRChild, public gfxVarReceiver {
 
   static void Destroy(UniquePtr<VRChild>&& aChild);
   void Init();
+  bool EnsureVRReady();
   virtual void OnVarChanged(const GfxVarUpdate& aVar) override;
 
  protected:
@@ -38,12 +39,14 @@ class VRChild final : public PVRChild, public gfxVarReceiver {
       const nsCString& aPath);
   mozilla::ipc::IPCResult RecvOpenVRControllerManifestPathToParent(
       const OpenVRControllerType& aType, const nsCString& aPath);
+  mozilla::ipc::IPCResult RecvInitComplete();
   mozilla::ipc::IPCResult RecvInitCrashReporter(
       Shmem&& shmem, const NativeThreadId& aThreadId);
 
  private:
   VRProcessParent* mHost;
   UniquePtr<ipc::CrashReporterHost> mCrashReporter;
+  bool mVRReady;
 };
 
 }  // namespace gfx
diff --git a/gfx/vr/ipc/VRParent.cpp b/gfx/vr/ipc/VRParent.cpp
index 1118154befa8..08266462ccc5 100644
--- a/gfx/vr/ipc/VRParent.cpp
+++ b/gfx/vr/ipc/VRParent.cpp
@@ -39,6 +39,8 @@ IPCResult VRParent::RecvNewGPUVRManager(Endpoint<PVRGPUParent>&& aEndpoint) {
 IPCResult VRParent::RecvInit(nsTArray<GfxPrefSetting>&& prefs,
                              nsTArray<GfxVarUpdate>&& vars,
                              const DevicePrefs& devicePrefs) {
+  Unused << SendInitComplete();
+
   const nsTArray<gfxPrefs::Pref*>& globalPrefs = gfxPrefs::all();
   for (auto& setting : prefs) {
     gfxPrefs::Pref* pref = globalPrefs[setting.index()];
@@ -161,6 +163,7 @@ bool VRParent::Init(base::ProcessId aParentPid, const char* aParentBuildID,
     return false;
   }
 
+  mozilla::ipc::SetThisProcessName("VR Process");
   return true;
 }
 
diff --git a/gfx/vr/ipc/VRProcessManager.cpp b/gfx/vr/ipc/VRProcessManager.cpp
index 6ea88b87af4d..c38e862244e9 100644
--- a/gfx/vr/ipc/VRProcessManager.cpp
+++ b/gfx/vr/ipc/VRProcessManager.cpp
@@ -30,7 +30,7 @@ void VRProcessManager::Initialize() {
 /* static */
 void VRProcessManager::Shutdown() { sSingleton = nullptr; }
 
-VRProcessManager::VRProcessManager() : mProcess(nullptr) {
+VRProcessManager::VRProcessManager() : mProcess(nullptr), mVRChild(nullptr) {
   MOZ_COUNT_CTOR(VRProcessManager);
 
   mObserver = new Observer(this);
@@ -79,14 +79,43 @@ void VRProcessManager::DestroyProcess() {
 
   mProcess->Shutdown();
   mProcess = nullptr;
+  mVRChild = nullptr;
 
   CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::VRProcessStatus,
                                      NS_LITERAL_CSTRING("Destroyed"));
 }
 
+bool VRProcessManager::EnsureVRReady() {
+  if (mProcess && !mProcess->IsConnected()) {
+    if (!mProcess->WaitForLaunch()) {
+      // If this fails, we should have fired OnProcessLaunchComplete and
+      // removed the process.
+      MOZ_ASSERT(!mProcess && !mVRChild);
+      return false;
+    }
+  }
+
+  if (mVRChild) {
+    if (mVRChild->EnsureVRReady()) {
+      return true;
+    }
+
+    // If the initialization above fails, we likely have a GPU process teardown
+    // waiting in our message queue (or will soon). We need to ensure we don't
+    // restart it later because if we fail here, our callers assume they should
+    // fall back to a combined UI/GPU process. This also ensures our internal
+    // state is consistent (e.g. process token is reset).
+    DisableVRProcess("Failed to initialize VR process");
+  }
+
+  return false;
+}
+
 void VRProcessManager::OnProcessLaunchComplete(VRProcessParent* aParent) {
   MOZ_ASSERT(mProcess && mProcess == aParent);
 
+  mVRChild = mProcess->GetActor();
+
   if (!mProcess->IsConnected()) {
     DestroyProcess();
     return;
diff --git a/gfx/vr/ipc/VRProcessManager.h b/gfx/vr/ipc/VRProcessManager.h
index 1cde3c1ada52..6708c3196f3c 100644
--- a/gfx/vr/ipc/VRProcessManager.h
+++ b/gfx/vr/ipc/VRProcessManager.h
@@ -27,6 +27,12 @@ class VRProcessManager final : public VRProcessParent::Listener {
 
   // If not using a VR process, launch a new VR process asynchronously.
   void LaunchVRProcess();
+
+  // Ensure that VR-bound methods can be used. If no VR process is being
+  // used, or one is launched and ready, this function returns immediately.
+  // Otherwise it blocks until the VR process has finished launching.
+  bool EnsureVRReady();
+
   bool CreateGPUBridges(base::ProcessId aOtherProcess,
                         mozilla::ipc::Endpoint<PVRGPUChild>* aOutVRBridge);
 
@@ -65,6 +71,7 @@ class VRProcessManager final : public VRProcessParent::Listener {
 
   RefPtr<Observer> mObserver;
   VRProcessParent* mProcess;
+  VRChild* mVRChild;
 };
 
 }  // namespace gfx
diff --git a/gfx/vr/ipc/VRProcessParent.cpp b/gfx/vr/ipc/VRProcessParent.cpp
index a7d3ba5dd4e9..af09cc911b15 100644
--- a/gfx/vr/ipc/VRProcessParent.cpp
+++ b/gfx/vr/ipc/VRProcessParent.cpp
@@ -33,6 +33,7 @@ VRProcessParent::VRProcessParent(Listener* aListener)
     : GeckoChildProcessHost(GeckoProcessType_VR),
       mTaskFactory(this),
       mListener(aListener),
+      mLaunchPhase(LaunchPhase::Unlaunched),
       mChannelClosed(false),
       mShutdownRequested(false) {
   MOZ_COUNT_CTOR(VRProcessParent);
@@ -49,19 +50,47 @@ VRProcessParent::~VRProcessParent() {
 }
 
 bool VRProcessParent::Launch() {
+  MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
+  MOZ_ASSERT(!mVRChild);
   mLaunchThread = NS_GetCurrentThread();
 
+  mLaunchPhase = LaunchPhase::Waiting;
+
   std::vector<std::string> extraArgs;
   nsCString parentBuildID(mozilla::PlatformBuildID());
   extraArgs.push_back("-parentBuildID");
   extraArgs.push_back(parentBuildID.get());
 
   if (!GeckoChildProcessHost::AsyncLaunch(extraArgs)) {
+    mLaunchPhase = LaunchPhase::Complete;
     return false;
   }
   return true;
 }
 
+bool VRProcessParent::WaitForLaunch() {
+  if (mLaunchPhase == LaunchPhase::Complete) {
+    return !!mVRChild;
+  }
+
+  int32_t timeoutMs = gfxPrefs::VRProcessTimeoutMs();
+
+  // If one of the following environment variables are set we can effectively
+  // ignore the timeout - as we can guarantee the compositor process will be
+  // terminated
+  if (PR_GetEnv("MOZ_DEBUG_CHILD_PROCESS") ||
+      PR_GetEnv("MOZ_DEBUG_CHILD_PAUSE")) {
+    timeoutMs = 0;
+  }
+
+  // Our caller expects the connection to be finished after we return, so we
+  // immediately set up the IPDL actor and fire callbacks. The IO thread will
+  // still dispatch a notification to the main thread - we'll just ignore it.
+  bool result = GeckoChildProcessHost::WaitUntilConnected(timeoutMs);
+  InitAfterConnect(result);
+  return result;
+}
+
 void VRProcessParent::Shutdown() {
   MOZ_ASSERT(!mShutdownRequested);
   mListener = nullptr;
@@ -101,6 +130,10 @@ void VRProcessParent::DestroyProcess() {
 }
 
 void VRProcessParent::InitAfterConnect(bool aSucceeded) {
+  MOZ_ASSERT(mLaunchPhase == LaunchPhase::Waiting);
+  MOZ_ASSERT(!mVRChild);
+
+  mLaunchPhase = LaunchPhase::Complete;
   if (aSucceeded) {
     mVRChild = MakeUnique<VRChild>(this);
 
@@ -157,10 +190,16 @@ void VRProcessParent::OnChannelConnected(int32_t peer_pid) {
   NS_DispatchToMainThread(runnable);
 }
 
-void VRProcessParent::OnChannelConnectedTask() { InitAfterConnect(true); }
+void VRProcessParent::OnChannelConnectedTask() {
+  if (mLaunchPhase == LaunchPhase::Waiting) {
+    InitAfterConnect(true);
+  }
+}
 
 void VRProcessParent::OnChannelErrorTask() {
-  MOZ_ASSERT(false, "VR process channel error.");
+  if (mLaunchPhase == LaunchPhase::Waiting) {
+    InitAfterConnect(false);
+  }
 }
 
 void VRProcessParent::OnChannelClosed() {
diff --git a/gfx/vr/ipc/VRProcessParent.h b/gfx/vr/ipc/VRProcessParent.h
index 434bcf3eb7a8..22d3c7339766 100644
--- a/gfx/vr/ipc/VRProcessParent.h
+++ b/gfx/vr/ipc/VRProcessParent.h
@@ -32,6 +32,11 @@ class VRProcessParent final : public mozilla::ipc::GeckoChildProcessHost {
   explicit VRProcessParent(Listener* aListener);
 
   bool Launch();
+  // If the process is being launched, block until it has launched and
+  // connected. If a launch task is pending, it will fire immediately.
+  //
+  // Returns true if the process is successfully connected; false otherwise.
+  bool WaitForLaunch();
   void Shutdown();
   void DestroyProcess();
   bool CanShutdown() override { return true; }
@@ -45,6 +50,9 @@ class VRProcessParent final : public mozilla::ipc::GeckoChildProcessHost {
 
   base::ProcessId OtherPid();
   VRChild* GetActor() const { return mVRChild.get(); }
+  // Return a unique id for this process, guaranteed not to be shared with any
+  // past or future instance of VRProcessParent.
+  uint64_t GetProcessToken() const;
 
  private:
   ~VRProcessParent();
@@ -59,6 +67,8 @@ class VRProcessParent final : public mozilla::ipc::GeckoChildProcessHost {
   nsCOMPtr<nsIThread> mLaunchThread;
   Listener* mListener;
 
+  enum class LaunchPhase { Unlaunched, Waiting, Complete };
+  LaunchPhase mLaunchPhase;
   bool mChannelClosed;
   bool mShutdownRequested;
 };

From 0965abeaa72a8c9912cd0ac0c06b3bc6ed991c06 Mon Sep 17 00:00:00 2001
From: Daosheng Mu <daoshengmu@gmail.com>
Date: Tue, 2 Apr 2019 05:13:17 +0000
Subject: [PATCH 02/46] Bug 1520339 - Part 2: handling memory reporting for VR
 process. r=kip,erahm

Differential Revision: https://phabricator.services.mozilla.com/D25321

--HG--
extra : moz-landing-system : lando
---
 gfx/vr/ipc/PVR.ipdl                    |  8 +++-
 gfx/vr/ipc/VRChild.cpp                 | 46 +++++++++++++++++++++-
 gfx/vr/ipc/VRChild.h                   | 12 ++++++
 gfx/vr/ipc/VRParent.cpp                | 19 +++++++++
 gfx/vr/ipc/VRParent.h                  |  4 ++
 gfx/vr/ipc/VRProcessManager.cpp        | 53 ++++++++++++++++++++++++++
 gfx/vr/ipc/VRProcessManager.h          |  4 ++
 xpcom/base/nsMemoryReporterManager.cpp |  7 ++++
 xpcom/build/components.conf            |  2 +-
 9 files changed, 152 insertions(+), 3 deletions(-)

diff --git a/gfx/vr/ipc/PVR.ipdl b/gfx/vr/ipc/PVR.ipdl
index 52ccfdb61bca..e81a2851d64c 100644
--- a/gfx/vr/ipc/PVR.ipdl
+++ b/gfx/vr/ipc/PVR.ipdl
@@ -9,6 +9,7 @@ using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
 include "VRMessageUtils.h";
 
 include GraphicsMessages;
+include MemoryReportTypes;
 include protocol PVRGPU;
 
 include "VRMessageUtils.h";
@@ -27,7 +28,10 @@ parent:
   async UpdateVar(GfxVarUpdate var);
   async OpenVRControllerActionPathToVR(nsCString aPath);
   async OpenVRControllerManifestPathToVR(OpenVRControllerType aType, nsCString aPath);
-
+  async RequestMemoryReport(uint32_t generation,
+                            bool anonymize,
+                            bool minimizeMemoryUsage,
+                            FileDescriptor? DMDFile);
 child:
   // Sent when the GPU process has initialized devices. This occurs once, after
   // Init().
@@ -35,6 +39,8 @@ child:
   async OpenVRControllerActionPathToParent(nsCString aPath);
   async OpenVRControllerManifestPathToParent(OpenVRControllerType aType, nsCString aPath);
   async InitCrashReporter(Shmem shmem, NativeThreadId threadId);
+  async AddMemoryReport(MemoryReport aReport);
+  async FinishMemoryReport(uint32_t aGeneration);
 };
 
 } // namespace gfx
diff --git a/gfx/vr/ipc/VRChild.cpp b/gfx/vr/ipc/VRChild.cpp
index 97982de34708..aaf00a6045a5 100644
--- a/gfx/vr/ipc/VRChild.cpp
+++ b/gfx/vr/ipc/VRChild.cpp
@@ -12,6 +12,7 @@
 #include "mozilla/SystemGroup.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/VsyncDispatcher.h"
+#include "mozilla/dom/MemoryReportRequest.h"
 #include "mozilla/ipc/CrashReporterHost.h"
 
 namespace mozilla {
@@ -66,10 +67,29 @@ class OpenVRControllerManifestManager {
 
 StaticRefPtr<OpenVRControllerManifestManager> sOpenVRControllerManifestManager;
 
-VRChild::VRChild(VRProcessParent* aHost) : mHost(aHost) {
+VRChild::VRChild(VRProcessParent* aHost)
+  : mHost(aHost),
+    mVRReady(false) {
   MOZ_ASSERT(XRE_IsParentProcess());
 }
 
+mozilla::ipc::IPCResult VRChild::RecvAddMemoryReport(
+    const MemoryReport& aReport) {
+  if (mMemoryReportRequest) {
+    mMemoryReportRequest->RecvReport(aReport);
+  }
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult VRChild::RecvFinishMemoryReport(
+    const uint32_t& aGeneration) {
+  if (mMemoryReportRequest) {
+    mMemoryReportRequest->Finish(aGeneration);
+    mMemoryReportRequest = nullptr;
+  }
+  return IPC_OK();
+}
+
 void VRChild::ActorDestroy(ActorDestroyReason aWhy) {
   if (aWhy == AbnormalShutdown) {
     if (mCrashReporter) {
@@ -144,6 +164,14 @@ void VRChild::Init() {
   gfxVars::AddReceiver(this);
 }
 
+bool VRChild::EnsureVRReady() {
+  if (!mVRReady) {
+    return false;
+  }
+
+  return true;
+}
+
 mozilla::ipc::IPCResult VRChild::RecvOpenVRControllerActionPathToParent(
     const nsCString& aPath) {
   sOpenVRControllerManifestManager->SetOpenVRControllerActionPath(aPath);
@@ -157,6 +185,12 @@ mozilla::ipc::IPCResult VRChild::RecvOpenVRControllerManifestPathToParent(
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult VRChild::RecvInitComplete() {
+  // We synchronously requested VR parameters before this arrived.
+  mVRReady = true;
+  return IPC_OK();
+}
+
 mozilla::ipc::IPCResult VRChild::RecvInitCrashReporter(
     Shmem&& aShmem, const NativeThreadId& aThreadId) {
   mCrashReporter = MakeUnique<ipc::CrashReporterHost>(GeckoProcessType_VR,
@@ -165,6 +199,16 @@ mozilla::ipc::IPCResult VRChild::RecvInitCrashReporter(
   return IPC_OK();
 }
 
+bool VRChild::SendRequestMemoryReport(const uint32_t& aGeneration,
+                                       const bool& aAnonymize,
+                                       const bool& aMinimizeMemoryUsage,
+                                       const Maybe<FileDescriptor>& aDMDFile) {
+  mMemoryReportRequest = MakeUnique<MemoryReportRequestHost>(aGeneration);
+  Unused << PVRChild::SendRequestMemoryReport(aGeneration, aAnonymize,
+                                              aMinimizeMemoryUsage, aDMDFile);
+  return true;
+}
+
 void VRChild::OnVarChanged(const GfxVarUpdate& aVar) { SendUpdateVar(aVar); }
 
 class DeferredDeleteVRChild : public Runnable {
diff --git a/gfx/vr/ipc/VRChild.h b/gfx/vr/ipc/VRChild.h
index 7e7e2a5ff8e1..2396abea2aca 100644
--- a/gfx/vr/ipc/VRChild.h
+++ b/gfx/vr/ipc/VRChild.h
@@ -16,12 +16,16 @@ namespace mozilla {
 namespace ipc {
 class CrashReporterHost;
 }  // namespace ipc
+namespace dom {
+class MemoryReportRequestHost;
+}  // namespace dom
 namespace gfx {
 
 class VRProcessParent;
 class VRChild;
 
 class VRChild final : public PVRChild, public gfxVarReceiver {
+  typedef mozilla::dom::MemoryReportRequestHost MemoryReportRequestHost;
   friend class PVRChild;
 
  public:
@@ -32,6 +36,10 @@ class VRChild final : public PVRChild, public gfxVarReceiver {
   void Init();
   bool EnsureVRReady();
   virtual void OnVarChanged(const GfxVarUpdate& aVar) override;
+  bool SendRequestMemoryReport(const uint32_t& aGeneration,
+                               const bool& aAnonymize,
+                               const bool& aMinimizeMemoryUsage,
+                               const Maybe<ipc::FileDescriptor>& aDMDFile);
 
  protected:
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
@@ -43,9 +51,13 @@ class VRChild final : public PVRChild, public gfxVarReceiver {
   mozilla::ipc::IPCResult RecvInitCrashReporter(
       Shmem&& shmem, const NativeThreadId& aThreadId);
 
+  mozilla::ipc::IPCResult RecvAddMemoryReport(const MemoryReport& aReport);
+  mozilla::ipc::IPCResult RecvFinishMemoryReport(const uint32_t& aGeneration);
+
  private:
   VRProcessParent* mHost;
   UniquePtr<ipc::CrashReporterHost> mCrashReporter;
+  UniquePtr<MemoryReportRequestHost> mMemoryReportRequest;
   bool mVRReady;
 };
 
diff --git a/gfx/vr/ipc/VRParent.cpp b/gfx/vr/ipc/VRParent.cpp
index 08266462ccc5..1401b94abd55 100644
--- a/gfx/vr/ipc/VRParent.cpp
+++ b/gfx/vr/ipc/VRParent.cpp
@@ -9,12 +9,14 @@
 #include "VRManager.h"
 #include "gfxConfig.h"
 #include "nsDebugImpl.h"
+#include "ProcessUtils.h"
 
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/ipc/CrashReporterClient.h"
 #include "mozilla/ipc/ProcessChild.h"
 
 #if defined(XP_WIN)
+#  include <process.h>
 #  include "mozilla/gfx/DeviceManagerDx.h"
 #endif
 
@@ -95,6 +97,23 @@ mozilla::ipc::IPCResult VRParent::RecvOpenVRControllerManifestPathToVR(
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult VRParent::RecvRequestMemoryReport(
+    const uint32_t& aGeneration, const bool& aAnonymize,
+    const bool& aMinimizeMemoryUsage, const Maybe<FileDescriptor>& aDMDFile) {
+  MOZ_ASSERT(XRE_IsVRProcess());
+  nsPrintfCString processName("VR (pid %u)", (unsigned)getpid());
+
+  mozilla::dom::MemoryReportRequestClient::Start(
+      aGeneration, aAnonymize, aMinimizeMemoryUsage, aDMDFile, processName,
+      [&](const MemoryReport& aReport) {
+        Unused << SendAddMemoryReport(aReport);
+      },
+      [&](const uint32_t& aGeneration) {
+        return SendFinishMemoryReport(aGeneration);
+      });
+  return IPC_OK();
+}
+
 void VRParent::ActorDestroy(ActorDestroyReason aWhy) {
   if (AbnormalShutdown == aWhy) {
     NS_WARNING("Shutting down VR process early due to a crash!");
diff --git a/gfx/vr/ipc/VRParent.h b/gfx/vr/ipc/VRParent.h
index 999b94a244b6..fe88a6630e25 100644
--- a/gfx/vr/ipc/VRParent.h
+++ b/gfx/vr/ipc/VRParent.h
@@ -46,6 +46,10 @@ class VRParent final : public PVRParent {
       const nsCString& aPath);
   mozilla::ipc::IPCResult RecvOpenVRControllerManifestPathToVR(
       const OpenVRControllerType& aType, const nsCString& aPath);
+  mozilla::ipc::IPCResult RecvRequestMemoryReport(
+      const uint32_t& generation, const bool& anonymize,
+      const bool& minimizeMemoryUsage,
+      const Maybe<ipc::FileDescriptor>& DMDFile);
 
  private:
   nsCString mOpenVRControllerAction;
diff --git a/gfx/vr/ipc/VRProcessManager.cpp b/gfx/vr/ipc/VRProcessManager.cpp
index c38e862244e9..fd3ac1d0f2ce 100644
--- a/gfx/vr/ipc/VRProcessManager.cpp
+++ b/gfx/vr/ipc/VRProcessManager.cpp
@@ -10,6 +10,7 @@
 #include "VRChild.h"
 #include "VRGPUChild.h"
 #include "VRGPUParent.h"
+#include "mozilla/MemoryReportingProcess.h"
 
 namespace mozilla {
 namespace gfx {
@@ -195,5 +196,57 @@ void VRProcessManager::OnXPCOMShutdown() {
 
 VRChild* VRProcessManager::GetVRChild() { return mProcess->GetActor(); }
 
+class VRMemoryReporter : public MemoryReportingProcess {
+ public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VRMemoryReporter, override)
+
+  bool IsAlive() const override {
+    if (VRProcessManager* vpm = VRProcessManager::Get()) {
+      return !!vpm->GetVRChild();
+    }
+    return false;
+  }
+
+  bool SendRequestMemoryReport(const uint32_t& aGeneration,
+                               const bool& aAnonymize,
+                               const bool& aMinimizeMemoryUsage,
+                               const Maybe<FileDescriptor>& aDMDFile) override {
+    VRChild* child = GetChild();
+    if (!child) {
+      return false;
+    }
+
+    return child->SendRequestMemoryReport(aGeneration, aAnonymize,
+                                          aMinimizeMemoryUsage, aDMDFile);
+  }
+
+  int32_t Pid() const override {
+    if (VRChild* child = GetChild()) {
+      return (int32_t)child->OtherPid();
+    }
+    return 0;
+  }
+
+ private:
+  VRChild* GetChild() const {
+    if (VRProcessManager* vpm = VRProcessManager::Get()) {
+      if (VRChild* child = vpm->GetVRChild()) {
+        return child;
+      }
+    }
+    return nullptr;
+  }
+
+ protected:
+  ~VRMemoryReporter() = default;
+};
+
+RefPtr<MemoryReportingProcess> VRProcessManager::GetProcessMemoryReporter() {
+  if (!EnsureVRReady()) {
+    return nullptr;
+  }
+  return new VRMemoryReporter();
+}
+
 }  // namespace gfx
 }  // namespace mozilla
\ No newline at end of file
diff --git a/gfx/vr/ipc/VRProcessManager.h b/gfx/vr/ipc/VRProcessManager.h
index 6708c3196f3c..0640ebee6fbe 100644
--- a/gfx/vr/ipc/VRProcessManager.h
+++ b/gfx/vr/ipc/VRProcessManager.h
@@ -9,6 +9,7 @@
 #include "VRProcessParent.h"
 
 namespace mozilla {
+class MemoryReportingProcess;
 namespace gfx {
 
 class VRManagerChild;
@@ -37,6 +38,9 @@ class VRProcessManager final : public VRProcessParent::Listener {
                         mozilla::ipc::Endpoint<PVRGPUChild>* aOutVRBridge);
 
   VRChild* GetVRChild();
+  // If a VR process is present, create a MemoryReportingProcess object.
+  // Otherwise, return null.
+  RefPtr<MemoryReportingProcess> GetProcessMemoryReporter();
 
   virtual void OnProcessLaunchComplete(VRProcessParent* aParent) override;
   virtual void OnProcessUnexpectedShutdown(VRProcessParent* aParent) override;
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 1ef57a007bac..7344f190d50b 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -27,6 +27,7 @@
 #endif
 #include "nsNetCID.h"
 #include "nsThread.h"
+#include "VRProcessManager.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReportingProcess.h"
 #include "mozilla/PodOperations.h"
@@ -1814,6 +1815,12 @@ nsresult nsMemoryReporterManager::StartGettingReports() {
     }
   }
 
+  if (gfx::VRProcessManager* vr = gfx::VRProcessManager::Get()) {
+    if (RefPtr<MemoryReportingProcess> proc = vr->GetProcessMemoryReporter()) {
+      s->mChildrenPending.AppendElement(proc.forget());
+    }
+  }
+
   if (!mIsRegistrationBlocked && net::gIOService) {
     if (RefPtr<MemoryReportingProcess> proc =
             net::gIOService->GetSocketProcessMemoryReporter()) {
diff --git a/xpcom/build/components.conf b/xpcom/build/components.conf
index 9f2deda27ab5..cb25e5f5ae2b 100644
--- a/xpcom/build/components.conf
+++ b/xpcom/build/components.conf
@@ -67,7 +67,7 @@ Classes = [
         'type': 'nsMemoryReporterManager',
         'headers': ['/xpcom/base/nsMemoryReporterManager.h'],
         'init_method': 'Init',
-        'processes': ProcessSelector.ALLOW_IN_GPU_AND_SOCKET_PROCESS,
+        'processes': ProcessSelector.ALLOW_IN_GPU_VR_AND_SOCKET_PROCESS,
     },
     {
         'cid': '{7b4eeb20-d781-11d4-8a83-0010a4e0c9ca}',

From 901af55a559631776177057cafe312622299855e Mon Sep 17 00:00:00 2001
From: David Walsh <dwalsh@mozilla.com>
Date: Tue, 2 Apr 2019 06:16:25 +0000
Subject: [PATCH 03/46] Bug 1540172 - Align close button at top for expressions
 r=nchevobbe

Corrects the vertical alignment of the close button for watch expressions.

Differential Revision: https://phabricator.services.mozilla.com/D25465

--HG--
extra : moz-landing-system : lando
---
 .../debugger/new/src/components/SecondaryPanes/Expressions.css  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.css b/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.css
index 866bd2d11de2..e57035f641e7 100644
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.css
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.css
@@ -101,7 +101,7 @@
 
 .expression-container:hover .expression-container__close-btn,
 .expression-container__close-btn:focus-within {
-  top: calc(50% - 8px);
+  top: 0;
 }
 
 [dir="ltr"] .expression-container__close-btn {

From b04078973edf07066746a7e3967a5ab1fd54a832 Mon Sep 17 00:00:00 2001
From: Camil Staps <info@camilstaps.nl>
Date: Tue, 2 Apr 2019 06:22:35 +0000
Subject: [PATCH 04/46] Bug 1513492 - Add support for a number of new (2018/12)
 text versions of WebAssembly instructions r=lth

The text format of the instructions wrap, extend, trunc, convert, demote,
promote, and reinterpret was changed recently to make them more consistent.
Signedness now appears after the type; e.g. trunc_f32_s instead of trunc_s/f32.
Also, local.tee can now be used besides tee_local.

See https://github.com/WebAssembly/wabt/issues/933 for reference.

Differential Revision: https://phabricator.services.mozilla.com/D25540

--HG--
extra : moz-landing-system : lando
---
 js/src/wasm/WasmTextToBinary.cpp | 139 ++++++++++++++++---------------
 1 file changed, 71 insertions(+), 68 deletions(-)

diff --git a/js/src/wasm/WasmTextToBinary.cpp b/js/src/wasm/WasmTextToBinary.cpp
index 212bed94468a..5933566b4c65 100644
--- a/js/src/wasm/WasmTextToBinary.cpp
+++ b/js/src/wasm/WasmTextToBinary.cpp
@@ -1065,19 +1065,19 @@ WasmToken WasmTokenStream::next() {
             if (consume(u"const")) {
               return WasmToken(WasmToken::Const, ValType::F32, begin, cur_);
             }
-            if (consume(u"convert_s/i32")) {
+            if (consume(u"convert_i32_s") || consume(u"convert_s/i32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F32ConvertSI32,
                                begin, cur_);
             }
-            if (consume(u"convert_u/i32")) {
+            if (consume(u"convert_i32_u") || consume(u"convert_u/i32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F32ConvertUI32,
                                begin, cur_);
             }
-            if (consume(u"convert_s/i64")) {
+            if (consume(u"convert_i64_s") || consume(u"convert_s/i64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F32ConvertSI64,
                                begin, cur_);
             }
-            if (consume(u"convert_u/i64")) {
+            if (consume(u"convert_i64_u") || consume(u"convert_u/i64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F32ConvertUI64,
                                begin, cur_);
             }
@@ -1087,7 +1087,7 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 'd':
-            if (consume(u"demote/f64")) {
+            if (consume(u"demote_f64") || consume(u"demote/f64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F32DemoteF64,
                                begin, cur_);
             }
@@ -1159,7 +1159,7 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 'r':
-            if (consume(u"reinterpret/i32")) {
+            if (consume(u"reinterpret_i32") || consume(u"reinterpret/i32")) {
               return WasmToken(WasmToken::ConversionOpcode,
                                Op::F32ReinterpretI32, begin, cur_);
             }
@@ -1209,19 +1209,19 @@ WasmToken WasmTokenStream::next() {
             if (consume(u"const")) {
               return WasmToken(WasmToken::Const, ValType::F64, begin, cur_);
             }
-            if (consume(u"convert_s/i32")) {
+            if (consume(u"convert_i32_s") || consume(u"convert_s/i32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F64ConvertSI32,
                                begin, cur_);
             }
-            if (consume(u"convert_u/i32")) {
+            if (consume(u"convert_i32_u") || consume(u"convert_u/i32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F64ConvertUI32,
                                begin, cur_);
             }
-            if (consume(u"convert_s/i64")) {
+            if (consume(u"convert_i64_s") || consume(u"convert_s/i64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F64ConvertSI64,
                                begin, cur_);
             }
-            if (consume(u"convert_u/i64")) {
+            if (consume(u"convert_i64_u") || consume(u"convert_u/i64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F64ConvertUI64,
                                begin, cur_);
             }
@@ -1299,13 +1299,13 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 'p':
-            if (consume(u"promote/f32")) {
+            if (consume(u"promote_f32") || consume(u"promote/f32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::F64PromoteF32,
                                begin, cur_);
             }
             break;
           case 'r':
-            if (consume(u"reinterpret/i64")) {
+            if (consume(u"reinterpret_i64") || consume(u"reinterpret/i64")) {
               return WasmToken(WasmToken::UnaryOpcode, Op::F64ReinterpretI64,
                                begin, cur_);
             }
@@ -1377,11 +1377,11 @@ WasmToken WasmTokenStream::next() {
                                cur_);
             }
             if (consume(u"atomic.")) {
-              if (consume(u"rmw8_u.add")) {
+              if (consume(u"rmw8.add_u") || consume(u"rmw8_u.add")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicAdd8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.add")) {
+              if (consume(u"rmw16.add_u") || consume(u"rmw16_u.add")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I32AtomicAdd16U, begin, cur_);
               }
@@ -1389,11 +1389,11 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicAdd,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.and")) {
+              if (consume(u"rmw8.and_u") || consume(u"rmw8_u.and")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicAnd8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.and")) {
+              if (consume(u"rmw16.and_u") || consume(u"rmw16_u.and")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I32AtomicAnd16U, begin, cur_);
               }
@@ -1401,11 +1401,11 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicAnd,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.cmpxchg")) {
+              if (consume(u"rmw8.cmpxchg_u") || consume(u"rmw8_u.cmpxchg")) {
                 return WasmToken(WasmToken::AtomicCmpXchg,
                                  ThreadOp::I32AtomicCmpXchg8U, begin, cur_);
               }
-              if (consume(u"rmw16_u.cmpxchg")) {
+              if (consume(u"rmw16.cmpxchg_u") || consume(u"rmw16_u.cmpxchg")) {
                 return WasmToken(WasmToken::AtomicCmpXchg,
                                  ThreadOp::I32AtomicCmpXchg16U, begin, cur_);
               }
@@ -1425,11 +1425,11 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicLoad, ThreadOp::I32AtomicLoad,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.or")) {
+              if (consume(u"rmw8.or_u") || consume(u"rmw8_u.or")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicOr8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.or")) {
+              if (consume(u"rmw16.or_u") || consume(u"rmw16_u.or")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicOr16U,
                                  begin, cur_);
               }
@@ -1449,11 +1449,11 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicStore,
                                  ThreadOp::I32AtomicStore, begin, cur_);
               }
-              if (consume(u"rmw8_u.sub")) {
+              if (consume(u"rmw8.sub_u") || consume(u"rmw8_u.sub")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicSub8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.sub")) {
+              if (consume(u"rmw16.sub_u") || consume(u"rmw16_u.sub")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I32AtomicSub16U, begin, cur_);
               }
@@ -1461,11 +1461,11 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicSub,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.xor")) {
+              if (consume(u"rmw8.xor_u") || consume(u"rmw8_u.xor")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicXor8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.xor")) {
+              if (consume(u"rmw16.xor_u") || consume(u"rmw16_u.xor")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I32AtomicXor16U, begin, cur_);
               }
@@ -1473,11 +1473,11 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I32AtomicXor,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.xchg")) {
+              if (consume(u"rmw8.xchg_u") || consume(u"rmw8_u.xchg")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I32AtomicXchg8U, begin, cur_);
               }
-              if (consume(u"rmw16_u.xchg")) {
+              if (consume(u"rmw16.xchg_u") || consume(u"rmw16_u.xchg")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I32AtomicXchg16U, begin, cur_);
               }
@@ -1607,7 +1607,7 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 'r':
-            if (consume(u"reinterpret/f32")) {
+            if (consume(u"reinterpret_f32") || consume(u"reinterpret/f32")) {
               return WasmToken(WasmToken::UnaryOpcode, Op::I32ReinterpretF32,
                                begin, cur_);
             }
@@ -1659,41 +1659,41 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 't':
-            if (consume(u"trunc_s/f32")) {
+            if (consume(u"trunc_f32_s") || consume(u"trunc_s/f32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I32TruncSF32,
                                begin, cur_);
             }
-            if (consume(u"trunc_s/f64")) {
+            if (consume(u"trunc_f64_s") || consume(u"trunc_s/f64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I32TruncSF64,
                                begin, cur_);
             }
-            if (consume(u"trunc_u/f32")) {
+            if (consume(u"trunc_f32_u") || consume(u"trunc_u/f32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I32TruncUF32,
                                begin, cur_);
             }
-            if (consume(u"trunc_u/f64")) {
+            if (consume(u"trunc_f64_u") || consume(u"trunc_u/f64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I32TruncUF64,
                                begin, cur_);
             }
-            if (consume(u"trunc_s:sat/f32")) {
+            if (consume(u"trunc_sat_f32_s") || consume(u"trunc_s:sat/f32")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I32TruncSSatF32, begin, cur_);
             }
-            if (consume(u"trunc_s:sat/f64")) {
+            if (consume(u"trunc_sat_f64_s") || consume(u"trunc_s:sat/f64")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I32TruncSSatF64, begin, cur_);
             }
-            if (consume(u"trunc_u:sat/f32")) {
+            if (consume(u"trunc_sat_f32_u") || consume(u"trunc_u:sat/f32")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I32TruncUSatF32, begin, cur_);
             }
-            if (consume(u"trunc_u:sat/f64")) {
+            if (consume(u"trunc_sat_f64_u") || consume(u"trunc_u:sat/f64")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I32TruncUSatF64, begin, cur_);
             }
             break;
           case 'w':
-            if (consume(u"wrap/i64")) {
+            if (consume(u"wrap_i64") || consume(u"wrap/i64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I32WrapI64,
                                begin, cur_);
             }
@@ -1723,15 +1723,15 @@ WasmToken WasmTokenStream::next() {
                                cur_);
             }
             if (consume(u"atomic.")) {
-              if (consume(u"rmw8_u.add")) {
+              if (consume(u"rmw8.add_u") || consume(u"rmw8_u.add")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicAdd8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.add")) {
+              if (consume(u"rmw16.add_u") || consume(u"rmw16_u.add")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicAdd16U, begin, cur_);
               }
-              if (consume(u"rmw32_u.add")) {
+              if (consume(u"rmw32.add_u") || consume(u"rmw32_u.add")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicAdd32U, begin, cur_);
               }
@@ -1739,15 +1739,15 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicAdd,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.and")) {
+              if (consume(u"rmw8.and_u") || consume(u"rmw8_u.and")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicAnd8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.and")) {
+              if (consume(u"rmw16.and_u") || consume(u"rmw16_u.and")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicAnd16U, begin, cur_);
               }
-              if (consume(u"rmw32_u.and")) {
+              if (consume(u"rmw32.and_u") || consume(u"rmw32_u.and")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicAnd32U, begin, cur_);
               }
@@ -1755,15 +1755,15 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicAnd,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.cmpxchg")) {
+              if (consume(u"rmw8.cmpxchg_u") || consume(u"rmw8_u.cmpxchg")) {
                 return WasmToken(WasmToken::AtomicCmpXchg,
                                  ThreadOp::I64AtomicCmpXchg8U, begin, cur_);
               }
-              if (consume(u"rmw16_u.cmpxchg")) {
+              if (consume(u"rmw16.cmpxchg_u") || consume(u"rmw16_u.cmpxchg")) {
                 return WasmToken(WasmToken::AtomicCmpXchg,
                                  ThreadOp::I64AtomicCmpXchg16U, begin, cur_);
               }
-              if (consume(u"rmw32_u.cmpxchg")) {
+              if (consume(u"rmw32.cmpxchg_u") || consume(u"rmw32_u.cmpxchg")) {
                 return WasmToken(WasmToken::AtomicCmpXchg,
                                  ThreadOp::I64AtomicCmpXchg32U, begin, cur_);
               }
@@ -1787,15 +1787,15 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicLoad, ThreadOp::I64AtomicLoad,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.or")) {
+              if (consume(u"rmw8.or_u") || consume(u"rmw8_u.or")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicOr8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.or")) {
+              if (consume(u"rmw16.or_u") || consume(u"rmw16_u.or")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicOr16U,
                                  begin, cur_);
               }
-              if (consume(u"rmw32_u.or")) {
+              if (consume(u"rmw32.or_u") || consume(u"rmw32_u.or")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicOr32U,
                                  begin, cur_);
               }
@@ -1819,15 +1819,15 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicStore,
                                  ThreadOp::I64AtomicStore, begin, cur_);
               }
-              if (consume(u"rmw8_u.sub")) {
+              if (consume(u"rmw8.sub_u") || consume(u"rmw8_u.sub")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicSub8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.sub")) {
+              if (consume(u"rmw16.sub_u") || consume(u"rmw16_u.sub")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicSub16U, begin, cur_);
               }
-              if (consume(u"rmw32_u.sub")) {
+              if (consume(u"rmw32.sub_u") || consume(u"rmw32_u.sub")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicSub32U, begin, cur_);
               }
@@ -1835,15 +1835,15 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicSub,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.xor")) {
+              if (consume(u"rmw8.xor_u") || consume(u"rmw8_u.xor")) {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicXor8U,
                                  begin, cur_);
               }
-              if (consume(u"rmw16_u.xor")) {
+              if (consume(u"rmw16.xor_u") || consume(u"rmw16_u.xor")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicXor16U, begin, cur_);
               }
-              if (consume(u"rmw32_u.xor")) {
+              if (consume(u"rmw32.xor_u") || consume(u"rmw32_u.xor")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicXor32U, begin, cur_);
               }
@@ -1851,15 +1851,15 @@ WasmToken WasmTokenStream::next() {
                 return WasmToken(WasmToken::AtomicRMW, ThreadOp::I64AtomicXor,
                                  begin, cur_);
               }
-              if (consume(u"rmw8_u.xchg")) {
+              if (consume(u"rmw8.xchg_u") || consume(u"rmw8_u.xchg")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicXchg8U, begin, cur_);
               }
-              if (consume(u"rmw16_u.xchg")) {
+              if (consume(u"rmw16.xchg_u") || consume(u"rmw16_u.xchg")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicXchg16U, begin, cur_);
               }
-              if (consume(u"rmw32_u.xchg")) {
+              if (consume(u"rmw32.xchg_u") || consume(u"rmw32_u.xchg")) {
                 return WasmToken(WasmToken::AtomicRMW,
                                  ThreadOp::I64AtomicXchg32U, begin, cur_);
               }
@@ -1902,11 +1902,11 @@ WasmToken WasmTokenStream::next() {
               return WasmToken(WasmToken::ComparisonOpcode, Op::I64Eq, begin,
                                cur_);
             }
-            if (consume(u"extend_s/i32")) {
+            if (consume(u"extend_i32_s") || consume(u"extend_s/i32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I64ExtendSI32,
                                begin, cur_);
             }
-            if (consume(u"extend_u/i32")) {
+            if (consume(u"extend_i32_u") || consume(u"extend_u/i32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I64ExtendUI32,
                                begin, cur_);
             }
@@ -2007,7 +2007,7 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 'r':
-            if (consume(u"reinterpret/f64")) {
+            if (consume(u"reinterpret_f64") || consume(u"reinterpret/f64")) {
               return WasmToken(WasmToken::UnaryOpcode, Op::I64ReinterpretF64,
                                begin, cur_);
             }
@@ -2062,35 +2062,35 @@ WasmToken WasmTokenStream::next() {
             }
             break;
           case 't':
-            if (consume(u"trunc_s/f32")) {
+            if (consume(u"trunc_f32_s") || consume(u"trunc_s/f32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I64TruncSF32,
                                begin, cur_);
             }
-            if (consume(u"trunc_s/f64")) {
+            if (consume(u"trunc_f64_s") || consume(u"trunc_s/f64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I64TruncSF64,
                                begin, cur_);
             }
-            if (consume(u"trunc_u/f32")) {
+            if (consume(u"trunc_f32_u") || consume(u"trunc_u/f32")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I64TruncUF32,
                                begin, cur_);
             }
-            if (consume(u"trunc_u/f64")) {
+            if (consume(u"trunc_f64_u") || consume(u"trunc_u/f64")) {
               return WasmToken(WasmToken::ConversionOpcode, Op::I64TruncUF64,
                                begin, cur_);
             }
-            if (consume(u"trunc_s:sat/f32")) {
+            if (consume(u"trunc_sat_f32_s") || consume(u"trunc_s:sat/f32")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I64TruncSSatF32, begin, cur_);
             }
-            if (consume(u"trunc_s:sat/f64")) {
+            if (consume(u"trunc_sat_f64_s") || consume(u"trunc_s:sat/f64")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I64TruncSSatF64, begin, cur_);
             }
-            if (consume(u"trunc_u:sat/f32")) {
+            if (consume(u"trunc_sat_f32_u") || consume(u"trunc_u:sat/f32")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I64TruncUSatF32, begin, cur_);
             }
-            if (consume(u"trunc_u:sat/f64")) {
+            if (consume(u"trunc_sat_f64_u") || consume(u"trunc_u:sat/f64")) {
               return WasmToken(WasmToken::ExtraConversionOpcode,
                                MiscOp::I64TruncUSatF64, begin, cur_);
             }
@@ -2125,6 +2125,9 @@ WasmToken WasmTokenStream::next() {
         if (consume(u".set")) {
           return WasmToken(WasmToken::SetLocal, begin, cur_);
         }
+        if (consume(u".tee")) {
+          return WasmToken(WasmToken::TeeLocal, begin, cur_);
+        }
         return WasmToken(WasmToken::Local, begin, cur_);
       }
       if (consume(u"loop")) {

From df730bd21e8dca6e72d17341f6b27b448846ac6e Mon Sep 17 00:00:00 2001
From: Alex Chronopoulos <achronop@gmail.com>
Date: Mon, 1 Apr 2019 22:05:48 +0000
Subject: [PATCH 05/46] Bug 1540231 - Stop dispatching a task to the TaskQueue
 when we are already in it. r=jya

Differential Revision: https://phabricator.services.mozilla.com/D25576

--HG--
extra : moz-landing-system : lando
---
 dom/media/platforms/agnostic/DAV1DDecoder.cpp | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/dom/media/platforms/agnostic/DAV1DDecoder.cpp b/dom/media/platforms/agnostic/DAV1DDecoder.cpp
index b57d5e47c950..f2da2fb61dec 100644
--- a/dom/media/platforms/agnostic/DAV1DDecoder.cpp
+++ b/dom/media/platforms/agnostic/DAV1DDecoder.cpp
@@ -62,19 +62,24 @@ void ReleaseDataBuffer_s(const uint8_t* buf, void* user_data) {
 }
 
 void DAV1DDecoder::ReleaseDataBuffer(const uint8_t* buf) {
-  // The release callback may be called on a
-  // different thread defined by third party
-  // dav1d execution. Post a task into TaskQueue
-  // to ensure mDecodingBuffers is only ever
-  // accessed on the TaskQueue
+  // The release callback may be called on a different thread defined by the
+  // third party dav1d execution. In that case post a task into TaskQueue to
+  // ensure that mDecodingBuffers is only ever accessed on the TaskQueue.
   RefPtr<DAV1DDecoder> self = this;
-  nsresult rv = mTaskQueue->Dispatch(
-      NS_NewRunnableFunction("DAV1DDecoder::ReleaseDataBuffer", [self, buf]() {
-        DebugOnly<bool> found = self->mDecodingBuffers.Remove(buf);
-        MOZ_ASSERT(found);
-      }));
-  MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
-  Unused << rv;
+  auto releaseBuffer = [self, buf] {
+    MOZ_ASSERT(self->mTaskQueue->IsCurrentThreadIn());
+    DebugOnly<bool> found = self->mDecodingBuffers.Remove(buf);
+    MOZ_ASSERT(found);
+  };
+
+  if (mTaskQueue->IsCurrentThreadIn()) {
+    releaseBuffer();
+  } else {
+    nsresult rv = mTaskQueue->Dispatch(NS_NewRunnableFunction(
+        "DAV1DDecoder::ReleaseDataBuffer", std::move(releaseBuffer)));
+    MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
+    Unused << rv;
+  }
 }
 
 RefPtr<MediaDataDecoder::DecodePromise> DAV1DDecoder::InvokeDecode(

From cde6cfbbf810112291e8252919feee6d72b6de79 Mon Sep 17 00:00:00 2001
From: Daisuke Akatsuka <dakatsuka@mozilla.com>
Date: Tue, 2 Apr 2019 06:21:23 +0000
Subject: [PATCH 06/46] Bug 1505131: Change the label and status of connection
 button when start to connect. r=jdescottes,flod

Differential Revision: https://phabricator.services.mozilla.com/D25032

--HG--
extra : moz-landing-system : lando
---
 .../aboutdebugging-new/src/actions/runtimes.js     | 13 ++++++++++---
 .../src/components/sidebar/Sidebar.js              |  1 +
 .../src/components/sidebar/SidebarRuntimeItem.js   | 10 ++++++++--
 .../src/reducers/runtimes-state.js                 | 14 +++++++++++++-
 .../client/aboutdebugging-new/src/types/runtime.js |  4 ++++
 devtools/client/locales/en-US/aboutdebugging.ftl   |  3 +++
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/devtools/client/aboutdebugging-new/src/actions/runtimes.js b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
index 6a6032ef5da0..a2e9570065be 100644
--- a/devtools/client/aboutdebugging-new/src/actions/runtimes.js
+++ b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
@@ -69,7 +69,7 @@ function onMultiE10sUpdated() {
 
 function connectRuntime(id) {
   return async (dispatch, getState) => {
-    dispatch({ type: CONNECT_RUNTIME_START });
+    dispatch({ type: CONNECT_RUNTIME_START, id });
     try {
       const runtime = findRuntimeById(id, getState().runtimes);
       const clientWrapper = await createClientForRuntime(runtime);
@@ -135,7 +135,7 @@ function connectRuntime(id) {
         },
       });
     } catch (e) {
-      dispatch({ type: CONNECT_RUNTIME_FAILURE, error: e });
+      dispatch({ type: CONNECT_RUNTIME_FAILURE, id, error: e });
     }
   };
 }
@@ -144,6 +144,7 @@ function createThisFirefoxRuntime() {
   return (dispatch, getState) => {
     const thisFirefoxRuntime = {
       id: RUNTIMES.THIS_FIREFOX,
+      isConnecting: false,
       isUnknown: false,
       name: l10n.getString("about-debugging-this-firefox-runtime-name"),
       type: RUNTIMES.THIS_FIREFOX,
@@ -302,6 +303,7 @@ function updateNetworkRuntimes(locations) {
       extra: {
         connectionParameters: { host, port: parseInt(port, 10) },
       },
+      isConnecting: false,
       isUnknown: false,
       name: location,
       type: RUNTIMES.NETWORK,
@@ -322,6 +324,7 @@ function updateUSBRuntimes(adbRuntimes) {
         connectionParameters,
         deviceName: adbRuntime.deviceName,
       },
+      isConnecting: false,
       isUnknown: adbRuntime.isUnknown(),
       name: adbRuntime.shortName,
       type: RUNTIMES.USB,
@@ -363,12 +366,16 @@ function updateRemoteRuntimes(runtimes, type) {
       await dispatch(Actions.selectPage(PAGE_TYPES.RUNTIME, RUNTIMES.THIS_FIREFOX));
     }
 
-    // Retrieve runtimeDetails from existing runtimes.
+    // For existing runtimes, transfer all properties that are not available in the
+    // runtime objects passed to this method:
+    // - runtimeDetails (set by about:debugging after a successful connection)
+    // - isConnecting (set by about:debugging during the connection)
     runtimes.forEach(runtime => {
       const existingRuntime = findRuntimeById(runtime.id, getState().runtimes);
       const isConnectionValid = existingRuntime && existingRuntime.runtimeDetails &&
         !existingRuntime.runtimeDetails.clientWrapper.isClosed();
       runtime.runtimeDetails = isConnectionValid ? existingRuntime.runtimeDetails : null;
+      runtime.isConnecting = existingRuntime ? existingRuntime.isConnecting : false;
     });
 
     const existingRuntimes = getAllRuntimes(getState().runtimes);
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
index be5e2d70ee06..46af3693a0dc 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
@@ -113,6 +113,7 @@ class Sidebar extends PureComponent {
         icon,
         key: keyId,
         isConnected: runtimeHasDetails,
+        isConnecting: runtime.isConnecting,
         isSelected,
         isUnknown: runtime.isUnknown,
         name,
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
index 8f9cce79afbb..960fe546dd31 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
@@ -26,6 +26,7 @@ class SidebarRuntimeItem extends PureComponent {
       getString: PropTypes.func.isRequired,
       icon: PropTypes.string.isRequired,
       isConnected: PropTypes.bool.isRequired,
+      isConnecting: PropTypes.bool.isRequired,
       isSelected: PropTypes.bool.isRequired,
       isUnknown: PropTypes.bool.isRequired,
       name: PropTypes.string.isRequired,
@@ -34,19 +35,24 @@ class SidebarRuntimeItem extends PureComponent {
   }
 
   renderConnectButton() {
+    const { isConnecting } = this.props;
+    const localizationId = isConnecting
+                             ? "about-debugging-sidebar-item-connect-button-connecting"
+                             : "about-debugging-sidebar-item-connect-button";
     return Localized(
       {
-        id: "about-debugging-sidebar-item-connect-button",
+        id: localizationId,
       },
       dom.button(
         {
           className: "default-button default-button--micro js-connect-button",
+          disabled: isConnecting,
           onClick: () => {
             const { dispatch, runtimeId } = this.props;
             dispatch(Actions.connectRuntime(runtimeId));
           },
         },
-        "Connect"
+        localizationId
       )
     );
   }
diff --git a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
index 4edd479bae33..3a2d853d19c1 100644
--- a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
+++ b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
@@ -5,6 +5,8 @@
 "use strict";
 
 const {
+  CONNECT_RUNTIME_FAILURE,
+  CONNECT_RUNTIME_START,
   CONNECT_RUNTIME_SUCCESS,
   DISCONNECT_RUNTIME_SUCCESS,
   RUNTIMES,
@@ -72,10 +74,20 @@ function _updateRuntimeById(runtimeId, updatedRuntime, state) {
 
 function runtimesReducer(state = RuntimesState(), action) {
   switch (action.type) {
+    case CONNECT_RUNTIME_START: {
+      const { id } = action;
+      return _updateRuntimeById(id, { isConnecting: true }, state);
+    }
+
     case CONNECT_RUNTIME_SUCCESS: {
       const { id, runtimeDetails, type } = action.runtime;
       remoteClientManager.setClient(id, type, runtimeDetails.clientWrapper.client);
-      return _updateRuntimeById(id, { runtimeDetails }, state);
+      return _updateRuntimeById(id, { isConnecting: false, runtimeDetails }, state);
+    }
+
+    case CONNECT_RUNTIME_FAILURE: {
+      const { id } = action;
+      return _updateRuntimeById(id, { isConnecting: false }, state);
     }
 
     case DISCONNECT_RUNTIME_SUCCESS: {
diff --git a/devtools/client/aboutdebugging-new/src/types/runtime.js b/devtools/client/aboutdebugging-new/src/types/runtime.js
index b1e56289ec5a..da626c89f51e 100644
--- a/devtools/client/aboutdebugging-new/src/types/runtime.js
+++ b/devtools/client/aboutdebugging-new/src/types/runtime.js
@@ -115,6 +115,10 @@ const runtime = {
   // unavailable on this-firefox runtime
   extra: PropTypes.shape(runtimeExtra),
 
+  // this flag will be true when start to connect to the runtime, will be false after
+  // connected or has failures.
+  isConnecting: PropTypes.bool.isRequired,
+
   // unknown runtimes are placeholders for devices where the runtime has not been started
   // yet. For instance an ADB device connected without a compatible runtime running.
   isUnknown: PropTypes.bool.isRequired,
diff --git a/devtools/client/locales/en-US/aboutdebugging.ftl b/devtools/client/locales/en-US/aboutdebugging.ftl
index 39fc48c8a09c..f4ccb4f7c42f 100644
--- a/devtools/client/locales/en-US/aboutdebugging.ftl
+++ b/devtools/client/locales/en-US/aboutdebugging.ftl
@@ -46,6 +46,9 @@ about-debugging-sidebar-no-devices = No devices discovered
 # Clicking on the button will attempt to connect to the runtime.
 about-debugging-sidebar-item-connect-button = Connect
 
+# Text displayed in buttons found in sidebar items when the runtime is connecting.
+about-debugging-sidebar-item-connect-button-connecting = Connecting…
+
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
 about-debugging-sidebar-item-connected-label = Connected

From 5783c1a3397bffc8a60e993d98d5e448d5d2c160 Mon Sep 17 00:00:00 2001
From: Daisuke Akatsuka <dakatsuka@mozilla.com>
Date: Tue, 2 Apr 2019 06:44:34 +0000
Subject: [PATCH 07/46] Bug 1505131: Show error message when the connecting was
 failed. r=jdescottes,flod

Depends on D25032

Differential Revision: https://phabricator.services.mozilla.com/D25033

--HG--
extra : moz-landing-system : lando
---
 .../src/actions/runtimes.js                   |  6 ++
 .../client/aboutdebugging-new/src/base.css    |  5 ++
 .../src/components/sidebar/Sidebar.js         |  1 +
 .../components/sidebar/SidebarRuntimeItem.js  | 67 ++++++++++++++-----
 .../src/reducers/runtimes-state.js            |  9 ++-
 .../aboutdebugging-new/src/types/runtime.js   |  3 +
 .../client/locales/en-US/aboutdebugging.ftl   |  3 +
 7 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/devtools/client/aboutdebugging-new/src/actions/runtimes.js b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
index a2e9570065be..d5fde9f63366 100644
--- a/devtools/client/aboutdebugging-new/src/actions/runtimes.js
+++ b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
@@ -145,6 +145,7 @@ function createThisFirefoxRuntime() {
     const thisFirefoxRuntime = {
       id: RUNTIMES.THIS_FIREFOX,
       isConnecting: false,
+      isConnectionFailed: false,
       isUnknown: false,
       name: l10n.getString("about-debugging-this-firefox-runtime-name"),
       type: RUNTIMES.THIS_FIREFOX,
@@ -304,6 +305,7 @@ function updateNetworkRuntimes(locations) {
         connectionParameters: { host, port: parseInt(port, 10) },
       },
       isConnecting: false,
+      isConnectionFailed: false,
       isUnknown: false,
       name: location,
       type: RUNTIMES.NETWORK,
@@ -325,6 +327,7 @@ function updateUSBRuntimes(adbRuntimes) {
         deviceName: adbRuntime.deviceName,
       },
       isConnecting: false,
+      isConnectionFailed: false,
       isUnknown: adbRuntime.isUnknown(),
       name: adbRuntime.shortName,
       type: RUNTIMES.USB,
@@ -370,12 +373,15 @@ function updateRemoteRuntimes(runtimes, type) {
     // runtime objects passed to this method:
     // - runtimeDetails (set by about:debugging after a successful connection)
     // - isConnecting (set by about:debugging during the connection)
+    // - isConnectionFailed (set by about:debugging if connection was failed)
     runtimes.forEach(runtime => {
       const existingRuntime = findRuntimeById(runtime.id, getState().runtimes);
       const isConnectionValid = existingRuntime && existingRuntime.runtimeDetails &&
         !existingRuntime.runtimeDetails.clientWrapper.isClosed();
       runtime.runtimeDetails = isConnectionValid ? existingRuntime.runtimeDetails : null;
       runtime.isConnecting = existingRuntime ? existingRuntime.isConnecting : false;
+      runtime.isConnectionFailed =
+        existingRuntime ? existingRuntime.isConnectionFailed : false;
     });
 
     const existingRuntimes = getAllRuntimes(getState().runtimes);
diff --git a/devtools/client/aboutdebugging-new/src/base.css b/devtools/client/aboutdebugging-new/src/base.css
index 191b416d4f8d..7ef56663ad6d 100644
--- a/devtools/client/aboutdebugging-new/src/base.css
+++ b/devtools/client/aboutdebugging-new/src/base.css
@@ -163,6 +163,11 @@ p, h1 {
   color: currentColor;
 }
 
+/* Text needs to wrap anywhere */
+.word-wrap-anywhere {
+  word-wrap: anywhere;
+}
+
 /*
 * Typography
 */
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
index 46af3693a0dc..4b91e0c546b6 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
@@ -114,6 +114,7 @@ class Sidebar extends PureComponent {
         key: keyId,
         isConnected: runtimeHasDetails,
         isConnecting: runtime.isConnecting,
+        isConnectionFailed: runtime.isConnectionFailed,
         isSelected,
         isUnknown: runtime.isUnknown,
         name,
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
index 960fe546dd31..b971d8cf1cf1 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
@@ -11,8 +11,10 @@ const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const FluentReact = require("devtools/client/shared/vendor/fluent-react");
 const Localized = createFactory(FluentReact.Localized);
 
+const Message = createFactory(require("../shared/Message"));
 const SidebarItem = createFactory(require("./SidebarItem"));
 const Actions = require("../../actions/index");
+const { MESSAGE_LEVEL } = require("../../constants");
 
 /**
  * This component displays a runtime item of the Sidebar component.
@@ -27,6 +29,7 @@ class SidebarRuntimeItem extends PureComponent {
       icon: PropTypes.string.isRequired,
       isConnected: PropTypes.bool.isRequired,
       isConnecting: PropTypes.bool.isRequired,
+      isConnectionFailed: PropTypes.bool.isRequired,
       isSelected: PropTypes.bool.isRequired,
       isUnknown: PropTypes.bool.isRequired,
       name: PropTypes.string.isRequired,
@@ -57,6 +60,30 @@ class SidebarRuntimeItem extends PureComponent {
     );
   }
 
+  renderConnectionError() {
+    const { isConnectionFailed } = this.props;
+
+    if (!isConnectionFailed) {
+      return null;
+    }
+
+    const localizationId =
+      "about-debugging-sidebar-item-connect-button-connection-failed";
+
+    return Message(
+      {
+        level: MESSAGE_LEVEL.ERROR,
+        key: "connection-error",
+      },
+      Localized(
+        {
+          id: localizationId,
+        },
+        dom.p({ className: "word-wrap-anywhere" }, localizationId)
+      )
+    );
+  }
+
   renderName() {
     const { deviceName, getString, isUnknown, name } = this.props;
 
@@ -121,28 +148,32 @@ class SidebarRuntimeItem extends PureComponent {
       getString("aboutdebugging-sidebar-runtime-connection-status-connected") :
       getString("aboutdebugging-sidebar-runtime-connection-status-disconnected");
 
-    return SidebarItem(
-      {
-        className: "sidebar-item--tall",
-        isSelected,
-        to: isConnected ? `/runtime/${encodeURIComponent(runtimeId)}` : null,
-      },
-      dom.section(
+    return [
+      SidebarItem(
         {
-          className: "sidebar-runtime-item__container",
+          className: "sidebar-item--tall",
+          key: "sidebar-item",
+          isSelected,
+          to: isConnected ? `/runtime/${encodeURIComponent(runtimeId)}` : null,
         },
-        dom.img(
+        dom.section(
           {
-            className: "sidebar-runtime-item__icon ",
-            src: icon,
-            alt: connectionStatus,
-            title: connectionStatus,
-          }
+            className: "sidebar-runtime-item__container",
+          },
+          dom.img(
+            {
+              className: "sidebar-runtime-item__icon ",
+              src: icon,
+              alt: connectionStatus,
+              title: connectionStatus,
+            }
+          ),
+          this.renderName(),
+          !isUnknown && !isConnected ? this.renderConnectButton() : null
         ),
-        this.renderName(),
-        !isUnknown && !isConnected ? this.renderConnectButton() : null
-      )
-    );
+      ),
+      this.renderConnectionError(),
+    ];
   }
 }
 
diff --git a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
index 3a2d853d19c1..ad9e1be26531 100644
--- a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
+++ b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
@@ -76,18 +76,21 @@ function runtimesReducer(state = RuntimesState(), action) {
   switch (action.type) {
     case CONNECT_RUNTIME_START: {
       const { id } = action;
-      return _updateRuntimeById(id, { isConnecting: true }, state);
+      return _updateRuntimeById(
+        id, { isConnecting: true, isConnectionFailed: false }, state);
     }
 
     case CONNECT_RUNTIME_SUCCESS: {
       const { id, runtimeDetails, type } = action.runtime;
       remoteClientManager.setClient(id, type, runtimeDetails.clientWrapper.client);
-      return _updateRuntimeById(id, { isConnecting: false, runtimeDetails }, state);
+      return _updateRuntimeById(
+        id, { isConnecting: false, isConnectionFailed: false, runtimeDetails }, state);
     }
 
     case CONNECT_RUNTIME_FAILURE: {
       const { id } = action;
-      return _updateRuntimeById(id, { isConnecting: false }, state);
+      return _updateRuntimeById(
+        id, { isConnecting: false, isConnectionFailed: true }, state);
     }
 
     case DISCONNECT_RUNTIME_SUCCESS: {
diff --git a/devtools/client/aboutdebugging-new/src/types/runtime.js b/devtools/client/aboutdebugging-new/src/types/runtime.js
index da626c89f51e..a0c966e50f3a 100644
--- a/devtools/client/aboutdebugging-new/src/types/runtime.js
+++ b/devtools/client/aboutdebugging-new/src/types/runtime.js
@@ -119,6 +119,9 @@ const runtime = {
   // connected or has failures.
   isConnecting: PropTypes.bool.isRequired,
 
+  // this flag will be true when the connection failed.
+  isConnectionFailed: PropTypes.bool.isRequired,
+
   // unknown runtimes are placeholders for devices where the runtime has not been started
   // yet. For instance an ADB device connected without a compatible runtime running.
   isUnknown: PropTypes.bool.isRequired,
diff --git a/devtools/client/locales/en-US/aboutdebugging.ftl b/devtools/client/locales/en-US/aboutdebugging.ftl
index f4ccb4f7c42f..8d0ea5ae0095 100644
--- a/devtools/client/locales/en-US/aboutdebugging.ftl
+++ b/devtools/client/locales/en-US/aboutdebugging.ftl
@@ -49,6 +49,9 @@ about-debugging-sidebar-item-connect-button = Connect
 # Text displayed in buttons found in sidebar items when the runtime is connecting.
 about-debugging-sidebar-item-connect-button-connecting = Connecting…
 
+# Text displayed in buttons found in sidebar items when the connection failed.
+about-debugging-sidebar-item-connect-button-connection-failed = Connection failed
+
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
 about-debugging-sidebar-item-connected-label = Connected

From 9439d08d5ccc86ac9cea4837a1ce34c6d22cf54e Mon Sep 17 00:00:00 2001
From: Daisuke Akatsuka <dakatsuka@mozilla.com>
Date: Tue, 2 Apr 2019 06:22:33 +0000
Subject: [PATCH 08/46] Bug 1505131: Show warning when the connecting is taking
 time. r=jdescottes,flod

Depends on D25033

Differential Revision: https://phabricator.services.mozilla.com/D25034

--HG--
extra : moz-landing-system : lando
---
 .../src/actions/runtimes.js                   | 19 ++++++++++++
 .../src/components/sidebar/Sidebar.js         |  1 +
 .../components/sidebar/SidebarRuntimeItem.js  | 26 ++++++++++++++++
 .../aboutdebugging-new/src/constants.js       |  1 +
 .../src/reducers/runtimes-state.js            | 31 +++++++++++++++----
 .../aboutdebugging-new/src/types/runtime.js   |  4 +++
 .../client/locales/en-US/aboutdebugging.ftl   |  4 +++
 7 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/devtools/client/aboutdebugging-new/src/actions/runtimes.js b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
index d5fde9f63366..71457ac26dd1 100644
--- a/devtools/client/aboutdebugging-new/src/actions/runtimes.js
+++ b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
@@ -24,6 +24,7 @@ const { remoteClientManager } =
 
 const {
   CONNECT_RUNTIME_FAILURE,
+  CONNECT_RUNTIME_NOT_RESPONDING,
   CONNECT_RUNTIME_START,
   CONNECT_RUNTIME_SUCCESS,
   DEBUG_TARGET_PANE,
@@ -52,6 +53,8 @@ const {
   WATCH_RUNTIME_SUCCESS,
 } = require("../constants");
 
+const CONNECTION_TIMING_OUT_DELAY = 3000;
+
 async function getRuntimeIcon(channel) {
   return (channel === "release" || channel === "beta" || channel === "aurora")
     ? `chrome://devtools/skin/images/aboutdebugging-firefox-${ channel }.svg`
@@ -70,6 +73,13 @@ function onMultiE10sUpdated() {
 function connectRuntime(id) {
   return async (dispatch, getState) => {
     dispatch({ type: CONNECT_RUNTIME_START, id });
+    const connectionNotRespondingTimer = setTimeout(() => {
+      // If connecting to the runtime takes time over CONNECTION_TIMING_OUT_DELAY,
+      // we assume the connection prompt is showing on the runtime, show a dialog
+      // to let user know that.
+      dispatch({ type: CONNECT_RUNTIME_NOT_RESPONDING, id });
+    }, CONNECTION_TIMING_OUT_DELAY);
+
     try {
       const runtime = findRuntimeById(id, getState().runtimes);
       const clientWrapper = await createClientForRuntime(runtime);
@@ -136,6 +146,8 @@ function connectRuntime(id) {
       });
     } catch (e) {
       dispatch({ type: CONNECT_RUNTIME_FAILURE, id, error: e });
+    } finally {
+      clearTimeout(connectionNotRespondingTimer);
     }
   };
 }
@@ -146,6 +158,7 @@ function createThisFirefoxRuntime() {
       id: RUNTIMES.THIS_FIREFOX,
       isConnecting: false,
       isConnectionFailed: false,
+      isConnectionNotResponding: false,
       isUnknown: false,
       name: l10n.getString("about-debugging-this-firefox-runtime-name"),
       type: RUNTIMES.THIS_FIREFOX,
@@ -306,6 +319,7 @@ function updateNetworkRuntimes(locations) {
       },
       isConnecting: false,
       isConnectionFailed: false,
+      isConnectionNotResponding: false,
       isUnknown: false,
       name: location,
       type: RUNTIMES.NETWORK,
@@ -328,6 +342,7 @@ function updateUSBRuntimes(adbRuntimes) {
       },
       isConnecting: false,
       isConnectionFailed: false,
+      isConnectionNotResponding: false,
       isUnknown: adbRuntime.isUnknown(),
       name: adbRuntime.shortName,
       type: RUNTIMES.USB,
@@ -374,6 +389,8 @@ function updateRemoteRuntimes(runtimes, type) {
     // - runtimeDetails (set by about:debugging after a successful connection)
     // - isConnecting (set by about:debugging during the connection)
     // - isConnectionFailed (set by about:debugging if connection was failed)
+    // - isConnectionNotResponding
+    //     (set by about:debugging if connection is taking too much time)
     runtimes.forEach(runtime => {
       const existingRuntime = findRuntimeById(runtime.id, getState().runtimes);
       const isConnectionValid = existingRuntime && existingRuntime.runtimeDetails &&
@@ -382,6 +399,8 @@ function updateRemoteRuntimes(runtimes, type) {
       runtime.isConnecting = existingRuntime ? existingRuntime.isConnecting : false;
       runtime.isConnectionFailed =
         existingRuntime ? existingRuntime.isConnectionFailed : false;
+      runtime.isConnectionNotResponding =
+        existingRuntime ? existingRuntime.isConnectionNotResponding : false;
     });
 
     const existingRuntimes = getAllRuntimes(getState().runtimes);
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
index 4b91e0c546b6..380e27752889 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
@@ -115,6 +115,7 @@ class Sidebar extends PureComponent {
         isConnected: runtimeHasDetails,
         isConnecting: runtime.isConnecting,
         isConnectionFailed: runtime.isConnectionFailed,
+        isConnectionNotResponding: runtime.isConnectionNotResponding,
         isSelected,
         isUnknown: runtime.isUnknown,
         name,
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
index b971d8cf1cf1..e8061664a1c4 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
@@ -30,6 +30,7 @@ class SidebarRuntimeItem extends PureComponent {
       isConnected: PropTypes.bool.isRequired,
       isConnecting: PropTypes.bool.isRequired,
       isConnectionFailed: PropTypes.bool.isRequired,
+      isConnectionNotResponding: PropTypes.bool.isRequired,
       isSelected: PropTypes.bool.isRequired,
       isUnknown: PropTypes.bool.isRequired,
       name: PropTypes.string.isRequired,
@@ -84,6 +85,30 @@ class SidebarRuntimeItem extends PureComponent {
     );
   }
 
+  renderConnectionNotResponding() {
+    const { isConnectionNotResponding } = this.props;
+
+    if (!isConnectionNotResponding) {
+      return null;
+    }
+
+    const localizationId =
+      "about-debugging-sidebar-item-connect-button-connection-not-responding";
+
+    return Message(
+      {
+        level: MESSAGE_LEVEL.WARNING,
+        key: "connection-not-responding",
+      },
+      Localized(
+        {
+          id: localizationId,
+        },
+        dom.p({ className: "word-wrap-anywhere" }, localizationId)
+      )
+    );
+  }
+
   renderName() {
     const { deviceName, getString, isUnknown, name } = this.props;
 
@@ -173,6 +198,7 @@ class SidebarRuntimeItem extends PureComponent {
         ),
       ),
       this.renderConnectionError(),
+      this.renderConnectionNotResponding(),
     ];
   }
 }
diff --git a/devtools/client/aboutdebugging-new/src/constants.js b/devtools/client/aboutdebugging-new/src/constants.js
index 2b41ff791fbd..444eb84a6b81 100644
--- a/devtools/client/aboutdebugging-new/src/constants.js
+++ b/devtools/client/aboutdebugging-new/src/constants.js
@@ -16,6 +16,7 @@ const actionTypes = {
   ADB_ADDON_UNINSTALL_FAILURE: "ADB_ADDON_UNINSTALL_FAILURE",
   ADB_ADDON_STATUS_UPDATED: "ADB_ADDON_STATUS_UPDATED",
   CONNECT_RUNTIME_FAILURE: "CONNECT_RUNTIME_FAILURE",
+  CONNECT_RUNTIME_NOT_RESPONDING: "CONNECT_RUNTIME_NOT_RESPONDING",
   CONNECT_RUNTIME_START: "CONNECT_RUNTIME_START",
   CONNECT_RUNTIME_SUCCESS: "CONNECT_RUNTIME_SUCCESS",
   DEBUG_TARGET_COLLAPSIBILITY_UPDATED: "DEBUG_TARGET_COLLAPSIBILITY_UPDATED",
diff --git a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
index ad9e1be26531..0580e28248d8 100644
--- a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
+++ b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
@@ -6,6 +6,7 @@
 
 const {
   CONNECT_RUNTIME_FAILURE,
+  CONNECT_RUNTIME_NOT_RESPONDING,
   CONNECT_RUNTIME_START,
   CONNECT_RUNTIME_SUCCESS,
   DISCONNECT_RUNTIME_SUCCESS,
@@ -76,21 +77,39 @@ function runtimesReducer(state = RuntimesState(), action) {
   switch (action.type) {
     case CONNECT_RUNTIME_START: {
       const { id } = action;
-      return _updateRuntimeById(
-        id, { isConnecting: true, isConnectionFailed: false }, state);
+      const updatedState = {
+        isConnecting: true,
+        isConnectionFailed: false,
+        isConnectionNotResponding: false,
+      };
+      return _updateRuntimeById(id, updatedState, state);
+    }
+
+    case CONNECT_RUNTIME_NOT_RESPONDING: {
+      const { id } = action;
+      return _updateRuntimeById(id, { isConnectionNotResponding: true }, state);
     }
 
     case CONNECT_RUNTIME_SUCCESS: {
       const { id, runtimeDetails, type } = action.runtime;
       remoteClientManager.setClient(id, type, runtimeDetails.clientWrapper.client);
-      return _updateRuntimeById(
-        id, { isConnecting: false, isConnectionFailed: false, runtimeDetails }, state);
+      const updatedState = {
+        isConnecting: false,
+        isConnectionFailed: false,
+        isConnectionNotResponding: false,
+        runtimeDetails,
+      };
+      return _updateRuntimeById(id, updatedState, state);
     }
 
     case CONNECT_RUNTIME_FAILURE: {
       const { id } = action;
-      return _updateRuntimeById(
-        id, { isConnecting: false, isConnectionFailed: true }, state);
+      const updatedState = {
+        isConnecting: false,
+        isConnectionFailed: true,
+        isConnectionNotResponding: false,
+      };
+      return _updateRuntimeById(id, updatedState, state);
     }
 
     case DISCONNECT_RUNTIME_SUCCESS: {
diff --git a/devtools/client/aboutdebugging-new/src/types/runtime.js b/devtools/client/aboutdebugging-new/src/types/runtime.js
index a0c966e50f3a..4aeec1b9b266 100644
--- a/devtools/client/aboutdebugging-new/src/types/runtime.js
+++ b/devtools/client/aboutdebugging-new/src/types/runtime.js
@@ -122,6 +122,10 @@ const runtime = {
   // this flag will be true when the connection failed.
   isConnectionFailed: PropTypes.bool.isRequired,
 
+  // will be true if connecting to runtime is taking time, will be false after connecting
+  // or failing.
+  isConnectionNotResponding: PropTypes.bool.isRequired,
+
   // unknown runtimes are placeholders for devices where the runtime has not been started
   // yet. For instance an ADB device connected without a compatible runtime running.
   isUnknown: PropTypes.bool.isRequired,
diff --git a/devtools/client/locales/en-US/aboutdebugging.ftl b/devtools/client/locales/en-US/aboutdebugging.ftl
index 8d0ea5ae0095..4fdb863bf9c2 100644
--- a/devtools/client/locales/en-US/aboutdebugging.ftl
+++ b/devtools/client/locales/en-US/aboutdebugging.ftl
@@ -52,6 +52,10 @@ about-debugging-sidebar-item-connect-button-connecting = Connecting…
 # Text displayed in buttons found in sidebar items when the connection failed.
 about-debugging-sidebar-item-connect-button-connection-failed = Connection failed
 
+# Text displayed in connection warning on sidebar item of the runtime when connecting to
+# the runtime is taking too much time.
+about-debugging-sidebar-item-connect-button-connection-not-responding = Connection still pending, check for messages on the target browser
+
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
 about-debugging-sidebar-item-connected-label = Connected

From 6e1f56419f97f675ad8cf0e795c1f93b3723652c Mon Sep 17 00:00:00 2001
From: Daisuke Akatsuka <dakatsuka@mozilla.com>
Date: Tue, 2 Apr 2019 06:44:32 +0000
Subject: [PATCH 09/46] Bug 1505131: Add a test for connection state on
 sidebar. r=jdescottes

Depends on D25033

Differential Revision: https://phabricator.services.mozilla.com/D25565

--HG--
extra : moz-landing-system : lando
---
 .../components/sidebar/SidebarRuntimeItem.js  |  2 +
 .../test/browser/browser.ini                  |  1 +
 ...aboutdebugging_sidebar_connection_state.js | 78 +++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_connection_state.js

diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
index e8061664a1c4..1690a4a44ffb 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
@@ -75,6 +75,7 @@ class SidebarRuntimeItem extends PureComponent {
       {
         level: MESSAGE_LEVEL.ERROR,
         key: "connection-error",
+        className: "qa-connection-error",
       },
       Localized(
         {
@@ -99,6 +100,7 @@ class SidebarRuntimeItem extends PureComponent {
       {
         level: MESSAGE_LEVEL.WARNING,
         key: "connection-not-responding",
+        className: "qa-connection-not-responding",
       },
       Localized(
         {
diff --git a/devtools/client/aboutdebugging-new/test/browser/browser.ini b/devtools/client/aboutdebugging-new/test/browser/browser.ini
index 303c09cc72ed..71bf45b43abf 100644
--- a/devtools/client/aboutdebugging-new/test/browser/browser.ini
+++ b/devtools/client/aboutdebugging-new/test/browser/browser.ini
@@ -86,6 +86,7 @@ skip-if = debug || asan || serviceworker_e10s # Frequent intermittent failures,
 [browser_aboutdebugging_serviceworker_timeout.js]
 skip-if = debug || asan # Frequent intermittent failures, Bug 1522800
 [browser_aboutdebugging_serviceworker_unregister.js]
+[browser_aboutdebugging_sidebar_connection_state.js]
 [browser_aboutdebugging_sidebar_network_runtimes.js]
 [browser_aboutdebugging_sidebar_usb_runtime.js]
 [browser_aboutdebugging_sidebar_usb_runtime_connect.js]
diff --git a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_connection_state.js b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_connection_state.js
new file mode 100644
index 000000000000..0fe82b8051de
--- /dev/null
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_connection_state.js
@@ -0,0 +1,78 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const RUNTIME_ID = "test-runtime-id";
+const RUNTIME_NAME = "test runtime name";
+const RUNTIME_DEVICE_NAME = "test device name";
+const RUNTIME_SHORT_NAME = "test short name";
+
+// Test following connection state tests.
+// * Connect button label and state will change during connecting.
+// * Show error message if connection failed.
+// * Show warninng if connection has been taken time.
+add_task(async function() {
+  const mocks = new Mocks();
+
+  const { document, tab } = await openAboutDebugging();
+
+  mocks.createUSBRuntime(RUNTIME_ID, {
+    name: RUNTIME_NAME,
+    deviceName: RUNTIME_DEVICE_NAME,
+    shortName: RUNTIME_SHORT_NAME,
+  });
+  mocks.emitUSBUpdate();
+
+  info("Wait until the USB sidebar item appears");
+  await waitUntil(() => findSidebarItemByText(RUNTIME_DEVICE_NAME, document));
+  const usbRuntimeSidebarItem = findSidebarItemByText(RUNTIME_DEVICE_NAME, document);
+  const connectButton = usbRuntimeSidebarItem.querySelector(".js-connect-button");
+
+  info("Simulate to happen connection error");
+  mocks.runtimeClientFactoryMock.createClientForRuntime = async (runtime) => {
+    throw new Error("Dummy connection error");
+  };
+
+  info("Check whether the error message displayed after clicking connect button");
+  connectButton.click();
+  await waitUntil(() => document.querySelector(".qa-connection-error"));
+  ok(true, "Error message displays when connection failed");
+
+  info("Simulate to wait for the connection prompt on remote runtime");
+  let resumeConnection;
+  const resumeConnectionPromise = new Promise(r => {
+    resumeConnection = r;
+  });
+  mocks.runtimeClientFactoryMock.createClientForRuntime = async (runtime) => {
+    await resumeConnectionPromise;
+    return mocks._clients[runtime.type][runtime.id];
+  };
+
+  info("Click on the connect button and wait until it disappears");
+  connectButton.click();
+  info("Check whether a warning of connection not responding displays after 3sec");
+  await waitUntil(() => document.querySelector(".qa-connection-not-responding"));
+  ok(document.querySelector(".qa-connection-not-responding"),
+     "A warning of connection not responding displays");
+  ok(connectButton.disabled, "State of the connect button displays");
+  ok(connectButton.textContent.startsWith("Connecting"),
+     "Label of the connect button changes");
+  ok(!document.querySelector(".qa-connection-error"), "Error message disappears");
+
+  info("Unblock the connection and check the message and connect button disappear");
+  resumeConnection();
+  await waitUntil(() => !usbRuntimeSidebarItem.querySelector(".js-connect-button"));
+  ok(!document.querySelector(".qa-connection-error"), "Error disappears");
+  ok(!document.querySelector(".qa-connection-not-responding"), "Warning disappears");
+
+  info("Remove a USB runtime");
+  mocks.removeUSBRuntime(RUNTIME_ID);
+  mocks.emitUSBUpdate();
+
+  info("Wait until the USB sidebar item disappears");
+  await waitUntil(() => !findSidebarItemByText(RUNTIME_DEVICE_NAME, document) &&
+                      !findSidebarItemByText(RUNTIME_SHORT_NAME, document));
+
+  await removeTab(tab);
+});

From fa6e04c6668b13cd56e2418914fb9503a185dc3c Mon Sep 17 00:00:00 2001
From: violet <violet.bugreport@gmail.com>
Date: Tue, 2 Apr 2019 06:08:23 +0000
Subject: [PATCH 10/46] Bug 1540703 - Should also reflow SVGTextFrame for
 non-display active child of switch element r=longsonr

When <switch> happens to have an active child that is non-display, we should still reflow all its descendant SVGTextFrame for consistency.

Differential Revision: https://phabricator.services.mozilla.com/D25699

--HG--
extra : moz-landing-system : lando
---
 layout/svg/crashtests/951904-1.html |  9 +++++++++
 layout/svg/nsSVGSwitchFrame.cpp     | 17 ++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/layout/svg/crashtests/951904-1.html b/layout/svg/crashtests/951904-1.html
index 55cfa7f83664..7a1d1d4dd4fa 100644
--- a/layout/svg/crashtests/951904-1.html
+++ b/layout/svg/crashtests/951904-1.html
@@ -21,6 +21,14 @@
     </switch>
   </switch>
 </svg>
+<svg>
+  <switch>
+    <mask>
+      <text id="g">Vendredi</text>
+    </mask>
+    <a></a>
+  </switch>
+</svg>
 </body>
 <script>
 function go() {
@@ -30,5 +38,6 @@ function go() {
   d.getComputedTextLength();
   e.getComputedTextLength();
   f.getComputedTextLength();
+  g.getComputedTextLength();
 }
 </script>
diff --git a/layout/svg/nsSVGSwitchFrame.cpp b/layout/svg/nsSVGSwitchFrame.cpp
index a62a387da62b..a473bc9e3ef5 100644
--- a/layout/svg/nsSVGSwitchFrame.cpp
+++ b/layout/svg/nsSVGSwitchFrame.cpp
@@ -139,20 +139,23 @@ nsIFrame* nsSVGSwitchFrame::GetFrameForPoint(const gfxPoint& aPoint) {
   return nullptr;
 }
 
+static bool shouldReflowSVGTextFrameInside(nsIFrame* aFrame) {
+  return aFrame->IsFrameOfType(nsIFrame::eSVG | nsIFrame::eSVGContainer) ||
+         aFrame->IsSVGForeignObjectFrame() ||
+         !aFrame->IsFrameOfType(nsIFrame::eSVG);
+}
+
 void nsSVGSwitchFrame::AlwaysReflowSVGTextFrameDoForOneKid(nsIFrame* aKid) {
   if (!NS_SUBTREE_DIRTY(aKid)) {
     return;
   }
 
-  LayoutFrameType type = aKid->Type();
-  if (type == LayoutFrameType::SVGText) {
+  if (aKid->IsSVGTextFrame()) {
     MOZ_ASSERT(!aKid->HasAnyStateBits(NS_FRAME_IS_NONDISPLAY),
                "A non-display SVGTextFrame directly contained in a display "
                "container?");
     static_cast<SVGTextFrame*>(aKid)->ReflowSVG();
-  } else if (aKid->IsFrameOfType(nsIFrame::eSVG | nsIFrame::eSVGContainer) ||
-             type == LayoutFrameType::SVGForeignObject ||
-             !aKid->IsFrameOfType(nsIFrame::eSVG)) {
+  } else if (shouldReflowSVGTextFrameInside(aKid)) {
     if (!aKid->HasAnyStateBits(NS_FRAME_IS_NONDISPLAY)) {
       for (nsIFrame* kid : aKid->PrincipalChildList()) {
         AlwaysReflowSVGTextFrameDoForOneKid(kid);
@@ -222,6 +225,10 @@ void nsSVGSwitchFrame::ReflowSVG() {
     // nsLayoutUtils::UnionChildOverflow since SVG frame's all use the same
     // frame list, and we're iterating over that list now anyway.
     ConsiderChildOverflow(overflowRects, child);
+  } else if (child && shouldReflowSVGTextFrameInside(child)) {
+    MOZ_ASSERT(child->HasAnyStateBits(NS_FRAME_IS_NONDISPLAY),
+               "Check for this explicitly in the |if|, then");
+    ReflowSVGNonDisplayText(child);
   }
 
   if (isFirstReflow) {

From a4d168a04fab18b3839ee5d75a364fa921f66a72 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 2 Apr 2019 03:31:26 +0000
Subject: [PATCH 11/46] Bug 1540788 - Make mach bootstrap choose arm target
 depending on the rust version. r=nalexander

Bootstrap is happy with rust version 1.32, but that version of rust
doesn't support the thumbv7neon target that we're trying to install
since bug 1539005. So install the armv7 target when rust is version
1.32.

Differential Revision: https://phabricator.services.mozilla.com/D25683

--HG--
extra : moz-landing-system : lando
---
 python/mozboot/mozboot/base.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/python/mozboot/mozboot/base.py b/python/mozboot/mozboot/base.py
index 630b0472ef62..1f5316d62f8d 100644
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -673,7 +673,7 @@ class BaseBootstrapper(object):
             print('Your version of Rust (%s) is new enough.' % version)
             rustup = self.which('rustup', cargo_bin)
             if rustup:
-                self.ensure_rust_targets(rustup)
+                self.ensure_rust_targets(rustup, version)
             return
 
         if version:
@@ -697,7 +697,7 @@ class BaseBootstrapper(object):
             print('Will try to install Rust.')
             self.install_rust()
 
-    def ensure_rust_targets(self, rustup):
+    def ensure_rust_targets(self, rustup, rust_version):
         """Make sure appropriate cross target libraries are installed."""
         target_list = subprocess.check_output([rustup, 'target', 'list'])
         targets = [line.split()[0] for line in target_list.splitlines()
@@ -712,7 +712,11 @@ class BaseBootstrapper(object):
 
         if 'mobile_android' in self.application:
             # Let's add the most common targets.
-            android_targets = ('thumbv7neon-linux-androideabi',
+            if LooseVersion(rust_version) < '1.33':
+                arm_target = 'armv7-linux-androideabi'
+            else:
+                arm_target = 'thumbv7neon-linux-androideabi'
+            android_targets = (arm_target,
                                'aarch64-linux-android',
                                'i686-linux-android',
                                'x86_64-linux-android', )

From 0d09d08c72a275732ccfc1885e3a20f34142dd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <tarek@mozilla.com>
Date: Tue, 2 Apr 2019 07:38:41 +0000
Subject: [PATCH 12/46] Bug 1527620 - Add youtube streaming tests - r=whimboo

This patch introduces a new marionette media test along
with a Youtube test.

To run the Youtube streaming test locally:

./mach marionette-test dom/media/test/marionette/test_youtube.py -vv --gecko-log -

Differential Revision: https://phabricator.services.mozilla.com/D23644

--HG--
extra : moz-landing-system : lando
---
 dom/media/moz.build                           |   4 +
 dom/media/test/marionette/manifest.ini        |   4 +
 dom/media/test/marionette/test_youtube.py     |  27 +
 .../marionette/yttest/BZP1rYjoBgI.manifest    |  10 +
 dom/media/test/marionette/yttest/__init__.py  |   1 +
 .../test/marionette/yttest/debug_info.js      |  18 +
 dom/media/test/marionette/yttest/download.py  |  17 +
 .../test/marionette/yttest/duration_test.js   |  21 +
 dom/media/test/marionette/yttest/force_hd.js  |  73 ++
 dom/media/test/marionette/yttest/playback.py  | 636 ++++++++++++++++++
 dom/media/test/marionette/yttest/record.py    |  34 +
 dom/media/test/marionette/yttest/support.py   |  88 +++
 .../test/marionette/yttest/until_end_test.js  |  18 +
 .../yttest/video_playback_quality.js          |   7 +
 dom/media/test/marionette/yttest/ytpage.py    |  82 +++
 .../mozbuild/mozbuild/action/test_archive.py  |   3 +-
 python/mozbuild/mozbuild/frontend/context.py  |   4 +
 taskcluster/ci/test/marionette.yml            |   9 +
 taskcluster/ci/test/test-platforms.yml        |   4 +
 taskcluster/ci/test/test-sets.yml             |   3 +
 .../marionette_harness/tests/stream-tests.ini |   2 +
 .../mozproxy/mozproxy/backends/mitm.py        |  37 +-
 testing/mozbase/mozproxy/mozproxy/utils.py    |  26 +-
 23 files changed, 1105 insertions(+), 23 deletions(-)
 create mode 100644 dom/media/test/marionette/manifest.ini
 create mode 100644 dom/media/test/marionette/test_youtube.py
 create mode 100644 dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest
 create mode 100644 dom/media/test/marionette/yttest/__init__.py
 create mode 100644 dom/media/test/marionette/yttest/debug_info.js
 create mode 100644 dom/media/test/marionette/yttest/download.py
 create mode 100644 dom/media/test/marionette/yttest/duration_test.js
 create mode 100644 dom/media/test/marionette/yttest/force_hd.js
 create mode 100644 dom/media/test/marionette/yttest/playback.py
 create mode 100644 dom/media/test/marionette/yttest/record.py
 create mode 100644 dom/media/test/marionette/yttest/support.py
 create mode 100644 dom/media/test/marionette/yttest/until_end_test.js
 create mode 100644 dom/media/test/marionette/yttest/video_playback_quality.js
 create mode 100644 dom/media/test/marionette/yttest/ytpage.py
 create mode 100644 testing/marionette/harness/marionette_harness/tests/stream-tests.ini

diff --git a/dom/media/moz.build b/dom/media/moz.build
index ed6e8063aef4..5c076d7a6e02 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -359,3 +359,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     ]
 
 FINAL_LIBRARY = 'xul'
+
+MARIONETTE_DOM_MEDIA_MANIFESTS += [
+ 'test/marionette/manifest.ini'
+]
diff --git a/dom/media/test/marionette/manifest.ini b/dom/media/test/marionette/manifest.ini
new file mode 100644
index 000000000000..687a7f50da34
--- /dev/null
+++ b/dom/media/test/marionette/manifest.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+run-if = buildapp == 'browser'
+
+[test_youtube.py]
diff --git a/dom/media/test/marionette/test_youtube.py b/dom/media/test/marionette/test_youtube.py
new file mode 100644
index 000000000000..a90d14e0c725
--- /dev/null
+++ b/dom/media/test/marionette/test_youtube.py
@@ -0,0 +1,27 @@
+# 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/.
+import sys
+import os
+
+sys.path.append(os.path.dirname(__file__))
+from yttest.support import VideoStreamTestCase
+
+
+class YoutubeTest(VideoStreamTestCase):
+
+    # bug 1513511
+    def test_stream_30_seconds(self):
+        # XXX use the V9 video we will settle on.
+        with self.youtube_video("BZP1rYjoBgI") as page:
+            res = page.run_test()
+            self.assertLess(res["droppedVideoFrames"], res["totalVideoFrames"] * 0.04)
+            # extracting in/out from the debugInfo
+            video_state = res["debugInfo"][7]
+            video_in = int(video_state.split(" ")[10].split("=")[-1])
+            video_out = int(video_state.split(" ")[11].split("=")[-1])
+            # what's the ratio ? we want 99%+
+            if video_out == video_in:
+                return
+            in_out_ratio = float(video_out) / float(video_in) * 100
+            self.assertMore(in_out_ratio, 99.0)
diff --git a/dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest b/dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest
new file mode 100644
index 000000000000..30ab8e83a3f8
--- /dev/null
+++ b/dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest
@@ -0,0 +1,10 @@
+[
+  {
+    "size": 20396656,
+    "visibility": "public",
+    "digest": "ccdecb515cadd243608898f38d74c23162fccb9246fee3084834c23d3a57710ed24c7c5dcc9b8bc6f5c3acb5fc0f3be144de08aa14d93e7dbbd372ec6166c138",
+    "algorithm": "sha512",
+    "filename": "BZP1rYjoBgI.tar.gz",
+    "unpack": true
+  }
+]
diff --git a/dom/media/test/marionette/yttest/__init__.py b/dom/media/test/marionette/yttest/__init__.py
new file mode 100644
index 000000000000..792d6005489e
--- /dev/null
+++ b/dom/media/test/marionette/yttest/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/dom/media/test/marionette/yttest/debug_info.js b/dom/media/test/marionette/yttest/debug_info.js
new file mode 100644
index 000000000000..2009e3ff4028
--- /dev/null
+++ b/dom/media/test/marionette/yttest/debug_info.js
@@ -0,0 +1,18 @@
+video.mozRequestDebugInfo().then(debugInfo => {
+  try {
+    debugInfo = debugInfo.replace(/\t/g, '').split(/\n/g);
+    var JSONDebugInfo = "{";
+      for(let g =0; g<debugInfo.length-1; g++){
+          var pair = debugInfo[g].split(": ");
+          JSONDebugInfo += '"' + pair[0] + '":"' + pair[1] + '",';
+      }
+      JSONDebugInfo = JSONDebugInfo.slice(0,JSONDebugInfo.length-1);
+      JSONDebugInfo += "}";
+      result["debugInfo"] = JSON.parse(JSONDebugInfo);
+  } catch (err) {
+    console.log(`Error '${err.toString()} in JSON.parse(${debugInfo})`);
+    result["debugInfo"] = debugInfo;
+  }
+  result["debugInfo"] = debugInfo;
+  resolve(result);
+});
diff --git a/dom/media/test/marionette/yttest/download.py b/dom/media/test/marionette/yttest/download.py
new file mode 100644
index 000000000000..69b9edaab608
--- /dev/null
+++ b/dom/media/test/marionette/yttest/download.py
@@ -0,0 +1,17 @@
+# 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/.
+import sys
+from pytube import YouTube
+
+
+def download_streams(video_id, output_path="data"):
+    yt = YouTube("https://youtube.com/watch?v=%s" % video_id)
+    for stream in yt.streams.all():
+        fn = "%s-%s-%s.%s" % (video_id, stream.itag, stream.type, stream.subtype)
+        stream.download(output_path="data", filename=fn)
+        print("%s downloaded" % fn)
+
+
+if __name__ == "__main__":
+    download_streams(sys.argv[-1])
diff --git a/dom/media/test/marionette/yttest/duration_test.js b/dom/media/test/marionette/yttest/duration_test.js
new file mode 100644
index 000000000000..881847148aa3
--- /dev/null
+++ b/dom/media/test/marionette/yttest/duration_test.js
@@ -0,0 +1,21 @@
+%(force_hd)s
+
+const resolve = arguments[arguments.length - 1];
+
+// this script is injected by marionette to collect metrics
+var video = document.getElementsByTagName("video")[0];
+if (!video) {
+  return "Can't find the video tag";
+}
+
+video.addEventListener("timeupdate", () => {
+    if (video.currentTime >= %(duration)s) {
+      video.pause();
+      %(video_playback_quality)s
+      %(debug_info)s
+    }
+  }
+);
+
+video.play();
+
diff --git a/dom/media/test/marionette/yttest/force_hd.js b/dom/media/test/marionette/yttest/force_hd.js
new file mode 100644
index 000000000000..ab3d2b54db48
--- /dev/null
+++ b/dom/media/test/marionette/yttest/force_hd.js
@@ -0,0 +1,73 @@
+// This parts forces the highest definition
+// https://addons.mozilla.org/en-US/firefox/addon/youtube-auto-hd-lq/
+// licence: MPL 2.0
+var config = {
+  "HD": true,
+  "LQ": false,
+  "ID": "auto-hd-lq-for-ytb",
+  "type": function (t) {
+    config.HD = t === 'hd';
+    config.LQ = t === 'lq';
+  },
+  "quality": function () {
+    if (config.HD || config.LQ) {
+      var youtubePlayerListener = function (LQ, HD) {
+        return function youtubePlayerListener (e) {
+          if (e === 1) {
+            var player = document.getElementById('movie_player');
+            if (player) {
+              var levels = player.getAvailableQualityLevels();
+              if (levels.length) {
+                var q = (HD && levels[0]) ? levels[0] : ((LQ && levels[levels.length - 2]) ? levels[levels.length - 2] : null);
+                if (q) {
+                  player.setPlaybackQuality(q);
+                  player.setPlaybackQualityRange(q, q);
+                }
+              }
+            }
+          }
+        }
+      }
+      /*  */
+      var inject = function () {
+        var action = function () {
+          var player = document.getElementById('movie_player');
+          if (player && player.addEventListener && player.getPlayerState) {
+            player.addEventListener("onStateChange", "youtubePlayerListener");
+          } else window.setTimeout(action, 1000);
+        };
+        /*  */
+        action();
+      };
+      var script = document.getElementById(config.ID);
+      if (!script) {
+        script = document.createElement("script");
+        script.setAttribute("type", "text/javascript");
+        script.setAttribute("id", config.ID);
+        document.documentElement.appendChild(script);
+      }
+      /*  */
+      script.textContent = "var youtubePlayerListener = (" + youtubePlayerListener + ')(' + config.LQ + ',' + config.HD  + ');(' + inject + ')();';
+    }
+  }
+};
+
+  if (/^https?:\/\/www\.youtube.com\/watch\?/.test(document.location.href)) config.quality();
+  var content = document.getElementById('content');
+  if (content) {
+    var observer = new window.MutationObserver(function (e) {
+      e.forEach(function (m) {
+        if (m.addedNodes !== null) {
+          for (var i = 0; i < m.addedNodes.length; i++) {
+            if (m.addedNodes[i].id === 'movie_player') {
+              config.quality();
+              return;
+            }
+          }
+        }
+      });
+    });
+    /*  */
+    observer.observe(content, {"childList": true, "subtree": true});
+  }
+
diff --git a/dom/media/test/marionette/yttest/playback.py b/dom/media/test/marionette/yttest/playback.py
new file mode 100644
index 000000000000..ffdba72c1d27
--- /dev/null
+++ b/dom/media/test/marionette/yttest/playback.py
@@ -0,0 +1,636 @@
+# 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/.
+"""
+MITM Script used to play back media files when a YT video is played.
+
+This is a self-contained script that should not import anything else
+except modules from the standard library and mitmproxy modules.
+"""
+import os
+import sys
+import datetime
+import time
+
+
+itags = {
+    "5": {
+        "Extension": "flv",
+        "Resolution": "240p",
+        "VideoEncoding": "Sorenson H.283",
+        "AudioEncoding": "mp3",
+        "Itag": 5,
+        "AudioBitrate": 64,
+    },
+    "6": {
+        "Extension": "flv",
+        "Resolution": "270p",
+        "VideoEncoding": "Sorenson H.263",
+        "AudioEncoding": "mp3",
+        "Itag": 6,
+        "AudioBitrate": 64,
+    },
+    "13": {
+        "Extension": "3gp",
+        "Resolution": "",
+        "VideoEncoding": "MPEG-4 Visual",
+        "AudioEncoding": "aac",
+        "Itag": 13,
+        "AudioBitrate": 0,
+    },
+    "17": {
+        "Extension": "3gp",
+        "Resolution": "144p",
+        "VideoEncoding": "MPEG-4 Visual",
+        "AudioEncoding": "aac",
+        "Itag": 17,
+        "AudioBitrate": 24,
+    },
+    "18": {
+        "Extension": "mp4",
+        "Resolution": "360p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 18,
+        "AudioBitrate": 96,
+    },
+    "22": {
+        "Extension": "mp4",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 22,
+        "AudioBitrate": 192,
+    },
+    "34": {
+        "Extension": "flv",
+        "Resolution": "480p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 34,
+        "AudioBitrate": 128,
+    },
+    "35": {
+        "Extension": "flv",
+        "Resolution": "360p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 35,
+        "AudioBitrate": 128,
+    },
+    "36": {
+        "Extension": "3gp",
+        "Resolution": "240p",
+        "VideoEncoding": "MPEG-4 Visual",
+        "AudioEncoding": "aac",
+        "Itag": 36,
+        "AudioBitrate": 36,
+    },
+    "37": {
+        "Extension": "mp4",
+        "Resolution": "1080p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 37,
+        "AudioBitrate": 192,
+    },
+    "38": {
+        "Extension": "mp4",
+        "Resolution": "3072p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 38,
+        "AudioBitrate": 192,
+    },
+    "43": {
+        "Extension": "webm",
+        "Resolution": "360p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 43,
+        "AudioBitrate": 128,
+    },
+    "44": {
+        "Extension": "webm",
+        "Resolution": "480p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 44,
+        "AudioBitrate": 128,
+    },
+    "45": {
+        "Extension": "webm",
+        "Resolution": "720p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 45,
+        "AudioBitrate": 192,
+    },
+    "46": {
+        "Extension": "webm",
+        "Resolution": "1080p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 46,
+        "AudioBitrate": 192,
+    },
+    "82": {
+        "Extension": "mp4",
+        "Resolution": "360p",
+        "VideoEncoding": "H.264",
+        "Itag": 82,
+        "AudioBitrate": 96,
+    },
+    "83": {
+        "Extension": "mp4",
+        "Resolution": "240p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 83,
+        "AudioBitrate": 96,
+    },
+    "84": {
+        "Extension": "mp4",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 84,
+        "AudioBitrate": 192,
+    },
+    "85": {
+        "Extension": "mp4",
+        "Resolution": "1080p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 85,
+        "AudioBitrate": 192,
+    },
+    "100": {
+        "Extension": "webm",
+        "Resolution": "360p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 100,
+        "AudioBitrate": 128,
+    },
+    "101": {
+        "Extension": "webm",
+        "Resolution": "360p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 101,
+        "AudioBitrate": 192,
+    },
+    "102": {
+        "Extension": "webm",
+        "Resolution": "720p",
+        "VideoEncoding": "VP8",
+        "AudioEncoding": "vorbis",
+        "Itag": 102,
+        "AudioBitrate": 192,
+    },
+    "133": {
+        "Extension": "mp4",
+        "Resolution": "240p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 133,
+        "AudioBitrate": 0,
+    },
+    "134": {
+        "Extension": "mp4",
+        "Resolution": "360p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 134,
+        "AudioBitrate": 0,
+    },
+    "135": {
+        "Extension": "mp4",
+        "Resolution": "480p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 135,
+        "AudioBitrate": 0,
+    },
+    "136": {
+        "Extension": "mp4",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 136,
+        "AudioBitrate": 0,
+    },
+    "137": {
+        "Extension": "mp4",
+        "Resolution": "1080p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 137,
+        "AudioBitrate": 0,
+    },
+    "138": {
+        "Extension": "mp4",
+        "Resolution": "2160p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 138,
+        "AudioBitrate": 0,
+    },
+    "160": {
+        "Extension": "mp4",
+        "Resolution": "144p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 160,
+        "AudioBitrate": 0,
+    },
+    "242": {
+        "Extension": "webm",
+        "Resolution": "240p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 242,
+        "AudioBitrate": 0,
+    },
+    "243": {
+        "Extension": "webm",
+        "Resolution": "360p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 243,
+        "AudioBitrate": 0,
+    },
+    "244": {
+        "Extension": "webm",
+        "Resolution": "480p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 244,
+        "AudioBitrate": 0,
+    },
+    "247": {
+        "Extension": "webm",
+        "Resolution": "720p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 247,
+        "AudioBitrate": 0,
+    },
+    "248": {
+        "Extension": "webm",
+        "Resolution": "1080p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 248,
+        "AudioBitrate": 9,
+    },
+    "264": {
+        "Extension": "mp4",
+        "Resolution": "1440p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 264,
+        "AudioBitrate": 0,
+    },
+    "266": {
+        "Extension": "mp4",
+        "Resolution": "2160p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 266,
+        "AudioBitrate": 0,
+    },
+    "271": {
+        "Extension": "webm",
+        "Resolution": "1440p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 271,
+        "AudioBitrate": 0,
+    },
+    "272": {
+        "Extension": "webm",
+        "Resolution": "2160p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 272,
+        "AudioBitrate": 0,
+    },
+    "278": {
+        "Extension": "webm",
+        "Resolution": "144p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 278,
+        "AudioBitrate": 0,
+    },
+    "298": {
+        "Extension": "mp4",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 298,
+        "AudioBitrate": 0,
+    },
+    "299": {
+        "Extension": "mp4",
+        "Resolution": "1080p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "",
+        "Itag": 299,
+        "AudioBitrate": 0,
+    },
+    "302": {
+        "Extension": "webm",
+        "Resolution": "720p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 302,
+        "AudioBitrate": 0,
+    },
+    "303": {
+        "Extension": "webm",
+        "Resolution": "1080p",
+        "VideoEncoding": "VP9",
+        "AudioEncoding": "",
+        "Itag": 303,
+        "AudioBitrate": 0,
+    },
+    "139": {
+        "Extension": "mp4",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "aac",
+        "Itag": 139,
+        "AudioBitrate": 48,
+    },
+    "140": {
+        "Extension": "mp4",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "aac",
+        "Itag": 140,
+        "AudioBitrate": 128,
+    },
+    "141": {
+        "Extension": "mp4",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "aac",
+        "Itag": 141,
+        "AudioBitrate": 256,
+    },
+    "171": {
+        "Extension": "webm",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "vorbis",
+        "Itag": 171,
+        "AudioBitrate": 128,
+    },
+    "172": {
+        "Extension": "webm",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "vorbis",
+        "Itag": 172,
+        "AudioBitrate": 192,
+    },
+    "249": {
+        "Extension": "webm",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "opus",
+        "Itag": 249,
+        "AudioBitrate": 50,
+    },
+    "250": {
+        "Extension": "webm",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "opus",
+        "Itag": 250,
+        "AudioBitrate": 70,
+    },
+    "251": {
+        "Extension": "webm",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "opus",
+        "Itag": 251,
+        "AudioBitrate": 160,
+    },
+    "92": {
+        "Extension": "ts",
+        "Resolution": "240p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 92,
+        "AudioBitrate": 48,
+    },
+    "93": {
+        "Extension": "ts",
+        "Resolution": "480p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 93,
+        "AudioBitrate": 128,
+    },
+    "94": {
+        "Extension": "ts",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 94,
+        "AudioBitrate": 128,
+    },
+    "95": {
+        "Extension": "ts",
+        "Resolution": "1080p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 95,
+        "AudioBitrate": 256,
+    },
+    "96": {
+        "Extension": "ts",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 96,
+        "AudioBitrate": 256,
+    },
+    "120": {
+        "Extension": "flv",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 120,
+        "AudioBitrate": 128,
+    },
+    "127": {
+        "Extension": "ts",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "aac",
+        "Itag": 127,
+        "AudioBitrate": 96,
+    },
+    "128": {
+        "Extension": "ts",
+        "Resolution": "",
+        "VideoEncoding": "",
+        "AudioEncoding": "aac",
+        "Itag": 128,
+        "AudioBitrate": 96,
+    },
+    "132": {
+        "Extension": "ts",
+        "Resolution": "240p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 132,
+        "AudioBitrate": 48,
+    },
+    "151": {
+        "Extension": "ts",
+        "Resolution": "720p",
+        "VideoEncoding": "H.264",
+        "AudioEncoding": "aac",
+        "Itag": 151,
+        "AudioBitrate": 24,
+    },
+}
+
+
+def repr_itag(itag):
+    itag_info = ["  %s: %s" % (k, v) for k, v in get_itag_info(itag).items()]
+    return "\n".join(itag_info)
+
+
+def get_itag_info(itag):
+    return itags[itag]
+
+
+def log(msg):
+    print(msg)
+
+
+_HERE = os.path.dirname(__file__)
+if "MOZPROXY_DIR" in os.environ:
+    _DEFAULT_DATA_DIR = os.environ["MOZPROXY_DIR"]
+else:
+    _DEFAULT_DATA_DIR = os.path.join(_HERE, "..", "data")
+
+_HEADERS = {
+    b"Last-Modified": b"Mon, 10 Dec 2018 19:39:24 GMT",
+    b"Content-Type": b"video/webm",
+    b"Date": b"Wed, 02 Jan 2019 15:14:06 GMT",
+    b"Expires": b"Wed, 02 Jan 2019 15:14:06 GMT",
+    b"Cache-Control": b"private, max-age=21292",
+    b"Accept-Ranges": b"bytes",
+    b"Content-Length": b"173448",
+    b"Connection": b"keep-alive",
+    b"Alt-Svc": b'quic=":443"; ma=2592000; v="44,43,39,35"',
+    b"Access-Control-Allow-Origin": b"https://www.youtube.com",
+    b"Access-Control-Allow-Credentials": b"true",
+    b"Timing-Allow-Origin": b"https://www.youtube.com",
+    b"Access-Control-Expose-Headers": (
+        b"Client-Protocol, Content-Length, "
+        b"Content-Type, X-Bandwidth-Est, "
+        b"X-Bandwidth-Est2, X-Bandwidth-Est3, "
+        b"X-Bandwidth-App-Limited, "
+        b"X-Bandwidth-Est-App-Limited, "
+        b"X-Bandwidth-Est-Comp, X-Bandwidth-Avg, "
+        b"X-Head-Time-Millis, X-Head-Time-Sec, "
+        b"X-Head-Seqnum, X-Response-Itag, "
+        b"X-Restrict-Formats-Hint, "
+        b"X-Sequence-Num, X-Segment-Lmt, "
+        b"X-Walltime-Ms"
+    ),
+    b"X-Restrict-Formats-Hint": b"None",
+    b"X-Content-Type-Options": b"nosniff",
+    b"Server": b"gvs 1.0",
+}
+
+
+def get_cached_data(request, datadir=_DEFAULT_DATA_DIR):
+    query_args = dict(request.query)
+    mime = query_args["mime"]
+    file_id = query_args["id"]
+    file_range = query_args["range"]
+    itag = query_args["itag"]
+    log("Request File %s - %s" % (file_id, mime))
+    log("Requested range %s" % file_range)
+    log("Requested quality\n%s" % repr_itag(itag))
+    frange = file_range.split("-")
+    range_start, range_end = int(frange[0]), int(frange[1])
+    video_id = sys.argv[-1].split(".")[0]
+    fn = "%s-%s-%s.%s" % (video_id, itag, mime.replace("/", ""), mime.split("/")[-1])
+    fn = os.path.join(datadir, fn)
+    if not os.path.exists(fn):
+        raise Exception("no file at %s" % fn)
+    with open(fn, "rb") as f:
+        data = f.read()
+    data = data[range_start : range_end + 1]        # noqa: E203
+    headers = dict(_HEADERS)
+    headers[b"Content-Type"] = bytes(mime, "utf8")
+    headers[b"Content-Length"] = bytes(str(len(data)), "utf8")
+    return headers.items(), data
+
+
+def OK(flow, code=204):
+    """ Sending back a dummy response.
+
+    204 is the default in most cases on YT requests.
+    """
+    from mitmproxy import http
+
+    flow.error = None
+    flow.response = http.HTTPResponse(b"HTTP/1.1", code, b"OK", {}, b"")
+
+
+def request(flow):
+    # All requests made for stats purposes can be discarded and
+    # a 204 sent back to the client.
+    if flow.request.url.startswith("https://www.youtube.com/ptracking"):
+        OK(flow)
+        return
+    if flow.request.url.startswith("https://www.youtube.com/api/stats/playback"):
+        OK(flow)
+        return
+    if flow.request.url.startswith("https://www.youtube.com/api/stats/watchtime"):
+        OK(flow)
+        return
+    # disable a few trackers, sniffers, etc
+    if "push.services.mozilla.com" in flow.request.url:
+        OK(flow, code=200)
+        return
+    if "gen_204" in flow.request.url:
+        OK(flow)
+        return
+
+    # we don't want to post back any data, discarding.
+    if flow.request.method == "POST":
+        OK(flow)
+        return
+    if "googlevideo.com/videoplayback" in flow.request.url:
+        from mitmproxy import http
+
+        query_args = dict(flow.request.query)
+        file_id = query_args["id"]
+        file_range = query_args["range"]
+        headers, data = get_cached_data(flow.request)
+        headers = list(headers)
+        flow.error = None
+        flow.response = http.HTTPResponse(b"HTTP/1.1", 200, b"OK", headers, data)
+        now = datetime.datetime.now()
+        then = now - datetime.timedelta(hours=1)
+        flow.response.timestamp_start = time.mktime(then.timetuple())
+        flow.response.refresh()
+        log("SENT FILE %s IN CACHE - range %s" % (file_id, file_range))
+
+
+def error(flow):
+    print("\n\n\n\nERROR %s\n\n\n\n" % flow.error.msg)
diff --git a/dom/media/test/marionette/yttest/record.py b/dom/media/test/marionette/yttest/record.py
new file mode 100644
index 000000000000..b0bde6f01efa
--- /dev/null
+++ b/dom/media/test/marionette/yttest/record.py
@@ -0,0 +1,34 @@
+"""
+MITM Script used to collect media files when a YT video is played.
+
+This is a self-contained script that should not import anything else
+except modules from the standard library and mitmproxy modules.
+"""
+import os
+
+
+_HERE = os.path.dirname(__file__)
+if "MOZPROXY_DIR" in os.environ:
+    _DEFAULT_DATA_DIR = os.environ["MOZPROXY_DIR"]
+else:
+    _DEFAULT_DATA_DIR = os.path.join(_HERE, "..", "data")
+
+
+def response(flow):
+    print(flow.request.url)
+    if "googlevideo.com/videoplayback" in flow.request.url:
+        itag = flow.request.query["itag"]
+        mime = flow.request.query["mime"].replace("/", "-")
+        query_args = dict(flow.request.query)
+        file_id = query_args["id"]
+        file_range = query_args["range"]
+        print("Writing %s:%s" % (file_id, file_range))
+        # changing the host so the MITM recording file
+        # does not rely on a specific YT server
+        flow.request.host = "googlevideo.com"
+        if len(flow.response.content) == 0:
+            return
+        path = "%s-%s-%s.%s" % (file_id, itag, file_range, mime)
+        path = os.path.join(_DEFAULT_DATA_DIR, path)
+        with open(path, "wb") as f:
+            f.write(flow.response.content)
diff --git a/dom/media/test/marionette/yttest/support.py b/dom/media/test/marionette/yttest/support.py
new file mode 100644
index 000000000000..3a7dd90de512
--- /dev/null
+++ b/dom/media/test/marionette/yttest/support.py
@@ -0,0 +1,88 @@
+# 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/.
+import sys
+import os
+from contextlib import contextmanager
+
+from mozproxy import get_playback
+import mozinfo
+import mozlog
+from marionette_harness.marionette_test import MarionetteTestCase
+from yttest.ytpage import using_page
+
+
+mozlog.commandline.setup_logging("mozproxy", {}, {"tbpl": sys.stdout})
+here = os.path.dirname(__file__)
+playback_script = os.path.join(here, "playback.py")
+
+
+class VideoStreamTestCase(MarionetteTestCase):
+    def setUp(self):
+        MarionetteTestCase.setUp(self)
+        if "MOZ_UPLOAD_DIR" not in os.environ:
+            os.environ["OBJ_PATH"] = "/tmp/"
+        self.marionette.set_pref("media.autoplay.default", 1)
+
+    @contextmanager
+    def using_proxy(self, video_id):
+        config = {}
+        config["binary"] = self.marionette.bin
+        config["app"] = "firefox"
+        config["platform"] = mozinfo.os
+        config["processor"] = mozinfo.processor
+        config["run_local"] = "MOZ_UPLOAD_DIR" not in os.environ
+
+        if "MOZ_UPLOAD_DIR" not in os.environ:
+            config["obj_path"] = os.environ["OBJ_PATH"]
+            playback_dir = os.path.join(config["obj_path"], "testing", "mozproxy")
+        else:
+            root_dir = os.path.dirname(os.path.dirname(os.environ["MOZ_UPLOAD_DIR"]))
+            playback_dir = os.path.join(root_dir, "testing", "mozproxy")
+
+        config["host"] = "localhost"
+        config["playback_tool"] = "mitmproxy"
+        config["playback_artifacts"] = os.path.join(here, "%s.manifest" % video_id)
+
+        # XXX once Bug 1540622 lands, we can use the version here
+        # config["playback_version"] = "4.0.4"
+        # and have playback_binary_manifest default to
+        # mitmproxy-rel-bin-{playback_version}-{platform}.manifest
+        # so we don't have to ask amozproxy tool user to provide this:
+        config[
+            "playback_binary_manifest"
+        ] = "mitmproxy-rel-bin-4.0.4-{platform}.manifest"
+
+        playback_file = os.path.join(playback_dir, "%s.playback" % video_id)
+
+        config["playback_tool_args"] = [
+            "--ssl-insecure",
+            "--server-replay-nopop",
+            "--set",
+            "upstream_cert=false",
+            "-S",
+            playback_file,
+            "-s",
+            playback_script,
+            video_id,
+        ]
+
+        proxy = get_playback(config)
+        if proxy is None:
+            raise Exception("Could not start Proxy")
+        proxy.start()
+        try:
+            yield proxy
+        finally:
+            proxy.stop()
+
+    @contextmanager
+    def youtube_video(self, video_id, **options):
+        proxy = options.get("proxy", True)
+        if proxy:
+            with self.using_proxy(video_id):
+                with using_page(video_id, self.marionette, **options) as page:
+                    yield page
+        else:
+            with using_page(video_id, self.marionette, **options) as page:
+                yield page
diff --git a/dom/media/test/marionette/yttest/until_end_test.js b/dom/media/test/marionette/yttest/until_end_test.js
new file mode 100644
index 000000000000..61f56c94c797
--- /dev/null
+++ b/dom/media/test/marionette/yttest/until_end_test.js
@@ -0,0 +1,18 @@
+%(force_hd)s
+
+const resolve = arguments[arguments.length - 1];
+
+// this script is injected by marionette to collect metrics
+var video = document.getElementsByTagName("video")[0];
+if (!video) {
+  return "Can't find the video tag";
+}
+
+video.addEventListener("ended", () => {
+    video.pause();
+    %(video_playback_quality)s
+    %(debug_info)s
+  }, {once: true}
+);
+
+video.play();
diff --git a/dom/media/test/marionette/yttest/video_playback_quality.js b/dom/media/test/marionette/yttest/video_playback_quality.js
new file mode 100644
index 000000000000..fd02a776134e
--- /dev/null
+++ b/dom/media/test/marionette/yttest/video_playback_quality.js
@@ -0,0 +1,7 @@
+var vpq = video.getVideoPlaybackQuality();
+var result = {"currentTime": video.currentTime};
+result["creationTime"] = vpq.creationTime;
+result["corruptedVideoFrames"] = vpq.corruptedVideoFrames;
+result["droppedVideoFrames"] = vpq.droppedVideoFrames;
+result["totalVideoFrames"] = vpq.totalVideoFrames;
+result["defaultPlaybackRate"] = video.playbackRate;
diff --git a/dom/media/test/marionette/yttest/ytpage.py b/dom/media/test/marionette/yttest/ytpage.py
new file mode 100644
index 000000000000..bb9282047fd2
--- /dev/null
+++ b/dom/media/test/marionette/yttest/ytpage.py
@@ -0,0 +1,82 @@
+# 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/.
+"""
+Drives the browser during the playback test.
+"""
+import contextlib
+import os
+
+
+here = os.path.dirname(__file__)
+js = os.path.join(here, "until_end_test.js")
+with open(js) as f:
+    UNTIL_END_TEST = f.read()
+
+js = os.path.join(here, "duration_test.js")
+with open(js) as f:
+    DURATION_TEST = f.read()
+
+JS_MACROS = {"video_playback_quality": "", "debug_info": "", "force_hd": ""}
+for script in JS_MACROS:
+    js = os.path.join(here, "%s.js" % script)
+    with open(js) as f:
+        JS_MACROS[script] = f.read()
+
+
+class YoutubePage:
+    def __init__(self, video_id, marionette, **options):
+        self.video_id = video_id
+        self.marionette = marionette
+        self.url = "https://www.youtube.com/watch?v=%s" % self.video_id
+        self.started = False
+        self.capabilities = {
+            # We're not using upstream cert sniffing, let's make sure
+            # the browser accepts mitmproxy ones for all requests
+            # even if they are incorrect.
+            "acceptInsecureCerts": True
+        }
+        self.options = options
+        if options.get("proxy", True):
+            self.capabilities["proxy"] = {
+                "proxyType": "manual",
+                "httpProxy": "localhost:8080",
+                "sslProxy": "localhost:8080",
+                "noProxy": ["localhost"],
+            }
+
+    def start_video(self):
+        self.marionette.start_session(self.capabilities)
+        self.marionette.timeout.script = 600
+        self.marionette.navigate(self.url)
+        self.started = True
+
+    def run_test(self):
+        self.start_video()
+        options = dict(JS_MACROS)
+        options.update(self.options)
+        if "duration" in options:
+            script = DURATION_TEST % options
+        else:
+            script = UNTIL_END_TEST % options
+        self.marionette.set_pref("media.autoplay.default", 0)
+        return self.execute_async_script(script)
+
+    def execute_async_script(self, script, context=None):
+        if context is None:
+            context = self.marionette.CONTEXT_CONTENT
+        with self.marionette.using_context(context):
+            return self.marionette.execute_async_script(script, sandbox="system")
+
+    def close(self):
+        if self.started:
+            self.marionette.delete_session()
+
+
+@contextlib.contextmanager
+def using_page(video_id, marionette, **options):
+    page = YoutubePage(video_id, marionette, **options)
+    try:
+        yield page
+    finally:
+        page.close()
diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
index ffb3edfc5d46..4c098737b392 100644
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -138,8 +138,9 @@ ARCHIVE_FILES = {
             'source': buildconfig.topsrcdir,
             'base': '',
             'manifests': [
+                'dom/media/test/marionette/manifest.ini',
                 'testing/marionette/harness/marionette_harness/tests/unit-tests.ini',
-                'gfx/tests/marionette/manifest.ini',
+                'gfx/tests/marionette/manifest.ini'
             ],
             # We also need the manifests and harness_unit tests
             'pattern': 'testing/marionette/harness/marionette_harness/tests/**',
diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index f6cbcb0764e7..a557219290f0 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1872,6 +1872,10 @@ VARIABLES = {
         """List of manifest files defining mochitest chrome tests.
         """),
 
+    'MARIONETTE_DOM_MEDIA_MANIFESTS': (ManifestparserManifestList, list,
+        """List of manifest files defining marionette-media tests.
+        """),
+
     'MOCHITEST_MANIFESTS': (ManifestparserManifestList, list,
         """List of manifest files defining mochitest tests.
         """),
diff --git a/taskcluster/ci/test/marionette.yml b/taskcluster/ci/test/marionette.yml
index e0532e56d070..f977453bdb01 100644
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -47,3 +47,12 @@ marionette-gpu:
         by-test-platform:
             windows10-64.*: virtual-with-gpu
             default: virtual
+
+marionette-media:
+    description: "Marionette DOM media test run"
+    treeherder-symbol: MnM
+    max-run-time: 5400
+    instance-size: default
+    mozharness:
+        extra-options:
+            - --test-manifest=stream-tests.ini
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 625622914d62..798a8a226966 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -36,6 +36,7 @@ linux64/debug:
         - common-tests
         - web-platform-tests
         - mochitest-headless
+        - marionette-media-tests
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
@@ -135,6 +136,7 @@ windows7-32/debug:
         - windows-reftest-gpu
         - windows-tests
         - web-platform-tests
+        - marionette-media-tests
 
 windows7-32/opt:
     build-platform: win32/opt
@@ -187,6 +189,7 @@ windows10-64/debug:
         - windows-tests
         - web-platform-tests
         - mochitest-headless
+        - marionette-media-tests
 
 windows10-64/opt:
     build-platform: win64/opt
@@ -278,6 +281,7 @@ macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - macosx64-tests
+        - marionette-media-tests
 
 macosx64-shippable/opt:
     build-platform: macosx64-shippable/opt
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 2bde8be3ba47..3d881eb17441 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -274,6 +274,9 @@ windows-talos:
 marionette-gpu-tests:
     - marionette-gpu
 
+marionette-media-tests:
+    - marionette-media
+
 macosx64-tests:
     - cppunit
     - crashtest
diff --git a/testing/marionette/harness/marionette_harness/tests/stream-tests.ini b/testing/marionette/harness/marionette_harness/tests/stream-tests.ini
new file mode 100644
index 000000000000..1e099c9fd9c4
--- /dev/null
+++ b/testing/marionette/harness/marionette_harness/tests/stream-tests.ini
@@ -0,0 +1,2 @@
+# stream tests
+[include:../../../../../dom/media/test/marionette/manifest.ini]
diff --git a/testing/mozbase/mozproxy/mozproxy/backends/mitm.py b/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
index c8e9ddcb2995..a1539b250eee 100644
--- a/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
+++ b/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
@@ -79,7 +79,8 @@ class Mitmproxy(Playback):
         self.browser_path = config.get("binary")
         self.policies_dir = None
         self.ignore_mitmdump_exit_failure = config.get(
-                "ignore_mitmdump_exit_failure", False)
+            "ignore_mitmdump_exit_failure", False
+        )
 
         # mozproxy_dir is where we will download all mitmproxy required files
         # when running locally it comes from obj_path via mozharness/mach
@@ -149,8 +150,13 @@ class Mitmproxy(Playback):
                 if not artifact:
                     continue
                 artifact_name = artifact.split("/")[-1]
-                dest = os.path.join(self.mozproxy_dir, artifact_name)
-                download_file_from_url(artifact, dest, extract=True)
+                if artifact_name.endswith(".manifest"):
+                    tooltool_download(
+                        artifact, self.config["run_local"], self.mozproxy_dir
+                    )
+                else:
+                    dest = os.path.join(self.mozproxy_dir, artifact_name)
+                    download_file_from_url(artifact, dest, extract=True)
 
     def stop(self):
         self.stop_mitmproxy_playback()
@@ -174,10 +180,9 @@ class Mitmproxy(Playback):
         LOG.info("Starting mitmproxy playback using command: %s" % " ".join(command))
         # to turn off mitmproxy log output, use these params for Popen:
         # Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
-        self.mitmproxy_proc = ProcessHandler(command,
-                                             logfile=os.path.join(self.upload_dir,
-                                                                  "mitmproxy.log"),
-                                             env=env)
+        self.mitmproxy_proc = ProcessHandler(
+            command, logfile=os.path.join(self.upload_dir, "mitmproxy.log"), env=env
+        )
         self.mitmproxy_proc.run()
         end_time = time.time() + MITMDUMP_COMMAND_TIMEOUT
         ready = False
@@ -348,7 +353,7 @@ class MitmproxyAndroid(Mitmproxy):
     @property
     def certutil_sleep_seconds(self):
         """Time to sleep, in seconds, after issuing a `certutil` command."""
-        return 10 if not self.config['run_local'] else 1
+        return 10 if not self.config["run_local"] else 1
 
     def setup(self):
         """For geckoview we need to install the generated mitmproxy CA cert"""
@@ -372,14 +377,18 @@ class MitmproxyAndroid(Mitmproxy):
         2. Import the mitmproxy certificate into the database, i.e.:
            `certutil -A -d sql:<path to profile> -n "some nickname" -t TC,, -a -i <path to CA.pem>`
         """
-        if self.config['run_local']:
+        if self.config["run_local"]:
             # when running locally, it is found in the Firefox desktop build (..obj../dist/bin)
-            self.certutil = os.path.join(os.environ['MOZ_HOST_BIN'], 'certutil')
-            if not (os.path.isfile(self.certutil) and os.access(self.certutil, os.X_OK)):
-                LOG.critical("Abort: unable to execute certutil: {}".format(self.certutil))
+            self.certutil = os.path.join(os.environ["MOZ_HOST_BIN"], "certutil")
+            if not (
+                os.path.isfile(self.certutil) and os.access(self.certutil, os.X_OK)
+            ):
+                LOG.critical(
+                    "Abort: unable to execute certutil: {}".format(self.certutil)
+                )
                 raise
-            self.certutil = os.environ['MOZ_HOST_BIN']
-            os.environ['LD_LIBRARY_PATH'] = self.certutil
+            self.certutil = os.environ["MOZ_HOST_BIN"]
+            os.environ["LD_LIBRARY_PATH"] = self.certutil
         else:
             # must download certutil inside hostutils via tooltool; use this manifest:
             # mozilla-central/testing/config/tooltool-manifests/linux64/hostutils.manifest
diff --git a/testing/mozbase/mozproxy/mozproxy/utils.py b/testing/mozbase/mozproxy/mozproxy/utils.py
index 96829995c739..282809632b6c 100644
--- a/testing/mozbase/mozproxy/mozproxy/utils.py
+++ b/testing/mozbase/mozproxy/mozproxy/utils.py
@@ -30,10 +30,15 @@ from mozproxy import mozharness_dir
 
 LOG = get_proxy_logger(component="mozproxy")
 
-external_tools_path = os.environ.get("EXTERNALTOOLSPATH", None)
-if external_tools_path is not None:
-    # running in production via mozharness
-    TOOLTOOL_PATH = os.path.join(external_tools_path, "tooltool.py")
+if "MOZ_UPLOAD_DIR" in os.environ:
+    TOOLTOOL_PATH = os.path.join(
+        os.environ["MOZ_UPLOAD_DIR"],
+        "..",
+        "..",
+        "mozharness",
+        "external_tools",
+        "tooltool.py",
+    )
 else:
     # running locally via mach
     TOOLTOOL_PATH = os.path.join(mozharness_dir, "external_tools", "tooltool.py")
@@ -80,10 +85,15 @@ def tooltool_download(manifest, run_local, raptor_dir):
         #  - TOOLTOOLCACHE is used by Raptor tests
         #  - TOOLTOOL_CACHE is automatically set for taskcluster jobs
         #  - fallback to a hardcoded path
-        _cache = next(x for x in (
-                    os.environ.get("TOOLTOOLCACHE"),
-                    os.environ.get("TOOLTOOL_CACHE"),
-                    "/builds/tooltool_cache") if x is not None)
+        _cache = next(
+            x
+            for x in (
+                os.environ.get("TOOLTOOLCACHE"),
+                os.environ.get("TOOLTOOL_CACHE"),
+                "/builds/tooltool_cache",
+            )
+            if x is not None
+        )
 
         command = [
             sys.executable,

From 091278a83ce8726a9d6fcbd22b0b6ad1f1bd5aa9 Mon Sep 17 00:00:00 2001
From: Dhyey Thakore <dhyey35@gmail.com>
Date: Tue, 2 Apr 2019 07:39:55 +0000
Subject: [PATCH 13/46] Bug 1539423 - Netmonitor docs: http/2 response headers
 are in small case r=Honza

Add comment in HeadersPanel

Differential Revision: https://phabricator.services.mozilla.com/D25704

--HG--
extra : moz-landing-system : lando
---
 devtools/client/netmonitor/src/components/HeadersPanel.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/devtools/client/netmonitor/src/components/HeadersPanel.js b/devtools/client/netmonitor/src/components/HeadersPanel.js
index 08991233ec9c..10449a4d8173 100644
--- a/devtools/client/netmonitor/src/components/HeadersPanel.js
+++ b/devtools/client/netmonitor/src/components/HeadersPanel.js
@@ -63,6 +63,10 @@ const SUMMARY_REFERRER_POLICY = L10N.getStr("netmonitor.summary.referrerPolicy")
 /**
  * Headers panel component
  * Lists basic information about the request
+ *
+ * In http/2 all response headers are in small case.
+ * See: https://developer.mozilla.org/en-US/docs/Tools/Network_Monitor/request_details#Headers
+ * RFC: https://tools.ietf.org/html/rfc7540#section-8.1.2
  */
 class HeadersPanel extends Component {
   static get propTypes() {

From 5cb90343fee7db1bf88451913cb534e71ce6c34e Mon Sep 17 00:00:00 2001
From: dlee <dlee@mozilla.com>
Date: Tue, 2 Apr 2019 08:00:37 +0000
Subject: [PATCH 14/46] Bug 1539150 - Use window.open instead of setting iframe
 src in test_classify_by_default.html. ?baku r=baku

In the test_classify_by_default.html, we use "network.cookie.cookieBehavior"
to test if a channel is correctly classified.

Cookie restriction is only enabled in nightly and early beta so the
default preference is not always set. Although we set the preference
in the testcase, it is too late because that the channel's cookie
setting might inherit from it's parent and may end up with getting
the old(default) value.

In this patch, we use window.open to test the tracker frame to make
sure we use the udpated prefrence.

Differential Revision: https://phabricator.services.mozilla.com/D25657

--HG--
extra : moz-landing-system : lando
---
 .../url-classifier/tests/mochitest/mochitest.ini   |  1 -
 .../tests/mochitest/test_classify_by_default.html  | 14 ++++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
index 0c07dba7f9cf..b316aea44ff2 100644
--- a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
@@ -41,7 +41,6 @@ skip-if = (os == 'linux' && debug) #Bug 1199778
 [test_classifier_match.html]
 [test_classifier_worker.html]
 [test_classify_by_default.html]
-skip-if = (os == 'android') #Bug 1538662
 [test_classify_ping.html]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [test_classify_track.html]
diff --git a/toolkit/components/url-classifier/tests/mochitest/test_classify_by_default.html b/toolkit/components/url-classifier/tests/mochitest/test_classify_by_default.html
index 1bfd4d1d9245..68d718eb1833 100644
--- a/toolkit/components/url-classifier/tests/mochitest/test_classify_by_default.html
+++ b/toolkit/components/url-classifier/tests/mochitest/test_classify_by_default.html
@@ -14,9 +14,6 @@
 </div>
 <pre id="test">
 
-<iframe id="testFrame1"></iframe>
-<iframe id="testFrame2"></iframe>
-
 <script class="testbody" type="text/javascript">
 
 // To add a request to test, add the request in trackerFrame.html
@@ -44,8 +41,9 @@ function setup() {
   });
 }
 
-function loadTestFrame(withcookie, frameId) {
+function loadTestWindow(withcookie) {
   return new Promise(resolve => {
+    let win;
     let query = withcookie ? "with-cookie" : "without-cookie";
     fetch(trackerFrame + "?callback=" + query, {
       credentials: "include",
@@ -57,12 +55,12 @@ function loadTestFrame(withcookie, frameId) {
             (withcookie ? "with" : "without") + " cookie";
           ok(trackers_found.includes(tracker), description);
         }
+        win.close();
         resolve();
       });
     });
 
-    let frame = document.getElementById(frameId);
-    frame.src = "trackerFrame.html";
+    win = window.open("trackerFrame.html");
   });
 }
 
@@ -77,13 +75,13 @@ async function runTests() {
 
   await setup();
 
-  await loadTestFrame(true, "testFrame1");
+  await loadTestWindow(true);
 
   await SpecialPowers.pushPrefEnv({set: [
     [ "privacy.trackingprotection.annotate_channels", true],
   ]});
 
-  await loadTestFrame(false, "testFrame2");
+  await loadTestWindow(false);
 
   SimpleTest.finish();
 }

From 36a6694a8b60dd2de5bb0efc5d99563c99bbd6ec Mon Sep 17 00:00:00 2001
From: Narcis Beleuzu <nbeleuzu@mozilla.com>
Date: Tue, 2 Apr 2019 11:19:26 +0300
Subject: [PATCH 15/46] Backed out changeset 304b957afe29 (bug 1527620) for
 marionette-media failures on test_youtube.py. CLOSED TREE

---
 dom/media/moz.build                           |   4 -
 dom/media/test/marionette/manifest.ini        |   4 -
 dom/media/test/marionette/test_youtube.py     |  27 -
 .../marionette/yttest/BZP1rYjoBgI.manifest    |  10 -
 dom/media/test/marionette/yttest/__init__.py  |   1 -
 .../test/marionette/yttest/debug_info.js      |  18 -
 dom/media/test/marionette/yttest/download.py  |  17 -
 .../test/marionette/yttest/duration_test.js   |  21 -
 dom/media/test/marionette/yttest/force_hd.js  |  73 --
 dom/media/test/marionette/yttest/playback.py  | 636 ------------------
 dom/media/test/marionette/yttest/record.py    |  34 -
 dom/media/test/marionette/yttest/support.py   |  88 ---
 .../test/marionette/yttest/until_end_test.js  |  18 -
 .../yttest/video_playback_quality.js          |   7 -
 dom/media/test/marionette/yttest/ytpage.py    |  82 ---
 .../mozbuild/mozbuild/action/test_archive.py  |   3 +-
 python/mozbuild/mozbuild/frontend/context.py  |   4 -
 taskcluster/ci/test/marionette.yml            |   9 -
 taskcluster/ci/test/test-platforms.yml        |   4 -
 taskcluster/ci/test/test-sets.yml             |   3 -
 .../marionette_harness/tests/stream-tests.ini |   2 -
 .../mozproxy/mozproxy/backends/mitm.py        |  37 +-
 testing/mozbase/mozproxy/mozproxy/utils.py    |  26 +-
 23 files changed, 23 insertions(+), 1105 deletions(-)
 delete mode 100644 dom/media/test/marionette/manifest.ini
 delete mode 100644 dom/media/test/marionette/test_youtube.py
 delete mode 100644 dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest
 delete mode 100644 dom/media/test/marionette/yttest/__init__.py
 delete mode 100644 dom/media/test/marionette/yttest/debug_info.js
 delete mode 100644 dom/media/test/marionette/yttest/download.py
 delete mode 100644 dom/media/test/marionette/yttest/duration_test.js
 delete mode 100644 dom/media/test/marionette/yttest/force_hd.js
 delete mode 100644 dom/media/test/marionette/yttest/playback.py
 delete mode 100644 dom/media/test/marionette/yttest/record.py
 delete mode 100644 dom/media/test/marionette/yttest/support.py
 delete mode 100644 dom/media/test/marionette/yttest/until_end_test.js
 delete mode 100644 dom/media/test/marionette/yttest/video_playback_quality.js
 delete mode 100644 dom/media/test/marionette/yttest/ytpage.py
 delete mode 100644 testing/marionette/harness/marionette_harness/tests/stream-tests.ini

diff --git a/dom/media/moz.build b/dom/media/moz.build
index 5c076d7a6e02..ed6e8063aef4 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -359,7 +359,3 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     ]
 
 FINAL_LIBRARY = 'xul'
-
-MARIONETTE_DOM_MEDIA_MANIFESTS += [
- 'test/marionette/manifest.ini'
-]
diff --git a/dom/media/test/marionette/manifest.ini b/dom/media/test/marionette/manifest.ini
deleted file mode 100644
index 687a7f50da34..000000000000
--- a/dom/media/test/marionette/manifest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-run-if = buildapp == 'browser'
-
-[test_youtube.py]
diff --git a/dom/media/test/marionette/test_youtube.py b/dom/media/test/marionette/test_youtube.py
deleted file mode 100644
index a90d14e0c725..000000000000
--- a/dom/media/test/marionette/test_youtube.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/.
-import sys
-import os
-
-sys.path.append(os.path.dirname(__file__))
-from yttest.support import VideoStreamTestCase
-
-
-class YoutubeTest(VideoStreamTestCase):
-
-    # bug 1513511
-    def test_stream_30_seconds(self):
-        # XXX use the V9 video we will settle on.
-        with self.youtube_video("BZP1rYjoBgI") as page:
-            res = page.run_test()
-            self.assertLess(res["droppedVideoFrames"], res["totalVideoFrames"] * 0.04)
-            # extracting in/out from the debugInfo
-            video_state = res["debugInfo"][7]
-            video_in = int(video_state.split(" ")[10].split("=")[-1])
-            video_out = int(video_state.split(" ")[11].split("=")[-1])
-            # what's the ratio ? we want 99%+
-            if video_out == video_in:
-                return
-            in_out_ratio = float(video_out) / float(video_in) * 100
-            self.assertMore(in_out_ratio, 99.0)
diff --git a/dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest b/dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest
deleted file mode 100644
index 30ab8e83a3f8..000000000000
--- a/dom/media/test/marionette/yttest/BZP1rYjoBgI.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 20396656,
-    "visibility": "public",
-    "digest": "ccdecb515cadd243608898f38d74c23162fccb9246fee3084834c23d3a57710ed24c7c5dcc9b8bc6f5c3acb5fc0f3be144de08aa14d93e7dbbd372ec6166c138",
-    "algorithm": "sha512",
-    "filename": "BZP1rYjoBgI.tar.gz",
-    "unpack": true
-  }
-]
diff --git a/dom/media/test/marionette/yttest/__init__.py b/dom/media/test/marionette/yttest/__init__.py
deleted file mode 100644
index 792d6005489e..000000000000
--- a/dom/media/test/marionette/yttest/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/dom/media/test/marionette/yttest/debug_info.js b/dom/media/test/marionette/yttest/debug_info.js
deleted file mode 100644
index 2009e3ff4028..000000000000
--- a/dom/media/test/marionette/yttest/debug_info.js
+++ /dev/null
@@ -1,18 +0,0 @@
-video.mozRequestDebugInfo().then(debugInfo => {
-  try {
-    debugInfo = debugInfo.replace(/\t/g, '').split(/\n/g);
-    var JSONDebugInfo = "{";
-      for(let g =0; g<debugInfo.length-1; g++){
-          var pair = debugInfo[g].split(": ");
-          JSONDebugInfo += '"' + pair[0] + '":"' + pair[1] + '",';
-      }
-      JSONDebugInfo = JSONDebugInfo.slice(0,JSONDebugInfo.length-1);
-      JSONDebugInfo += "}";
-      result["debugInfo"] = JSON.parse(JSONDebugInfo);
-  } catch (err) {
-    console.log(`Error '${err.toString()} in JSON.parse(${debugInfo})`);
-    result["debugInfo"] = debugInfo;
-  }
-  result["debugInfo"] = debugInfo;
-  resolve(result);
-});
diff --git a/dom/media/test/marionette/yttest/download.py b/dom/media/test/marionette/yttest/download.py
deleted file mode 100644
index 69b9edaab608..000000000000
--- a/dom/media/test/marionette/yttest/download.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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/.
-import sys
-from pytube import YouTube
-
-
-def download_streams(video_id, output_path="data"):
-    yt = YouTube("https://youtube.com/watch?v=%s" % video_id)
-    for stream in yt.streams.all():
-        fn = "%s-%s-%s.%s" % (video_id, stream.itag, stream.type, stream.subtype)
-        stream.download(output_path="data", filename=fn)
-        print("%s downloaded" % fn)
-
-
-if __name__ == "__main__":
-    download_streams(sys.argv[-1])
diff --git a/dom/media/test/marionette/yttest/duration_test.js b/dom/media/test/marionette/yttest/duration_test.js
deleted file mode 100644
index 881847148aa3..000000000000
--- a/dom/media/test/marionette/yttest/duration_test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-%(force_hd)s
-
-const resolve = arguments[arguments.length - 1];
-
-// this script is injected by marionette to collect metrics
-var video = document.getElementsByTagName("video")[0];
-if (!video) {
-  return "Can't find the video tag";
-}
-
-video.addEventListener("timeupdate", () => {
-    if (video.currentTime >= %(duration)s) {
-      video.pause();
-      %(video_playback_quality)s
-      %(debug_info)s
-    }
-  }
-);
-
-video.play();
-
diff --git a/dom/media/test/marionette/yttest/force_hd.js b/dom/media/test/marionette/yttest/force_hd.js
deleted file mode 100644
index ab3d2b54db48..000000000000
--- a/dom/media/test/marionette/yttest/force_hd.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// This parts forces the highest definition
-// https://addons.mozilla.org/en-US/firefox/addon/youtube-auto-hd-lq/
-// licence: MPL 2.0
-var config = {
-  "HD": true,
-  "LQ": false,
-  "ID": "auto-hd-lq-for-ytb",
-  "type": function (t) {
-    config.HD = t === 'hd';
-    config.LQ = t === 'lq';
-  },
-  "quality": function () {
-    if (config.HD || config.LQ) {
-      var youtubePlayerListener = function (LQ, HD) {
-        return function youtubePlayerListener (e) {
-          if (e === 1) {
-            var player = document.getElementById('movie_player');
-            if (player) {
-              var levels = player.getAvailableQualityLevels();
-              if (levels.length) {
-                var q = (HD && levels[0]) ? levels[0] : ((LQ && levels[levels.length - 2]) ? levels[levels.length - 2] : null);
-                if (q) {
-                  player.setPlaybackQuality(q);
-                  player.setPlaybackQualityRange(q, q);
-                }
-              }
-            }
-          }
-        }
-      }
-      /*  */
-      var inject = function () {
-        var action = function () {
-          var player = document.getElementById('movie_player');
-          if (player && player.addEventListener && player.getPlayerState) {
-            player.addEventListener("onStateChange", "youtubePlayerListener");
-          } else window.setTimeout(action, 1000);
-        };
-        /*  */
-        action();
-      };
-      var script = document.getElementById(config.ID);
-      if (!script) {
-        script = document.createElement("script");
-        script.setAttribute("type", "text/javascript");
-        script.setAttribute("id", config.ID);
-        document.documentElement.appendChild(script);
-      }
-      /*  */
-      script.textContent = "var youtubePlayerListener = (" + youtubePlayerListener + ')(' + config.LQ + ',' + config.HD  + ');(' + inject + ')();';
-    }
-  }
-};
-
-  if (/^https?:\/\/www\.youtube.com\/watch\?/.test(document.location.href)) config.quality();
-  var content = document.getElementById('content');
-  if (content) {
-    var observer = new window.MutationObserver(function (e) {
-      e.forEach(function (m) {
-        if (m.addedNodes !== null) {
-          for (var i = 0; i < m.addedNodes.length; i++) {
-            if (m.addedNodes[i].id === 'movie_player') {
-              config.quality();
-              return;
-            }
-          }
-        }
-      });
-    });
-    /*  */
-    observer.observe(content, {"childList": true, "subtree": true});
-  }
-
diff --git a/dom/media/test/marionette/yttest/playback.py b/dom/media/test/marionette/yttest/playback.py
deleted file mode 100644
index ffdba72c1d27..000000000000
--- a/dom/media/test/marionette/yttest/playback.py
+++ /dev/null
@@ -1,636 +0,0 @@
-# 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/.
-"""
-MITM Script used to play back media files when a YT video is played.
-
-This is a self-contained script that should not import anything else
-except modules from the standard library and mitmproxy modules.
-"""
-import os
-import sys
-import datetime
-import time
-
-
-itags = {
-    "5": {
-        "Extension": "flv",
-        "Resolution": "240p",
-        "VideoEncoding": "Sorenson H.283",
-        "AudioEncoding": "mp3",
-        "Itag": 5,
-        "AudioBitrate": 64,
-    },
-    "6": {
-        "Extension": "flv",
-        "Resolution": "270p",
-        "VideoEncoding": "Sorenson H.263",
-        "AudioEncoding": "mp3",
-        "Itag": 6,
-        "AudioBitrate": 64,
-    },
-    "13": {
-        "Extension": "3gp",
-        "Resolution": "",
-        "VideoEncoding": "MPEG-4 Visual",
-        "AudioEncoding": "aac",
-        "Itag": 13,
-        "AudioBitrate": 0,
-    },
-    "17": {
-        "Extension": "3gp",
-        "Resolution": "144p",
-        "VideoEncoding": "MPEG-4 Visual",
-        "AudioEncoding": "aac",
-        "Itag": 17,
-        "AudioBitrate": 24,
-    },
-    "18": {
-        "Extension": "mp4",
-        "Resolution": "360p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 18,
-        "AudioBitrate": 96,
-    },
-    "22": {
-        "Extension": "mp4",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 22,
-        "AudioBitrate": 192,
-    },
-    "34": {
-        "Extension": "flv",
-        "Resolution": "480p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 34,
-        "AudioBitrate": 128,
-    },
-    "35": {
-        "Extension": "flv",
-        "Resolution": "360p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 35,
-        "AudioBitrate": 128,
-    },
-    "36": {
-        "Extension": "3gp",
-        "Resolution": "240p",
-        "VideoEncoding": "MPEG-4 Visual",
-        "AudioEncoding": "aac",
-        "Itag": 36,
-        "AudioBitrate": 36,
-    },
-    "37": {
-        "Extension": "mp4",
-        "Resolution": "1080p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 37,
-        "AudioBitrate": 192,
-    },
-    "38": {
-        "Extension": "mp4",
-        "Resolution": "3072p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 38,
-        "AudioBitrate": 192,
-    },
-    "43": {
-        "Extension": "webm",
-        "Resolution": "360p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 43,
-        "AudioBitrate": 128,
-    },
-    "44": {
-        "Extension": "webm",
-        "Resolution": "480p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 44,
-        "AudioBitrate": 128,
-    },
-    "45": {
-        "Extension": "webm",
-        "Resolution": "720p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 45,
-        "AudioBitrate": 192,
-    },
-    "46": {
-        "Extension": "webm",
-        "Resolution": "1080p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 46,
-        "AudioBitrate": 192,
-    },
-    "82": {
-        "Extension": "mp4",
-        "Resolution": "360p",
-        "VideoEncoding": "H.264",
-        "Itag": 82,
-        "AudioBitrate": 96,
-    },
-    "83": {
-        "Extension": "mp4",
-        "Resolution": "240p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 83,
-        "AudioBitrate": 96,
-    },
-    "84": {
-        "Extension": "mp4",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 84,
-        "AudioBitrate": 192,
-    },
-    "85": {
-        "Extension": "mp4",
-        "Resolution": "1080p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 85,
-        "AudioBitrate": 192,
-    },
-    "100": {
-        "Extension": "webm",
-        "Resolution": "360p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 100,
-        "AudioBitrate": 128,
-    },
-    "101": {
-        "Extension": "webm",
-        "Resolution": "360p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 101,
-        "AudioBitrate": 192,
-    },
-    "102": {
-        "Extension": "webm",
-        "Resolution": "720p",
-        "VideoEncoding": "VP8",
-        "AudioEncoding": "vorbis",
-        "Itag": 102,
-        "AudioBitrate": 192,
-    },
-    "133": {
-        "Extension": "mp4",
-        "Resolution": "240p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 133,
-        "AudioBitrate": 0,
-    },
-    "134": {
-        "Extension": "mp4",
-        "Resolution": "360p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 134,
-        "AudioBitrate": 0,
-    },
-    "135": {
-        "Extension": "mp4",
-        "Resolution": "480p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 135,
-        "AudioBitrate": 0,
-    },
-    "136": {
-        "Extension": "mp4",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 136,
-        "AudioBitrate": 0,
-    },
-    "137": {
-        "Extension": "mp4",
-        "Resolution": "1080p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 137,
-        "AudioBitrate": 0,
-    },
-    "138": {
-        "Extension": "mp4",
-        "Resolution": "2160p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 138,
-        "AudioBitrate": 0,
-    },
-    "160": {
-        "Extension": "mp4",
-        "Resolution": "144p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 160,
-        "AudioBitrate": 0,
-    },
-    "242": {
-        "Extension": "webm",
-        "Resolution": "240p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 242,
-        "AudioBitrate": 0,
-    },
-    "243": {
-        "Extension": "webm",
-        "Resolution": "360p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 243,
-        "AudioBitrate": 0,
-    },
-    "244": {
-        "Extension": "webm",
-        "Resolution": "480p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 244,
-        "AudioBitrate": 0,
-    },
-    "247": {
-        "Extension": "webm",
-        "Resolution": "720p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 247,
-        "AudioBitrate": 0,
-    },
-    "248": {
-        "Extension": "webm",
-        "Resolution": "1080p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 248,
-        "AudioBitrate": 9,
-    },
-    "264": {
-        "Extension": "mp4",
-        "Resolution": "1440p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 264,
-        "AudioBitrate": 0,
-    },
-    "266": {
-        "Extension": "mp4",
-        "Resolution": "2160p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 266,
-        "AudioBitrate": 0,
-    },
-    "271": {
-        "Extension": "webm",
-        "Resolution": "1440p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 271,
-        "AudioBitrate": 0,
-    },
-    "272": {
-        "Extension": "webm",
-        "Resolution": "2160p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 272,
-        "AudioBitrate": 0,
-    },
-    "278": {
-        "Extension": "webm",
-        "Resolution": "144p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 278,
-        "AudioBitrate": 0,
-    },
-    "298": {
-        "Extension": "mp4",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 298,
-        "AudioBitrate": 0,
-    },
-    "299": {
-        "Extension": "mp4",
-        "Resolution": "1080p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "",
-        "Itag": 299,
-        "AudioBitrate": 0,
-    },
-    "302": {
-        "Extension": "webm",
-        "Resolution": "720p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 302,
-        "AudioBitrate": 0,
-    },
-    "303": {
-        "Extension": "webm",
-        "Resolution": "1080p",
-        "VideoEncoding": "VP9",
-        "AudioEncoding": "",
-        "Itag": 303,
-        "AudioBitrate": 0,
-    },
-    "139": {
-        "Extension": "mp4",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "aac",
-        "Itag": 139,
-        "AudioBitrate": 48,
-    },
-    "140": {
-        "Extension": "mp4",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "aac",
-        "Itag": 140,
-        "AudioBitrate": 128,
-    },
-    "141": {
-        "Extension": "mp4",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "aac",
-        "Itag": 141,
-        "AudioBitrate": 256,
-    },
-    "171": {
-        "Extension": "webm",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "vorbis",
-        "Itag": 171,
-        "AudioBitrate": 128,
-    },
-    "172": {
-        "Extension": "webm",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "vorbis",
-        "Itag": 172,
-        "AudioBitrate": 192,
-    },
-    "249": {
-        "Extension": "webm",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "opus",
-        "Itag": 249,
-        "AudioBitrate": 50,
-    },
-    "250": {
-        "Extension": "webm",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "opus",
-        "Itag": 250,
-        "AudioBitrate": 70,
-    },
-    "251": {
-        "Extension": "webm",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "opus",
-        "Itag": 251,
-        "AudioBitrate": 160,
-    },
-    "92": {
-        "Extension": "ts",
-        "Resolution": "240p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 92,
-        "AudioBitrate": 48,
-    },
-    "93": {
-        "Extension": "ts",
-        "Resolution": "480p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 93,
-        "AudioBitrate": 128,
-    },
-    "94": {
-        "Extension": "ts",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 94,
-        "AudioBitrate": 128,
-    },
-    "95": {
-        "Extension": "ts",
-        "Resolution": "1080p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 95,
-        "AudioBitrate": 256,
-    },
-    "96": {
-        "Extension": "ts",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 96,
-        "AudioBitrate": 256,
-    },
-    "120": {
-        "Extension": "flv",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 120,
-        "AudioBitrate": 128,
-    },
-    "127": {
-        "Extension": "ts",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "aac",
-        "Itag": 127,
-        "AudioBitrate": 96,
-    },
-    "128": {
-        "Extension": "ts",
-        "Resolution": "",
-        "VideoEncoding": "",
-        "AudioEncoding": "aac",
-        "Itag": 128,
-        "AudioBitrate": 96,
-    },
-    "132": {
-        "Extension": "ts",
-        "Resolution": "240p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 132,
-        "AudioBitrate": 48,
-    },
-    "151": {
-        "Extension": "ts",
-        "Resolution": "720p",
-        "VideoEncoding": "H.264",
-        "AudioEncoding": "aac",
-        "Itag": 151,
-        "AudioBitrate": 24,
-    },
-}
-
-
-def repr_itag(itag):
-    itag_info = ["  %s: %s" % (k, v) for k, v in get_itag_info(itag).items()]
-    return "\n".join(itag_info)
-
-
-def get_itag_info(itag):
-    return itags[itag]
-
-
-def log(msg):
-    print(msg)
-
-
-_HERE = os.path.dirname(__file__)
-if "MOZPROXY_DIR" in os.environ:
-    _DEFAULT_DATA_DIR = os.environ["MOZPROXY_DIR"]
-else:
-    _DEFAULT_DATA_DIR = os.path.join(_HERE, "..", "data")
-
-_HEADERS = {
-    b"Last-Modified": b"Mon, 10 Dec 2018 19:39:24 GMT",
-    b"Content-Type": b"video/webm",
-    b"Date": b"Wed, 02 Jan 2019 15:14:06 GMT",
-    b"Expires": b"Wed, 02 Jan 2019 15:14:06 GMT",
-    b"Cache-Control": b"private, max-age=21292",
-    b"Accept-Ranges": b"bytes",
-    b"Content-Length": b"173448",
-    b"Connection": b"keep-alive",
-    b"Alt-Svc": b'quic=":443"; ma=2592000; v="44,43,39,35"',
-    b"Access-Control-Allow-Origin": b"https://www.youtube.com",
-    b"Access-Control-Allow-Credentials": b"true",
-    b"Timing-Allow-Origin": b"https://www.youtube.com",
-    b"Access-Control-Expose-Headers": (
-        b"Client-Protocol, Content-Length, "
-        b"Content-Type, X-Bandwidth-Est, "
-        b"X-Bandwidth-Est2, X-Bandwidth-Est3, "
-        b"X-Bandwidth-App-Limited, "
-        b"X-Bandwidth-Est-App-Limited, "
-        b"X-Bandwidth-Est-Comp, X-Bandwidth-Avg, "
-        b"X-Head-Time-Millis, X-Head-Time-Sec, "
-        b"X-Head-Seqnum, X-Response-Itag, "
-        b"X-Restrict-Formats-Hint, "
-        b"X-Sequence-Num, X-Segment-Lmt, "
-        b"X-Walltime-Ms"
-    ),
-    b"X-Restrict-Formats-Hint": b"None",
-    b"X-Content-Type-Options": b"nosniff",
-    b"Server": b"gvs 1.0",
-}
-
-
-def get_cached_data(request, datadir=_DEFAULT_DATA_DIR):
-    query_args = dict(request.query)
-    mime = query_args["mime"]
-    file_id = query_args["id"]
-    file_range = query_args["range"]
-    itag = query_args["itag"]
-    log("Request File %s - %s" % (file_id, mime))
-    log("Requested range %s" % file_range)
-    log("Requested quality\n%s" % repr_itag(itag))
-    frange = file_range.split("-")
-    range_start, range_end = int(frange[0]), int(frange[1])
-    video_id = sys.argv[-1].split(".")[0]
-    fn = "%s-%s-%s.%s" % (video_id, itag, mime.replace("/", ""), mime.split("/")[-1])
-    fn = os.path.join(datadir, fn)
-    if not os.path.exists(fn):
-        raise Exception("no file at %s" % fn)
-    with open(fn, "rb") as f:
-        data = f.read()
-    data = data[range_start : range_end + 1]        # noqa: E203
-    headers = dict(_HEADERS)
-    headers[b"Content-Type"] = bytes(mime, "utf8")
-    headers[b"Content-Length"] = bytes(str(len(data)), "utf8")
-    return headers.items(), data
-
-
-def OK(flow, code=204):
-    """ Sending back a dummy response.
-
-    204 is the default in most cases on YT requests.
-    """
-    from mitmproxy import http
-
-    flow.error = None
-    flow.response = http.HTTPResponse(b"HTTP/1.1", code, b"OK", {}, b"")
-
-
-def request(flow):
-    # All requests made for stats purposes can be discarded and
-    # a 204 sent back to the client.
-    if flow.request.url.startswith("https://www.youtube.com/ptracking"):
-        OK(flow)
-        return
-    if flow.request.url.startswith("https://www.youtube.com/api/stats/playback"):
-        OK(flow)
-        return
-    if flow.request.url.startswith("https://www.youtube.com/api/stats/watchtime"):
-        OK(flow)
-        return
-    # disable a few trackers, sniffers, etc
-    if "push.services.mozilla.com" in flow.request.url:
-        OK(flow, code=200)
-        return
-    if "gen_204" in flow.request.url:
-        OK(flow)
-        return
-
-    # we don't want to post back any data, discarding.
-    if flow.request.method == "POST":
-        OK(flow)
-        return
-    if "googlevideo.com/videoplayback" in flow.request.url:
-        from mitmproxy import http
-
-        query_args = dict(flow.request.query)
-        file_id = query_args["id"]
-        file_range = query_args["range"]
-        headers, data = get_cached_data(flow.request)
-        headers = list(headers)
-        flow.error = None
-        flow.response = http.HTTPResponse(b"HTTP/1.1", 200, b"OK", headers, data)
-        now = datetime.datetime.now()
-        then = now - datetime.timedelta(hours=1)
-        flow.response.timestamp_start = time.mktime(then.timetuple())
-        flow.response.refresh()
-        log("SENT FILE %s IN CACHE - range %s" % (file_id, file_range))
-
-
-def error(flow):
-    print("\n\n\n\nERROR %s\n\n\n\n" % flow.error.msg)
diff --git a/dom/media/test/marionette/yttest/record.py b/dom/media/test/marionette/yttest/record.py
deleted file mode 100644
index b0bde6f01efa..000000000000
--- a/dom/media/test/marionette/yttest/record.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-MITM Script used to collect media files when a YT video is played.
-
-This is a self-contained script that should not import anything else
-except modules from the standard library and mitmproxy modules.
-"""
-import os
-
-
-_HERE = os.path.dirname(__file__)
-if "MOZPROXY_DIR" in os.environ:
-    _DEFAULT_DATA_DIR = os.environ["MOZPROXY_DIR"]
-else:
-    _DEFAULT_DATA_DIR = os.path.join(_HERE, "..", "data")
-
-
-def response(flow):
-    print(flow.request.url)
-    if "googlevideo.com/videoplayback" in flow.request.url:
-        itag = flow.request.query["itag"]
-        mime = flow.request.query["mime"].replace("/", "-")
-        query_args = dict(flow.request.query)
-        file_id = query_args["id"]
-        file_range = query_args["range"]
-        print("Writing %s:%s" % (file_id, file_range))
-        # changing the host so the MITM recording file
-        # does not rely on a specific YT server
-        flow.request.host = "googlevideo.com"
-        if len(flow.response.content) == 0:
-            return
-        path = "%s-%s-%s.%s" % (file_id, itag, file_range, mime)
-        path = os.path.join(_DEFAULT_DATA_DIR, path)
-        with open(path, "wb") as f:
-            f.write(flow.response.content)
diff --git a/dom/media/test/marionette/yttest/support.py b/dom/media/test/marionette/yttest/support.py
deleted file mode 100644
index 3a7dd90de512..000000000000
--- a/dom/media/test/marionette/yttest/support.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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/.
-import sys
-import os
-from contextlib import contextmanager
-
-from mozproxy import get_playback
-import mozinfo
-import mozlog
-from marionette_harness.marionette_test import MarionetteTestCase
-from yttest.ytpage import using_page
-
-
-mozlog.commandline.setup_logging("mozproxy", {}, {"tbpl": sys.stdout})
-here = os.path.dirname(__file__)
-playback_script = os.path.join(here, "playback.py")
-
-
-class VideoStreamTestCase(MarionetteTestCase):
-    def setUp(self):
-        MarionetteTestCase.setUp(self)
-        if "MOZ_UPLOAD_DIR" not in os.environ:
-            os.environ["OBJ_PATH"] = "/tmp/"
-        self.marionette.set_pref("media.autoplay.default", 1)
-
-    @contextmanager
-    def using_proxy(self, video_id):
-        config = {}
-        config["binary"] = self.marionette.bin
-        config["app"] = "firefox"
-        config["platform"] = mozinfo.os
-        config["processor"] = mozinfo.processor
-        config["run_local"] = "MOZ_UPLOAD_DIR" not in os.environ
-
-        if "MOZ_UPLOAD_DIR" not in os.environ:
-            config["obj_path"] = os.environ["OBJ_PATH"]
-            playback_dir = os.path.join(config["obj_path"], "testing", "mozproxy")
-        else:
-            root_dir = os.path.dirname(os.path.dirname(os.environ["MOZ_UPLOAD_DIR"]))
-            playback_dir = os.path.join(root_dir, "testing", "mozproxy")
-
-        config["host"] = "localhost"
-        config["playback_tool"] = "mitmproxy"
-        config["playback_artifacts"] = os.path.join(here, "%s.manifest" % video_id)
-
-        # XXX once Bug 1540622 lands, we can use the version here
-        # config["playback_version"] = "4.0.4"
-        # and have playback_binary_manifest default to
-        # mitmproxy-rel-bin-{playback_version}-{platform}.manifest
-        # so we don't have to ask amozproxy tool user to provide this:
-        config[
-            "playback_binary_manifest"
-        ] = "mitmproxy-rel-bin-4.0.4-{platform}.manifest"
-
-        playback_file = os.path.join(playback_dir, "%s.playback" % video_id)
-
-        config["playback_tool_args"] = [
-            "--ssl-insecure",
-            "--server-replay-nopop",
-            "--set",
-            "upstream_cert=false",
-            "-S",
-            playback_file,
-            "-s",
-            playback_script,
-            video_id,
-        ]
-
-        proxy = get_playback(config)
-        if proxy is None:
-            raise Exception("Could not start Proxy")
-        proxy.start()
-        try:
-            yield proxy
-        finally:
-            proxy.stop()
-
-    @contextmanager
-    def youtube_video(self, video_id, **options):
-        proxy = options.get("proxy", True)
-        if proxy:
-            with self.using_proxy(video_id):
-                with using_page(video_id, self.marionette, **options) as page:
-                    yield page
-        else:
-            with using_page(video_id, self.marionette, **options) as page:
-                yield page
diff --git a/dom/media/test/marionette/yttest/until_end_test.js b/dom/media/test/marionette/yttest/until_end_test.js
deleted file mode 100644
index 61f56c94c797..000000000000
--- a/dom/media/test/marionette/yttest/until_end_test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-%(force_hd)s
-
-const resolve = arguments[arguments.length - 1];
-
-// this script is injected by marionette to collect metrics
-var video = document.getElementsByTagName("video")[0];
-if (!video) {
-  return "Can't find the video tag";
-}
-
-video.addEventListener("ended", () => {
-    video.pause();
-    %(video_playback_quality)s
-    %(debug_info)s
-  }, {once: true}
-);
-
-video.play();
diff --git a/dom/media/test/marionette/yttest/video_playback_quality.js b/dom/media/test/marionette/yttest/video_playback_quality.js
deleted file mode 100644
index fd02a776134e..000000000000
--- a/dom/media/test/marionette/yttest/video_playback_quality.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var vpq = video.getVideoPlaybackQuality();
-var result = {"currentTime": video.currentTime};
-result["creationTime"] = vpq.creationTime;
-result["corruptedVideoFrames"] = vpq.corruptedVideoFrames;
-result["droppedVideoFrames"] = vpq.droppedVideoFrames;
-result["totalVideoFrames"] = vpq.totalVideoFrames;
-result["defaultPlaybackRate"] = video.playbackRate;
diff --git a/dom/media/test/marionette/yttest/ytpage.py b/dom/media/test/marionette/yttest/ytpage.py
deleted file mode 100644
index bb9282047fd2..000000000000
--- a/dom/media/test/marionette/yttest/ytpage.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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/.
-"""
-Drives the browser during the playback test.
-"""
-import contextlib
-import os
-
-
-here = os.path.dirname(__file__)
-js = os.path.join(here, "until_end_test.js")
-with open(js) as f:
-    UNTIL_END_TEST = f.read()
-
-js = os.path.join(here, "duration_test.js")
-with open(js) as f:
-    DURATION_TEST = f.read()
-
-JS_MACROS = {"video_playback_quality": "", "debug_info": "", "force_hd": ""}
-for script in JS_MACROS:
-    js = os.path.join(here, "%s.js" % script)
-    with open(js) as f:
-        JS_MACROS[script] = f.read()
-
-
-class YoutubePage:
-    def __init__(self, video_id, marionette, **options):
-        self.video_id = video_id
-        self.marionette = marionette
-        self.url = "https://www.youtube.com/watch?v=%s" % self.video_id
-        self.started = False
-        self.capabilities = {
-            # We're not using upstream cert sniffing, let's make sure
-            # the browser accepts mitmproxy ones for all requests
-            # even if they are incorrect.
-            "acceptInsecureCerts": True
-        }
-        self.options = options
-        if options.get("proxy", True):
-            self.capabilities["proxy"] = {
-                "proxyType": "manual",
-                "httpProxy": "localhost:8080",
-                "sslProxy": "localhost:8080",
-                "noProxy": ["localhost"],
-            }
-
-    def start_video(self):
-        self.marionette.start_session(self.capabilities)
-        self.marionette.timeout.script = 600
-        self.marionette.navigate(self.url)
-        self.started = True
-
-    def run_test(self):
-        self.start_video()
-        options = dict(JS_MACROS)
-        options.update(self.options)
-        if "duration" in options:
-            script = DURATION_TEST % options
-        else:
-            script = UNTIL_END_TEST % options
-        self.marionette.set_pref("media.autoplay.default", 0)
-        return self.execute_async_script(script)
-
-    def execute_async_script(self, script, context=None):
-        if context is None:
-            context = self.marionette.CONTEXT_CONTENT
-        with self.marionette.using_context(context):
-            return self.marionette.execute_async_script(script, sandbox="system")
-
-    def close(self):
-        if self.started:
-            self.marionette.delete_session()
-
-
-@contextlib.contextmanager
-def using_page(video_id, marionette, **options):
-    page = YoutubePage(video_id, marionette, **options)
-    try:
-        yield page
-    finally:
-        page.close()
diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
index 4c098737b392..ffb3edfc5d46 100644
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -138,9 +138,8 @@ ARCHIVE_FILES = {
             'source': buildconfig.topsrcdir,
             'base': '',
             'manifests': [
-                'dom/media/test/marionette/manifest.ini',
                 'testing/marionette/harness/marionette_harness/tests/unit-tests.ini',
-                'gfx/tests/marionette/manifest.ini'
+                'gfx/tests/marionette/manifest.ini',
             ],
             # We also need the manifests and harness_unit tests
             'pattern': 'testing/marionette/harness/marionette_harness/tests/**',
diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index a557219290f0..f6cbcb0764e7 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1872,10 +1872,6 @@ VARIABLES = {
         """List of manifest files defining mochitest chrome tests.
         """),
 
-    'MARIONETTE_DOM_MEDIA_MANIFESTS': (ManifestparserManifestList, list,
-        """List of manifest files defining marionette-media tests.
-        """),
-
     'MOCHITEST_MANIFESTS': (ManifestparserManifestList, list,
         """List of manifest files defining mochitest tests.
         """),
diff --git a/taskcluster/ci/test/marionette.yml b/taskcluster/ci/test/marionette.yml
index f977453bdb01..e0532e56d070 100644
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -47,12 +47,3 @@ marionette-gpu:
         by-test-platform:
             windows10-64.*: virtual-with-gpu
             default: virtual
-
-marionette-media:
-    description: "Marionette DOM media test run"
-    treeherder-symbol: MnM
-    max-run-time: 5400
-    instance-size: default
-    mozharness:
-        extra-options:
-            - --test-manifest=stream-tests.ini
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 798a8a226966..625622914d62 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -36,7 +36,6 @@ linux64/debug:
         - common-tests
         - web-platform-tests
         - mochitest-headless
-        - marionette-media-tests
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
@@ -136,7 +135,6 @@ windows7-32/debug:
         - windows-reftest-gpu
         - windows-tests
         - web-platform-tests
-        - marionette-media-tests
 
 windows7-32/opt:
     build-platform: win32/opt
@@ -189,7 +187,6 @@ windows10-64/debug:
         - windows-tests
         - web-platform-tests
         - mochitest-headless
-        - marionette-media-tests
 
 windows10-64/opt:
     build-platform: win64/opt
@@ -281,7 +278,6 @@ macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - macosx64-tests
-        - marionette-media-tests
 
 macosx64-shippable/opt:
     build-platform: macosx64-shippable/opt
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 3d881eb17441..2bde8be3ba47 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -274,9 +274,6 @@ windows-talos:
 marionette-gpu-tests:
     - marionette-gpu
 
-marionette-media-tests:
-    - marionette-media
-
 macosx64-tests:
     - cppunit
     - crashtest
diff --git a/testing/marionette/harness/marionette_harness/tests/stream-tests.ini b/testing/marionette/harness/marionette_harness/tests/stream-tests.ini
deleted file mode 100644
index 1e099c9fd9c4..000000000000
--- a/testing/marionette/harness/marionette_harness/tests/stream-tests.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-# stream tests
-[include:../../../../../dom/media/test/marionette/manifest.ini]
diff --git a/testing/mozbase/mozproxy/mozproxy/backends/mitm.py b/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
index a1539b250eee..c8e9ddcb2995 100644
--- a/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
+++ b/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
@@ -79,8 +79,7 @@ class Mitmproxy(Playback):
         self.browser_path = config.get("binary")
         self.policies_dir = None
         self.ignore_mitmdump_exit_failure = config.get(
-            "ignore_mitmdump_exit_failure", False
-        )
+                "ignore_mitmdump_exit_failure", False)
 
         # mozproxy_dir is where we will download all mitmproxy required files
         # when running locally it comes from obj_path via mozharness/mach
@@ -150,13 +149,8 @@ class Mitmproxy(Playback):
                 if not artifact:
                     continue
                 artifact_name = artifact.split("/")[-1]
-                if artifact_name.endswith(".manifest"):
-                    tooltool_download(
-                        artifact, self.config["run_local"], self.mozproxy_dir
-                    )
-                else:
-                    dest = os.path.join(self.mozproxy_dir, artifact_name)
-                    download_file_from_url(artifact, dest, extract=True)
+                dest = os.path.join(self.mozproxy_dir, artifact_name)
+                download_file_from_url(artifact, dest, extract=True)
 
     def stop(self):
         self.stop_mitmproxy_playback()
@@ -180,9 +174,10 @@ class Mitmproxy(Playback):
         LOG.info("Starting mitmproxy playback using command: %s" % " ".join(command))
         # to turn off mitmproxy log output, use these params for Popen:
         # Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
-        self.mitmproxy_proc = ProcessHandler(
-            command, logfile=os.path.join(self.upload_dir, "mitmproxy.log"), env=env
-        )
+        self.mitmproxy_proc = ProcessHandler(command,
+                                             logfile=os.path.join(self.upload_dir,
+                                                                  "mitmproxy.log"),
+                                             env=env)
         self.mitmproxy_proc.run()
         end_time = time.time() + MITMDUMP_COMMAND_TIMEOUT
         ready = False
@@ -353,7 +348,7 @@ class MitmproxyAndroid(Mitmproxy):
     @property
     def certutil_sleep_seconds(self):
         """Time to sleep, in seconds, after issuing a `certutil` command."""
-        return 10 if not self.config["run_local"] else 1
+        return 10 if not self.config['run_local'] else 1
 
     def setup(self):
         """For geckoview we need to install the generated mitmproxy CA cert"""
@@ -377,18 +372,14 @@ class MitmproxyAndroid(Mitmproxy):
         2. Import the mitmproxy certificate into the database, i.e.:
            `certutil -A -d sql:<path to profile> -n "some nickname" -t TC,, -a -i <path to CA.pem>`
         """
-        if self.config["run_local"]:
+        if self.config['run_local']:
             # when running locally, it is found in the Firefox desktop build (..obj../dist/bin)
-            self.certutil = os.path.join(os.environ["MOZ_HOST_BIN"], "certutil")
-            if not (
-                os.path.isfile(self.certutil) and os.access(self.certutil, os.X_OK)
-            ):
-                LOG.critical(
-                    "Abort: unable to execute certutil: {}".format(self.certutil)
-                )
+            self.certutil = os.path.join(os.environ['MOZ_HOST_BIN'], 'certutil')
+            if not (os.path.isfile(self.certutil) and os.access(self.certutil, os.X_OK)):
+                LOG.critical("Abort: unable to execute certutil: {}".format(self.certutil))
                 raise
-            self.certutil = os.environ["MOZ_HOST_BIN"]
-            os.environ["LD_LIBRARY_PATH"] = self.certutil
+            self.certutil = os.environ['MOZ_HOST_BIN']
+            os.environ['LD_LIBRARY_PATH'] = self.certutil
         else:
             # must download certutil inside hostutils via tooltool; use this manifest:
             # mozilla-central/testing/config/tooltool-manifests/linux64/hostutils.manifest
diff --git a/testing/mozbase/mozproxy/mozproxy/utils.py b/testing/mozbase/mozproxy/mozproxy/utils.py
index 282809632b6c..96829995c739 100644
--- a/testing/mozbase/mozproxy/mozproxy/utils.py
+++ b/testing/mozbase/mozproxy/mozproxy/utils.py
@@ -30,15 +30,10 @@ from mozproxy import mozharness_dir
 
 LOG = get_proxy_logger(component="mozproxy")
 
-if "MOZ_UPLOAD_DIR" in os.environ:
-    TOOLTOOL_PATH = os.path.join(
-        os.environ["MOZ_UPLOAD_DIR"],
-        "..",
-        "..",
-        "mozharness",
-        "external_tools",
-        "tooltool.py",
-    )
+external_tools_path = os.environ.get("EXTERNALTOOLSPATH", None)
+if external_tools_path is not None:
+    # running in production via mozharness
+    TOOLTOOL_PATH = os.path.join(external_tools_path, "tooltool.py")
 else:
     # running locally via mach
     TOOLTOOL_PATH = os.path.join(mozharness_dir, "external_tools", "tooltool.py")
@@ -85,15 +80,10 @@ def tooltool_download(manifest, run_local, raptor_dir):
         #  - TOOLTOOLCACHE is used by Raptor tests
         #  - TOOLTOOL_CACHE is automatically set for taskcluster jobs
         #  - fallback to a hardcoded path
-        _cache = next(
-            x
-            for x in (
-                os.environ.get("TOOLTOOLCACHE"),
-                os.environ.get("TOOLTOOL_CACHE"),
-                "/builds/tooltool_cache",
-            )
-            if x is not None
-        )
+        _cache = next(x for x in (
+                    os.environ.get("TOOLTOOLCACHE"),
+                    os.environ.get("TOOLTOOL_CACHE"),
+                    "/builds/tooltool_cache") if x is not None)
 
         command = [
             sys.executable,

From a13bbbbdf7f8e4c36bedcc6d764d7cce74801887 Mon Sep 17 00:00:00 2001
From: Petr Sumbera <petr.sumbera@oracle.com>
Date: Tue, 2 Apr 2019 00:57:29 +0000
Subject: [PATCH 16/46] Bug 1432125 - Solaris xptcall clean-up - support 64bits
 gcc/clang only r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D25448

--HG--
extra : moz-landing-system : lando
---
 xpcom/reflect/xptcall/md/unix/moz.build       |  68 +-------
 .../unix/xptcinvoke_asm_sparc_solaris_GCC3.s  |  52 ------
 .../unix/xptcinvoke_asm_sparc_solaris_SUNW.s  |  56 -------
 .../xptcinvoke_asm_sparcv9_solaris_SUNW.s     |  85 ----------
 .../md/unix/xptcinvoke_asm_x86_solaris_SUNW.s |  55 -------
 .../md/unix/xptcinvoke_sparc64_openbsd.cpp    |   4 +-
 .../md/unix/xptcinvoke_sparcv9_solaris.cpp    |  73 ---------
 .../md/unix/xptcinvoke_x86_64_solaris.cpp     | 149 ------------------
 .../md/unix/xptcinvoke_x86_solaris.cpp        |  70 --------
 .../md/unix/xptcstubs_asm_sparcv9_solaris.s   |  50 ------
 .../unix/xptcstubs_asm_x86_64_solaris_SUNW.s  |  63 --------
 .../md/unix/xptcstubs_asm_x86_solaris_SUNW.s  |  78 ---------
 .../md/unix/xptcstubs_sparcv9_solaris.cpp     | 105 ------------
 .../md/unix/xptcstubs_x86_64_solaris.cpp      | 147 -----------------
 .../xptcall/md/unix/xptcstubs_x86_solaris.cpp |  82 ----------
 15 files changed, 4 insertions(+), 1133 deletions(-)
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_sparcv9_solaris.cpp
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_solaris.cpp
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_solaris.cpp
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparcv9_solaris.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_sparcv9_solaris.cpp
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_solaris.cpp
 delete mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_x86_solaris.cpp

diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build
index dc270327a273..274bdaddb3a8 100644
--- a/xpcom/reflect/xptcall/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/md/unix/moz.build
@@ -26,7 +26,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
             'xptcstubs_gcc_x86_unix.cpp'
         ]
 
-if CONFIG['OS_ARCH'] in ('Linux', 'Bitrig', 'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD') or \
+if CONFIG['OS_ARCH'] in ('Linux', 'Bitrig', 'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS') or \
    CONFIG['OS_ARCH'].startswith('GNU_'):
     if CONFIG['CPU_ARCH'] == 'x86_64':
         SOURCES += [
@@ -49,41 +49,6 @@ if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
             'xptcstubs_ipf64.cpp'
         ]
 
-if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['INTEL_ARCHITECTURE']:
-    if CONFIG['CPU_ARCH'] == 'x86_64':
-        if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-            SOURCES += [
-                'xptcinvoke_asm_x86_64_unix.S',
-                'xptcinvoke_x86_64_unix.cpp',
-                'xptcstubs_x86_64_linux.cpp'
-            ]
-        else:
-            GENERATED_FILES = [
-                'xptcstubsdef_asm.solx86',
-            ]
-            ASFLAGS += ['-xarch=amd64']
-            SOURCES += [
-                'xptcinvoke_x86_64_solaris.cpp',
-                'xptcstubs_asm_x86_64_solaris_SUNW.s',
-                'xptcstubs_x86_64_solaris.cpp',
-            ]
-    else:
-        if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-            SOURCES += [
-                'xptcinvoke_gcc_x86_unix.cpp',
-                'xptcstubs_gcc_x86_unix.cpp'
-            ]
-        else:
-            GENERATED_FILES = [
-                'xptcstubsdef_asm.solx86',
-            ]
-            SOURCES += [
-                'xptcinvoke_asm_x86_solaris_SUNW.s',
-                'xptcinvoke_x86_solaris.cpp',
-                'xptcstubs_asm_x86_solaris_SUNW.s',
-                'xptcstubs_x86_solaris.cpp'
-            ]
-
 if CONFIG['CPU_ARCH'] == 'Alpha':
     if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD'):
         SOURCES += [
@@ -240,7 +205,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['CPU_ARCH'] == 'sparc':
         'xptcstubs_sparc_openbsd.cpp',
     ]
 
-if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'Linux') and CONFIG['CPU_ARCH'] == 'sparc64':
+if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'Linux', 'SunOS') and CONFIG['CPU_ARCH'] == 'sparc64':
     SOURCES += [
         'xptcinvoke_asm_sparc64_openbsd.s',
         'xptcinvoke_sparc64_openbsd.cpp',
@@ -248,35 +213,6 @@ if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'Linux') and CONFIG['CPU_ARCH'] =
         'xptcstubs_sparc64_openbsd.cpp',
     ]
 
-if CONFIG['OS_ARCH'] == 'SunOS' and not CONFIG['INTEL_ARCHITECTURE']:
-    if CONFIG['HAVE_64BIT_BUILD']:
-        ASFLAGS += ['-xarch=v9']
-        SOURCES += [
-            'xptcinvoke_sparcv9_solaris.cpp',
-            'xptcstubs_sparcv9_solaris.cpp',
-        ]
-    else:
-        SOURCES += [
-            'xptcinvoke_sparc_solaris.cpp',
-            'xptcstubs_sparc_solaris.cpp',
-        ]
-    if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-        SOURCES += [
-            'xptcinvoke_asm_sparc_solaris_GCC3.s',
-            'xptcstubs_asm_sparc_solaris.s',
-        ]
-    else:
-        if CONFIG['HAVE_64BIT_BUILD']:
-            SOURCES += [
-                'xptcinvoke_asm_sparcv9_solaris_SUNW.s',
-                'xptcstubs_asm_sparcv9_solaris.s',
-            ]
-        else:
-            SOURCES += [
-                'xptcinvoke_asm_sparc_solaris_SUNW.s',
-                'xptcstubs_asm_sparc_solaris.s',
-            ]
-
 if CONFIG['OS_ARCH'] == 'Linux':
     if CONFIG['CPU_ARCH'] == 's390':
         SOURCES += [
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
deleted file mode 100644
index 54adcd147452..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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/. */
-
-/*
- * Platform specific code to invoke XPCOM methods on native objects for
- * solaris/sparc with gcc 3 ABI.
- */
-        .global NS_InvokeByIndex
-/*
- *  NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
- *                   uint32_t paramCount, nsXPTCVariant* params);
- */
-NS_InvokeByIndex:
-        save    %sp,-(64 + 32),%sp  ! room for the register window and
-                                    ! struct pointer, rounded up to 0 % 32
-        mov     %i2,%o0             ! paramCount
-        call    invoke_count_words  ! returns the required stack size in %o0
-        mov     %i3,%o1             ! params
-        
-        sll     %o0,2,%l0           ! number of bytes
-        sub     %sp,%l0,%sp         ! create the additional stack space
-            
-        mov     %sp,%o0             ! pointer for copied args
-        add     %o0,72,%o0          ! step past the register window, the
-                                    ! struct result pointer and the 'this' slot
-        mov     %i2,%o1             ! paramCount
-        call    invoke_copy_to_stack
-        mov     %i3,%o2             ! params
-!
-!   calculate the target address from the vtable
-!
-        ld      [%i0],%l1           ! *that --> vTable
-        sll     %i1,2,%i1           ! multiply index by 4
-        add     %i1,%l1,%l1         ! l1 now points to vTable entry
-        ld      [%l1],%l0           ! target address
-
-.L5:    ld      [%sp + 88],%o5
-.L4:    ld      [%sp + 84],%o4
-.L3:    ld      [%sp + 80],%o3
-.L2:    ld      [%sp + 76],%o2
-.L1:    ld      [%sp + 72],%o1
-.L0:
-        jmpl    %l0,%o7             ! call the routine
-! always have a 'this', from the incoming 'that'
-        mov     %i0,%o0
-        
-        mov     %o0,%i0             ! propagate return value
-        ret
-        restore
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
deleted file mode 100644
index 013770392469..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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/. */
-
-/* Platform specific code to invoke XPCOM methods on native objects */
-
-        .global NS_InvokeByIndex
-        .type   NS_InvokeByIndex, #function
-/*
-    NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-                     uint32_t paramCount, nsXPTCVariant* params);
-    
-*/
-NS_InvokeByIndex:
-        save    %sp,-(64 + 32),%sp  ! room for the register window and
-                                    ! struct pointer, rounded up to 0 % 32
-        sll     %i2,3,%l0           ! assume the worst case
-                                    ! paramCount * 2 * 4 bytes
-        cmp     %l0, 0              ! are there any args? If not,
-        be      .invoke             ! no need to copy args to stack
-
-        sub     %sp,%l0,%sp         ! create the additional stack space
-        add     %sp,72,%o0          ! step past the register window, the
-                                    ! struct result pointer and the 'this' slot
-        mov     %i2,%o1             ! paramCount
-        call    invoke_copy_to_stack
-        mov     %i3,%o2             ! params
-
-!
-!   load arguments from stack into the outgoing registers
-!
-        ld      [%sp + 72],%o1
-        ld      [%sp + 76],%o2
-        ld      [%sp + 80],%o3
-        ld      [%sp + 84],%o4
-        ld      [%sp + 88],%o5
-
-!
-!   calculate the target address from the vtable
-!
-.invoke:
-        sll     %i1,2,%l0           ! index *= 4
-        add     %l0,8,%l0           ! there are 2 extra entries in the vTable
-        ld      [%i0],%l1           ! *that --> address of vtable
-        ld      [%l0 + %l1],%l0     ! that->vtable[index * 4 + 8] --> address
-
-        jmpl    %l0,%o7             ! call the routine
-        mov     %i0,%o0             ! move 'this' pointer to out register
-
-        mov     %o0,%i0             ! propagate return value
-        ret
-        restore
-
-        .size    NS_InvokeByIndex, .-NS_InvokeByIndex
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
deleted file mode 100644
index 34861abc0ead..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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/. */
-
-/*
-    Platform specific code to invoke XPCOM methods on native objects
-    for sparcv9 Solaris.
-
-    See the SPARC Compliance Definition (SCD) Chapter 3
-    for more information about what is going on here, including
-    the use of BIAS (0x7ff).
-    The SCD is available from http://www.sparc.com/.
-*/
-
-        .global NS_InvokeByIndex
-        .type   NS_InvokeByIndex, #function
-
-/*
-    NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-                     uint32_t paramCount, nsXPTCVariant* params);
-    
-*/
-NS_InvokeByIndex:
-        save    %sp,-(128 + 64),%sp ! room for the register window and
-                                    ! struct pointer, rounded up to 0 % 64
-        sll     %i2,4,%l0           ! assume the worst case
-                                    ! paramCount * 2 * 8 bytes
-        cmp     %l0, 0              ! are there any args? If not,
-        be      .invoke             ! no need to copy args to stack
-
-        sub     %sp,%l0,%sp         ! create the additional stack space
-        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-                                    ! struct result pointer and the 'this' slot
-        mov     %i2,%o1             ! paramCount
-        call    invoke_copy_to_stack
-        mov     %i3,%o2             ! params
-
-!
-!   load arguments from stack into the outgoing registers
-!   BIAS is 0x7ff (2047)
-!
-
-!   load the %o1..5 64bit (extended word) output registers registers 
-        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-
-!   load the even number double registers starting with %d2
-        ldd     [%sp + 0x7ff + 136],%d2
-        ldd     [%sp + 0x7ff + 144],%d4
-        ldd     [%sp + 0x7ff + 152],%d6
-        ldd     [%sp + 0x7ff + 160],%d8
-        ldd     [%sp + 0x7ff + 168],%d10
-        ldd     [%sp + 0x7ff + 176],%d12
-        ldd     [%sp + 0x7ff + 184],%d14
-        ldd     [%sp + 0x7ff + 192],%d16
-        ldd     [%sp + 0x7ff + 200],%d18
-        ldd     [%sp + 0x7ff + 208],%d20
-        ldd     [%sp + 0x7ff + 216],%d22
-        ldd     [%sp + 0x7ff + 224],%d24
-        ldd     [%sp + 0x7ff + 232],%d26
-        ldd     [%sp + 0x7ff + 240],%d28
-        ldd     [%sp + 0x7ff + 248],%d30
-
-!
-!   calculate the target address from the vtable
-!
-.invoke:
-        sll     %i1,3,%l0           ! index *= 8
-        add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-        ldx     [%i0],%l1           ! *that --> address of vtable
-        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-
-        jmpl    %l0,%o7             ! call the routine
-        mov     %i0,%o0             ! move 'this' pointer to out register
-
-        mov     %o0,%i0             ! propagate return value
-        ret
-        restore
-
-        .size    NS_InvokeByIndex, .-NS_InvokeByIndex
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
deleted file mode 100644
index af665a16286f..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
+++ /dev/null
@@ -1,55 +0,0 @@
-	.globl NS_InvokeByIndex
-	.type NS_InvokeByIndex, @function
-NS_InvokeByIndex:
-	push       %ebp
-	movl       %esp,%ebp
-	push       %ebx
-	call       .CG0.66
-.CG0.66:
-	pop        %ebx
-	addl       $_GLOBAL_OFFSET_TABLE_+0x1,%ebx
-	push       20(%ebp)
-	push       16(%ebp)
-	push       12(%ebp)
-	push       8(%ebp)
-	/ INLINE: invoke_by_index
-
-
-
-	pushl	%ebx
-	pushl	%esi
-	movl	%esp, %ebx
-
-	pushl	0x14(%ebp)
-	pushl	0x10(%ebp)
-	call	invoke_count_words
-	mov	%ebx, %esp
-
-	sall	$0x2 , %eax
-	subl	%eax, %esp
-	movl	%esp, %esi
-
-	pushl	%esp
-	pushl	0x14(%ebp)
-	pushl	0x10(%ebp)
-	call	invoke_copy_to_stack
-	movl	%esi, %esp
-
-	movl	0x8(%ebp), %ecx
-	pushl	%ecx
-	movl	(%ecx), %edx
-	movl	0xc(%ebp), %eax
-	movl	0x8(%edx, %eax, 4), %edx
-
-	call	*%edx
-	mov	%ebx, %esp
-	popl	%esi
-	popl	%ebx
-	/ INLINE_END
-	addl       $16,%esp
-	pop        %ebx
-	movl       %ebp,%esp
-	pop        %ebp
-	ret        
-	.size NS_InvokeByIndex, . - NS_InvokeByIndex
-
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp
index 03b5926e772a..aa90988a172f 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp
@@ -30,9 +30,9 @@ invoke_copy_to_stack(uint64_t* d, uint32_t paramCount, nsXPTCVariant* s)
   {
     if (regCount < 5) regCount++;
 
-    if (l_s->IsPtrData())
+    if (l_s->IsIndirect())
     {
-      *l_d = (uint64_t)l_s->ptr;
+      *l_d = (uint64_t) &l_s->val;
       continue;
     }
     switch (l_s->type)
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparcv9_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparcv9_solaris.cpp
deleted file mode 100644
index 00c43a8de7de..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparcv9_solaris.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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/. */
-
-
-/* Platform specific code to invoke XPCOM methods on native objects */
-
-#include "xptcprivate.h"
-
-#if !defined(__sparc) && !defined(__sparc__)
-#error "This code is for Sparc only"
-#endif
-
-/* Prototype specifies unmangled function name */
-extern "C" uint64_t
-invoke_copy_to_stack(uint64_t* d, uint32_t paramCount, nsXPTCVariant* s);
-
-extern "C" uint64_t
-invoke_copy_to_stack(uint64_t* d, uint32_t paramCount, nsXPTCVariant* s)
-{
-  /*
-    We need to copy the parameters for this function to locals and use them
-    from there since the parameters occupy the same stack space as the stack
-    we're trying to populate.
-  */
-  uint64_t *l_d = d;
-  nsXPTCVariant *l_s = s;
-  uint64_t l_paramCount = paramCount;
-  uint64_t regCount = 0;  // return the number of registers to load from the stack
-
-  for(uint64_t i = 0; i < l_paramCount; i++, l_d++, l_s++)
-  {
-    if (regCount < 5) regCount++;
-
-    if (l_s->IsPtrData())
-    {
-      *l_d = (uint64_t)l_s->ptr;
-      continue;
-    }
-    switch (l_s->type)
-    {
-      case nsXPTType::T_I8    : *((int64_t*)l_d)     = l_s->val.i8;    break;
-      case nsXPTType::T_I16   : *((int64_t*)l_d)     = l_s->val.i16;   break;
-      case nsXPTType::T_I32   : *((int64_t*)l_d)     = l_s->val.i32;   break;
-      case nsXPTType::T_I64   : *((int64_t*)l_d)     = l_s->val.i64;   break;
-
-      case nsXPTType::T_U8    : *((uint64_t*)l_d)    = l_s->val.u8;    break;
-      case nsXPTType::T_U16   : *((uint64_t*)l_d)    = l_s->val.u16;   break;
-      case nsXPTType::T_U32   : *((uint64_t*)l_d)    = l_s->val.u32;   break;
-      case nsXPTType::T_U64   : *((uint64_t*)l_d)    = l_s->val.u64;   break;
-
-      /* in the case of floats, we want to put the bits in to the
-         64bit space right justified... floats in the parameter array on
-         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-         the space that would be occupied by %f0, %f2, etc.
-      */
-      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-      case nsXPTType::T_BOOL  : *((uint64_t*)l_d)    = l_s->val.b;     break;
-      case nsXPTType::T_CHAR  : *((uint64_t*)l_d)    = l_s->val.c;     break;
-      case nsXPTType::T_WCHAR : *((int64_t*)l_d)     = l_s->val.wc;    break;
-
-      default:
-        // all the others are plain pointer types
-        *((void**)l_d) = l_s->val.p;
-        break;
-    }
-  }
-
-  return regCount;
-}
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_solaris.cpp
deleted file mode 100644
index 20341d39f4b1..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_solaris.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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/. */
-
-// Platform specific code to invoke XPCOM methods on native objects
-
-#include "xptcprivate.h"
-#include "alloca.h"
-
-// 6 integral parameters are passed in registers
-const uint32_t GPR_COUNT = 6;
-
-// 8 floating point parameters are passed in SSE registers
-const uint32_t FPR_COUNT = 8;
-
-// Remember that these 'words' are 64-bit long
-static inline void
-invoke_count_words(uint32_t paramCount, nsXPTCVariant * s,
-                   uint32_t & nr_gpr, uint32_t & nr_fpr, uint32_t & nr_stack)
-{
-    nr_gpr = 1; // skip one GP register for 'that'
-    nr_fpr = 0;
-    nr_stack = 0;
-
-    /* Compute number of eightbytes of class MEMORY.  */
-    for (uint32_t i = 0; i < paramCount; i++, s++) {
-        if (!s->IsPtrData()
-            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-            if (nr_fpr < FPR_COUNT)
-                nr_fpr++;
-            else
-                nr_stack++;
-        }
-        else {
-            if (nr_gpr < GPR_COUNT)
-                nr_gpr++;
-            else
-                nr_stack++;
-        }
-    }
-}
-
-static void
-invoke_copy_to_stack(uint64_t * d, uint32_t paramCount, nsXPTCVariant * s,
-                     uint64_t * gpregs, double * fpregs)
-{
-    uint32_t nr_gpr = 1; // skip one GP register for 'that'
-    uint32_t nr_fpr = 0;
-    uint64_t value;
-
-    for (uint32_t i = 0; i < paramCount; i++, s++) {
-        if (s->IsPtrData())
-            value = (uint64_t) s->ptr;
-        else {
-            switch (s->type) {
-            case nsXPTType::T_FLOAT:                                break;
-            case nsXPTType::T_DOUBLE:                               break;
-            case nsXPTType::T_I8:     value = s->val.i8;            break;
-            case nsXPTType::T_I16:    value = s->val.i16;           break;
-            case nsXPTType::T_I32:    value = s->val.i32;           break;
-            case nsXPTType::T_I64:    value = s->val.i64;           break;
-            case nsXPTType::T_U8:     value = s->val.u8;            break;
-            case nsXPTType::T_U16:    value = s->val.u16;           break;
-            case nsXPTType::T_U32:    value = s->val.u32;           break;
-            case nsXPTType::T_U64:    value = s->val.u64;           break;
-            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-            default:                  value = (uint64_t) s->val.p;  break;
-            }
-        }
-
-        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-            if (nr_fpr < FPR_COUNT)
-                fpregs[nr_fpr++] = s->val.d;
-            else {
-                *((double *)d) = s->val.d;
-                d++;
-            }
-        }
-        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-            if (nr_fpr < FPR_COUNT)
-                // The value in %xmm register is already prepared to
-                // be retrieved as a float. Therefore, we pass the
-                // value verbatim, as a double without conversion.
-                fpregs[nr_fpr++] = s->val.d;
-            else {
-                *((float *)d) = s->val.f;
-                d++;
-            }
-        }
-        else {
-            if (nr_gpr < GPR_COUNT)
-                gpregs[nr_gpr++] = value;
-            else
-                *d++ = value;
-        }
-    }
-}
-
-// Avoid AddressSanitizer instrumentation for the next function because it
-// depends on __builtin_alloca behavior and alignment that cannot be relied on
-// once the function is compiled with a version of ASan that has dynamic-alloca
-// instrumentation enabled.
-
-MOZ_ASAN_BLACKLIST
-EXPORT_XPCOM_API(nsresult)
-NS_InvokeByIndex(nsISupports * that, uint32_t methodIndex,
-                 uint32_t paramCount, nsXPTCVariant * params)
-{
-    uint32_t nr_gpr, nr_fpr, nr_stack;
-    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-
-    // Stack, if used, must be 16-bytes aligned
-    if (nr_stack)
-        nr_stack = (nr_stack + 1) & ~1;
-
-    // Load parameters to stack, if necessary
-    uint64_t *stack = (uint64_t *) __builtin_alloca(nr_stack * 8);
-    uint64_t gpregs[GPR_COUNT];
-    double fpregs[FPR_COUNT];
-    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-
-    switch (nr_fpr) {
-      case 8: asm("movupd %0, %xmm7" : : "xmm7" (fpregs[7]));
-      case 7: asm("movupd %0, %xmm6" : : "xmm6" (fpregs[6]));
-      case 6: asm("movupd %0, %xmm5" : : "xmm5" (fpregs[5]));
-      case 5: asm("movupd %0, %xmm4" : : "xmm4" (fpregs[4]));
-      case 4: asm("movupd %0, %xmm3" : : "xmm3" (fpregs[3]));
-      case 3: asm("movupd %0, %xmm2" : : "xmm2" (fpregs[2]));
-      case 2: asm("movupd %0, %xmm1" : : "xmm1" (fpregs[1]));
-      case 1: asm("movupd %0, %xmm0" : : "xmm0" (fpregs[0]));
-      case 0:;
-    }
-
-    // Ensure that assignments to SSE registers won't be optimized away
-    asm("" ::: "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
-
-    // Get pointer to method
-    uint64_t methodAddress = *((uint64_t *)that);
-    methodAddress += 16 + 8 * methodIndex;
-    methodAddress = *((uint64_t *)methodAddress);
-
-    typedef uint32_t (*Method)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-    uint32_t result = ((Method)methodAddress)((uint64_t)that, gpregs[1], gpregs[2], gpregs[3], gpregs[4], gpregs[5]);
-    return result;
-}
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_solaris.cpp
deleted file mode 100644
index a57e221de7ed..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_solaris.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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/. */
-
-/* Platform specific code to invoke XPCOM methods on native objects */
-
-#include "xptcprivate.h"
-
-extern "C" {
-
-// Remember that these 'words' are 32bit DWORDS
-
-uint32_t
-invoke_count_words(uint32_t paramCount, nsXPTCVariant* s)
-{
-    uint32_t result = 0;
-    for(uint32_t i = 0; i < paramCount; i++, s++)
-    {
-        if(s->IsPtrData())
-        {
-            result++;
-            continue;
-        }
-        result++;
-        switch(s->type)
-        {
-        case nsXPTType::T_I64    :
-        case nsXPTType::T_U64    :
-        case nsXPTType::T_DOUBLE :
-            result++;
-            break;
-        default:
-            break;
-        }
-    }
-    return result;
-}
-
-void
-invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d)
-{
-    for(uint32_t i = 0; i < paramCount; i++, d++, s++)
-    {
-        if(s->IsPtrData())
-        {
-            *((void**)d) = s->ptr;
-            continue;
-        }
-
-/* XXX: the following line is here (rather than as the default clause in
- *      the following switch statement) so that the Sun native compiler
- *      will generate the correct assembly code on the Solaris Intel
- *      platform. See the comments in bug #28817 for more details.
- */
-
-        *((void**)d) = s->val.p;
-
-        switch(s->type)
-        {
-        case nsXPTType::T_I64    : *((int64_t*) d) = s->val.i64; d++;    break;
-        case nsXPTType::T_U64    : *((uint64_t*)d) = s->val.u64; d++;    break;
-        case nsXPTType::T_DOUBLE : *((double*)  d) = s->val.d;   d++;    break;
-        default                  : break;
-        }
-    }
-}
-
-}
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparcv9_solaris.s b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparcv9_solaris.s
deleted file mode 100644
index ab97a890c394..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparcv9_solaris.s
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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/. */
-
-        .global SharedStub
-
-/*
-    in the frame for the function that called SharedStub are the
-    rest of the parameters we need
-
-*/
-
-SharedStub:
-! we don't create a new frame yet, but work within the frame of the calling
-! function to give ourselves the other parameters we want
-
-        mov     %o0, %o1               ! shuffle the index up to 2nd place
-        mov     %i0, %o0               ! the original 'this'
-        add     %fp, 0x7ff + 136, %o2  ! previous stack top adjusted to the first argument slot (beyond 'this')
-
-! save off the original incoming parameters that arrived in 
-! registers, the ABI guarantees the space for us to do this
-        stx     %i1, [%fp + 0x7ff + 136]
-        stx     %i2, [%fp + 0x7ff + 144]
-        stx     %i3, [%fp + 0x7ff + 152]
-        stx     %i4, [%fp + 0x7ff + 160]
-        stx     %i5, [%fp + 0x7ff + 168]
-! now we can build our own stack frame
-        save    %sp,-(128 + 64),%sp    ! room for the register window and
-                                       ! struct pointer, rounded up to 0 % 64
-! our function now appears to have been called
-! as SharedStub(nsISupports* that, uint32_t index, uint32_t* args)
-! so we can just copy these through
-
-        mov     %i0, %o0
-        mov     %i1, %o1
-        mov     %i2, %o2
-        call    PrepareAndDispatch
-        nop
-        mov     %o0,%i0             ! propagate return value
-        b .LL1
-        nop
-.LL1:
-        ret
-        restore
-
-       .size    SharedStub, .-SharedStub
-       .type    SharedStub, #function
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
deleted file mode 100644
index aa6d84434a81..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
+++ /dev/null
@@ -1,63 +0,0 @@
-#define STUB_ENTRY1(nn) \
-    .globl	__1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_; \
-    .hidden	__1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_; \
-    .type	__1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_, @function; \
-__1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_: \
-    movl	$/**/nn/**/, %eax; \
-    jmp	SharedStub; \
-    .size	__1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_, . - __1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_ \
-
-#define STUB_ENTRY2(nn) \
-    .globl	__1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_; \
-    .hidden	__1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_; \
-    .type	__1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_, @function; \
-__1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_: \
-    movl	$/**/nn/**/, %eax; \
-    jmp	SharedStub; \
-    .size	__1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_, . - __1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_ \
-
-#define STUB_ENTRY3(nn) \
-    .globl	__1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_; \
-    .hidden	__1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_; \
-    .type	__1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_, @function; \
-__1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_: \
-    movl	$/**/nn/**/, %eax; \
-    jmp	SharedStub; \
-    .size	__1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_, . - __1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_ \
-
-// static nsresult SharedStub(uint32_t methodIndex)
-    .type      SharedStub, @function;
-    SharedStub:
-    // make room for gpregs (48), fpregs (64)
-    pushq      %rbp;
-    movq       %rsp,%rbp;
-    subq       $112,%rsp;
-    // save GP registers
-    movq       %rdi,-112(%rbp);
-    movq       %rsi,-104(%rbp);
-    movq       %rdx, -96(%rbp);
-    movq       %rcx, -88(%rbp);
-    movq       %r8 , -80(%rbp);
-    movq       %r9 , -72(%rbp);
-    leaq       -112(%rbp),%rcx;
-    // save FP registers
-    movsd      %xmm0,-64(%rbp);
-    movsd      %xmm1,-56(%rbp);
-    movsd      %xmm2,-48(%rbp);
-    movsd      %xmm3,-40(%rbp);
-    movsd      %xmm4,-32(%rbp);
-    movsd      %xmm5,-24(%rbp);
-    movsd      %xmm6,-16(%rbp);
-    movsd      %xmm7, -8(%rbp);
-    leaq       -64(%rbp),%r8;
-    // rdi has the 'self' pointer already
-    movl       %eax,%esi;
-    leaq       16(%rbp),%rdx;
-    call       PrepareAndDispatch@plt;
-    leave;
-    ret;
-    .size      SharedStub, . - SharedStub
-
-#define SENTINEL_ENTRY(nn)
-
-#include "xptcstubsdef_asm.solx86"
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_solaris_SUNW.s b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
deleted file mode 100644
index 76bdcf925b79..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
+++ /dev/null
@@ -1,78 +0,0 @@
-#define STUB_ENTRY1(nn)	\
- 	.globl __1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_; \
-	.type __1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_, @function; \
-__1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_: \
-	push       %ebp; \
-	movl       %esp,%ebp; \
-	andl       $-16,%esp; \
-	push       %ebx;	\
-	call       .CG4./**/nn/**/; \
-.CG4./**/nn/**/: \
-	pop        %ebx;	 \
-	addl       $_GLOBAL_OFFSET_TABLE_+0x1,%ebx; \
-	leal	0xc(%ebp), %ecx; \
-	pushl	%ecx; \
-	pushl	$/**/nn/**/; \
-	movl	0x8(%ebp), %ecx; \
-	pushl	%ecx; \
-	call	__1cSPrepareAndDispatch6FpnOnsXPTCStubBase_IpI_I_; \
-	addl	$0xc , %esp; \
-	pop        %ebx; \
-	movl       %ebp,%esp; \
-	pop        %ebp; \
-	ret        ; \
-	.size __1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_, . - __1cOnsXPTCStubBaseFStub/**/nn/**/6M_I_ \
-
-#define STUB_ENTRY2(nn)	\
- 	.globl __1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_; \
-	.type __1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_, @function; \
-__1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_: \
-	push       %ebp; \
-	movl       %esp,%ebp; \
-	andl       $-16,%esp; \
-	push       %ebx;	\
-	call       .CG4./**/nn/**/; \
-.CG4./**/nn/**/: \
-	pop        %ebx;	 \
-	addl       $_GLOBAL_OFFSET_TABLE_+0x1,%ebx; \
-	leal	0xc(%ebp), %ecx; \
-	pushl	%ecx; \
-	pushl	$/**/nn/**/; \
-	movl	0x8(%ebp), %ecx; \
-	pushl	%ecx; \
-	call	__1cSPrepareAndDispatch6FpnOnsXPTCStubBase_IpI_I_; \
-	addl	$0xc , %esp; \
-	pop        %ebx; \
-	movl       %ebp,%esp; \
-	pop        %ebp; \
-	ret        ; \
-	.size __1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_, . - __1cOnsXPTCStubBaseGStub/**/nn/**/6M_I_ \
-
-#define STUB_ENTRY3(nn)	\
- 	.globl __1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_; \
-	.type __1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_, @function; \
-__1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_: \
-	push       %ebp; \
-	movl       %esp,%ebp; \
-	andl       $-16,%esp; \
-	push       %ebx;	\
-	call       .CG4./**/nn/**/; \
-.CG4./**/nn/**/: \
-	pop        %ebx;	 \
-	addl       $_GLOBAL_OFFSET_TABLE_+0x1,%ebx; \
-	leal	0xc(%ebp), %ecx; \
-	pushl	%ecx; \
-	pushl	$/**/nn/**/; \
-	movl	0x8(%ebp), %ecx; \
-	pushl	%ecx; \
-	call	__1cSPrepareAndDispatch6FpnOnsXPTCStubBase_IpI_I_; \
-	addl	$0xc , %esp; \
-	pop        %ebx; \
-	movl       %ebp,%esp; \
-	pop        %ebp; \
-	ret        ; \
-	.size __1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_, . - __1cOnsXPTCStubBaseHStub/**/nn/**/6M_I_ \
-
-#define SENTINEL_ENTRY(nn)
-
-#include "xptcstubsdef_asm.solx86"
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_sparcv9_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_sparcv9_solaris.cpp
deleted file mode 100644
index 0584fcfdb94b..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_sparcv9_solaris.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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/. */
-
-/* Implement shared vtbl methods. */
-
-#include "xptcprivate.h"
-
-#if defined(sparc) || defined(__sparc__)
-
-extern "C" nsresult ATTRIBUTE_USED
-PrepareAndDispatch(nsXPTCStubBase* self, uint64_t methodIndex, uint64_t* args)
-{
-
-#define PARAM_BUFFER_COUNT     16
-
-    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-    nsXPTCMiniVariant* dispatchParams = nullptr;
-    const nsXPTMethodInfo* info;
-    uint8_t paramCount;
-    uint8_t i;
-
-    NS_ASSERTION(self,"no self");
-
-    self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
-
-    paramCount = info->GetParamCount();
-
-    // setup variant array pointer
-    if(paramCount > PARAM_BUFFER_COUNT)
-        dispatchParams = new nsXPTCMiniVariant[paramCount];
-    else
-        dispatchParams = paramBuffer;
-    NS_ASSERTION(dispatchParams,"no place for params");
-
-    const uint8_t indexOfJSContext = info->IndexOfJSContext();
-
-    uint64_t* ap = args;
-    for(i = 0; i < paramCount; i++, ap++)
-    {
-        const nsXPTParamInfo& param = info->GetParam(i);
-        const nsXPTType& type = param.GetType();
-        nsXPTCMiniVariant* dp = &dispatchParams[i];
-
-        if (i == indexOfJSContext)
-            ap++;
-
-        if(param.IsOut() || !type.IsArithmetic())
-        {
-            dp->val.p = (void*) *ap;
-            continue;
-        }
-        // else
-        switch(type)
-        {
-        case nsXPTType::T_I8     : dp->val.i8  = *((int64_t*) ap);       break;
-        case nsXPTType::T_I16    : dp->val.i16 = *((int64_t*) ap);       break;
-        case nsXPTType::T_I32    : dp->val.i32 = *((int64_t*) ap);       break;
-        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*)  ap);       break;
-        case nsXPTType::T_U64    : dp->val.u64 = *((uint64_t*)ap);       break;
-        case nsXPTType::T_I64    : dp->val.i64 = *((int64_t*) ap);       break;
-        case nsXPTType::T_U8     : dp->val.u8  = *((uint64_t*)ap);       break;
-        case nsXPTType::T_U16    : dp->val.u16 = *((uint64_t*)ap);       break;
-        case nsXPTType::T_U32    : dp->val.u32 = *((uint64_t*)ap);       break;
-        case nsXPTType::T_FLOAT  : dp->val.f   =  ((float*)   ap)[1];    break;
-        case nsXPTType::T_BOOL   : dp->val.b   = *((uint64_t*)ap);       break;
-        case nsXPTType::T_CHAR   : dp->val.c   = *((uint64_t*)ap);       break;
-        case nsXPTType::T_WCHAR  : dp->val.wc  = *((int64_t*) ap);       break;
-        default:
-            NS_ERROR("bad type");
-            break;
-        }
-    }
-
-    nsresult result = self->mOuter->CallMethod((uint16_t)methodIndex, info,
-                                               dispatchParams);
-
-    if(dispatchParams != paramBuffer)
-        delete [] dispatchParams;
-
-    return result;
-}
-
-extern "C" nsresult SharedStub(int, int*);
-
-#define STUB_ENTRY(n) \
-nsresult nsXPTCStubBase::Stub##n() \
-{ \
-	int dummy; /* defeat tail-call optimization */ \
-	return SharedStub(n, &dummy); \
-}
-
-#define SENTINEL_ENTRY(n) \
-nsresult nsXPTCStubBase::Sentinel##n() \
-{ \
-    NS_ERROR("nsXPTCStubBase::Sentinel called"); \
-    return NS_ERROR_NOT_IMPLEMENTED; \
-}
-
-#include "xptcstubsdef.inc"
-
-#endif /* sparc || __sparc__ */
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_solaris.cpp
deleted file mode 100644
index 6f1b462c4640..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_solaris.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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/. */
-
-// Implement shared vtbl methods.
-
-// Keep this in sync with the darwin version.
-
-#include "xptcprivate.h"
-
-// The Linux/x86-64 ABI passes the first 6 integer parameters and the
-// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-// caller.  The rest of the parameters are passed in the callers stack
-// area.
-
-const uint32_t PARAM_BUFFER_COUNT   = 16;
-const uint32_t GPR_COUNT            = 6;
-const uint32_t FPR_COUNT            = 8;
-
-// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-//
-// - 'args[]' contains the arguments passed on stack
-// - 'gpregs[]' contains the arguments passed in integer registers
-// - 'fpregs[]' contains the arguments passed in floating point registers
-//
-// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-// and then the method gets called.
-
-extern "C" nsresult ATTRIBUTE_USED
-PrepareAndDispatch(nsXPTCStubBase * self, uint32_t methodIndex,
-                   uint64_t * args, uint64_t * gpregs, double *fpregs)
-{
-    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-    nsXPTCMiniVariant* dispatchParams = nullptr;
-    const nsXPTMethodInfo* info;
-    uint32_t paramCount;
-    uint32_t i;
-
-    NS_ASSERTION(self,"no self");
-
-    self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info);
-    NS_ASSERTION(info,"no method info");
-    if (!info)
-        return NS_ERROR_UNEXPECTED;
-
-    paramCount = info->GetParamCount();
-
-    // setup variant array pointer
-    if (paramCount > PARAM_BUFFER_COUNT)
-        dispatchParams = new nsXPTCMiniVariant[paramCount];
-    else
-        dispatchParams = paramBuffer;
-
-    NS_ASSERTION(dispatchParams,"no place for params");
-    if (!dispatchParams)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    const uint8_t indexOfJSContext = info->IndexOfJSContext();
-
-    uint64_t* ap = args;
-    uint32_t nr_gpr = 1;    // skip one GPR register for 'that'
-    uint32_t nr_fpr = 0;
-    uint64_t value;
-
-    for (i = 0; i < paramCount; i++) {
-        const nsXPTParamInfo& param = info->GetParam(i);
-        const nsXPTType& type = param.GetType();
-        nsXPTCMiniVariant* dp = &dispatchParams[i];
-
-        if (i == indexOfJSContext) {
-            if (nr_gpr < GPR_COUNT)
-                nr_gpr++;
-            else
-                ap++;
-        }
-
-        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-            if (nr_fpr < FPR_COUNT)
-                dp->val.d = fpregs[nr_fpr++];
-            else
-                dp->val.d = *(double*) ap++;
-            continue;
-        }
-        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-            if (nr_fpr < FPR_COUNT)
-                // The value in %xmm register is already prepared to
-                // be retrieved as a float. Therefore, we pass the
-                // value verbatim, as a double without conversion.
-                dp->val.d = fpregs[nr_fpr++];
-            else
-                dp->val.f = *(float*) ap++;
-            continue;
-        }
-        else {
-            if (nr_gpr < GPR_COUNT)
-                value = gpregs[nr_gpr++];
-            else
-                value = *ap++;
-        }
-
-        if (param.IsOut() || !type.IsArithmetic()) {
-            dp->val.p = (void*) value;
-            continue;
-        }
-
-        switch (type) {
-        case nsXPTType::T_I8:      dp->val.i8  = (int8_t)   value; break;
-        case nsXPTType::T_I16:     dp->val.i16 = (int16_t)  value; break;
-        case nsXPTType::T_I32:     dp->val.i32 = (int32_t)  value; break;
-        case nsXPTType::T_I64:     dp->val.i64 = (int64_t)  value; break;
-        case nsXPTType::T_U8:      dp->val.u8  = (uint8_t)  value; break;
-        case nsXPTType::T_U16:     dp->val.u16 = (uint16_t) value; break;
-        case nsXPTType::T_U32:     dp->val.u32 = (uint32_t) value; break;
-        case nsXPTType::T_U64:     dp->val.u64 = (uint64_t) value; break;
-        // Cast to uint8_t first, to remove garbage on upper 56 bits.
-        case nsXPTType::T_BOOL:    dp->val.b   = (bool)(uint8_t)   value; break;
-        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-
-        default:
-            NS_ERROR("bad type");
-            break;
-        }
-    }
-
-    nsresult result = self->mOuter->CallMethod((uint16_t) methodIndex, info,
-                                               dispatchParams);
-
-    if (dispatchParams != paramBuffer)
-        delete [] dispatchParams;
-
-    return result;
-}
-
-#define STUB_ENTRY(n)
-
-#define SENTINEL_ENTRY(n) \
-nsresult nsXPTCStubBase::Sentinel##n() \
-{ \
-    NS_ERROR("nsXPTCStubBase::Sentinel called"); \
-    return NS_ERROR_NOT_IMPLEMENTED; \
-}
-
-#include "xptcstubsdef.inc"
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_x86_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_x86_solaris.cpp
deleted file mode 100644
index d8213baaaf8f..000000000000
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_x86_solaris.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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/. */
-
-/* Implement shared vtbl methods. */
-
-#include "xptcprivate.h"
-
-nsresult ATTRIBUTE_USED
-PrepareAndDispatch(nsXPTCStubBase* self, uint32_t methodIndex, uint32_t* args)
-{
-#define PARAM_BUFFER_COUNT     16
-
-    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-    nsXPTCMiniVariant* dispatchParams = nullptr;
-    const nsXPTMethodInfo* info;
-    uint8_t paramCount;
-    uint8_t i;
-
-    NS_ASSERTION(self,"no self");
-
-    self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
-
-    paramCount = info->GetParamCount();
-
-    // setup variant array pointer
-    if(paramCount > PARAM_BUFFER_COUNT)
-        dispatchParams = new nsXPTCMiniVariant[paramCount];
-    else
-        dispatchParams = paramBuffer;
-    NS_ASSERTION(dispatchParams,"no place for params");
-
-    const uint8_t indexOfJSContext = info->IndexOfJSContext();
-
-    uint32_t* ap = args;
-    for(i = 0; i < paramCount; i++, ap++)
-    {
-        const nsXPTParamInfo& param = info->GetParam(i);
-        const nsXPTType& type = param.GetType();
-        nsXPTCMiniVariant* dp = &dispatchParams[i];
-
-        if (i == indexOfJSContext)
-            ap++;
-
-        if(param.IsOut() || !type.IsArithmetic())
-        {
-            dp->val.p = (void*) *ap;
-            continue;
-        }
-        // else
-	    dp->val.p = (void*) *ap;
-        switch(type)
-        {
-        case nsXPTType::T_I64    : dp->val.i64 = *((int64_t*) ap); ap++; break;
-        case nsXPTType::T_U64    : dp->val.u64 = *((uint64_t*)ap); ap++; break;
-        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*)  ap); ap++; break;
-        default                  : break;
-        }
-    }
-
-    nsresult result = self->mOuter->CallMethod((uint16_t)methodIndex, info,
-                                               dispatchParams);
-
-    if(dispatchParams != paramBuffer)
-        delete [] dispatchParams;
-
-    return result;
-}
-
-#define STUB_ENTRY(n)
-
-#define SENTINEL_ENTRY(n) \
-nsresult nsXPTCStubBase::Sentinel##n() \
-{ \
-    NS_ERROR("nsXPTCStubBase::Sentinel called"); \
-    return NS_ERROR_NOT_IMPLEMENTED; \
-}
-
-#include "xptcstubsdef.inc"

From 34c44989b0d9d34d72d6778e19b446bd13b3a56b Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:16 +0000
Subject: [PATCH 17/46] Bug 1539265 - Handle ::marker pseudo-elements on shadow
 roots in walker.js. r=jdescottes

At the moment when devtools.inspector.showAllAnonymousContent is true shadow
hosts with ::marker and ::before pseudos will stop showing the ::before and
won't show the ::marker either.

Differential Revision: https://phabricator.services.mozilla.com/D25058

--HG--
extra : moz-landing-system : lando
---
 .../client/inspector/markup/test/browser.ini  |   1 +
 ...kup_shadowdom_marker_and_before_pseudos.js | 144 ++++++++++++++++++
 devtools/server/actors/inspector/walker.js    |  12 +-
 3 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js

diff --git a/devtools/client/inspector/markup/test/browser.ini b/devtools/client/inspector/markup/test/browser.ini
index 681233776557..028f2efbbf80 100644
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -201,6 +201,7 @@ subsuite = clipboard
 [browser_markup_shadowdom_delete.js]
 [browser_markup_shadowdom_dynamic.js]
 [browser_markup_shadowdom_hover.js]
+[browser_markup_shadowdom_marker_and_before_pseudos.js]
 [browser_markup_shadowdom_maxchildren.js]
 [browser_markup_shadowdom_mutations_shadow.js]
 [browser_markup_shadowdom_navigation.js]
diff --git a/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js b/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
new file mode 100644
index 000000000000..761e527bdde1
--- /dev/null
+++ b/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
@@ -0,0 +1,144 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+requestLongerTimeout(1);
+
+// Test a few static pages using webcomponents with ::marker and ::before
+// pseudos and check that they are displayed as expected in the markup view.
+
+const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
+
+const TEST_DATA = [
+  {
+    // Test that ::before on an empty shadow host is displayed when the host
+    // has a ::marker.
+    title: "::before after ::marker, empty node",
+    url: `data:text/html;charset=utf-8,
+      <style>
+        test-component { display: list-item; }
+        test-component::before { content: "before-host" }
+      </style>
+
+      <test-component></test-component>
+
+      <script>
+        'use strict';
+        customElements.define('test-component', class extends HTMLElement {
+          constructor() {
+            super();
+            let shadowRoot = this.attachShadow({mode: "#MODE#"});
+          }
+        });
+      </script>`,
+    tree: `
+      test-component
+        #shadow-root
+        ::before`,
+    anonTree: `
+      test-component
+        #shadow-root
+        _moz_generated_content_marker
+        ::before`,
+
+  }, {
+    // Test ::before on a shadow host with content is displayed when the host
+    // has a ::marker.
+    title: "::before after ::marker, non-empty node",
+    url: `data:text/html;charset=utf-8,
+      <style>
+        test-component { display: list-item }
+        test-component::before { content: "before-host" }
+      </style>
+
+      <test-component>
+        <div class="light-dom"></div>
+      </test-component>
+
+      <script>
+        "use strict";
+        customElements.define("test-component", class extends HTMLElement {
+          constructor() {
+            super();
+            let shadowRoot = this.attachShadow({mode: "#MODE#"});
+            shadowRoot.innerHTML = "<slot>default content</slot>";
+          }
+        });
+      </script>`,
+    tree: `
+      test-component
+        #shadow-root
+          slot
+            div!slotted
+        ::before
+        class="light-dom"`,
+    anonTree: `
+      test-component
+        #shadow-root
+          slot
+            div!slotted
+        _moz_generated_content_marker
+        ::before
+        class="light-dom"`,
+  }, {
+    // Test just ::marker on a shadow host
+    title: "just ::marker, no ::before",
+    url: `data:text/html;charset=utf-8,
+      <style>
+        test-component { display: list-item }
+      </style>
+
+      <test-component></test-component>
+
+      <script>
+        "use strict";
+        customElements.define("test-component", class extends HTMLElement {
+          constructor() {
+            super();
+            let shadowRoot = this.attachShadow({mode: "#MODE#"});
+          }
+        });
+      </script>`,
+    tree: `
+      test-component
+        #shadow-root`,
+    anonTree: `
+      test-component
+        #shadow-root
+        _moz_generated_content_marker`,
+  },
+];
+
+for (const {url, tree, anonTree, title} of TEST_DATA) {
+  // Test each configuration in both open and closed modes
+  add_task(async function() {
+    info(`Testing: [${title}] in OPEN mode`);
+    const {inspector, tab} = await openInspectorForURL(url.replace(/#MODE#/g, "open"));
+    await assertMarkupViewAsTree(tree, "test-component", inspector);
+    await removeTab(tab);
+  });
+  add_task(async function() {
+    info(`Testing: [${title}] in CLOSED mode`);
+    const {inspector, tab} = await openInspectorForURL(url.replace(/#MODE#/g, "closed"));
+    await assertMarkupViewAsTree(tree, "test-component", inspector);
+    await removeTab(tab);
+  });
+  add_task(async function() {
+    await pushPref(SHOWANON_PREF, true);
+    info(`Testing: [${title}] in OPEN mode with showAllAnonymousContent`);
+    const {inspector, tab} = await openInspectorForURL(url.replace(/#MODE#/g, "open"));
+    await assertMarkupViewAsTree(anonTree, "test-component", inspector);
+    await removeTab(tab);
+    await pushPref(SHOWANON_PREF, false);
+  });
+  add_task(async function() {
+    await pushPref(SHOWANON_PREF, true);
+    info(`Testing: [${title}] in CLOSED mode with showAllAnonymousContent`);
+    const {inspector, tab} = await openInspectorForURL(url.replace(/#MODE#/g, "closed"));
+    await assertMarkupViewAsTree(anonTree, "test-component", inspector);
+    await removeTab(tab);
+    await pushPref(SHOWANON_PREF, false);
+  });
+}
diff --git a/devtools/server/actors/inspector/walker.js b/devtools/server/actors/inspector/walker.js
index db8573e5cfca..012c097f9ab5 100644
--- a/devtools/server/actors/inspector/walker.js
+++ b/devtools/server/actors/inspector/walker.js
@@ -865,10 +865,14 @@ var WalkerActor = protocol.ActorClassWithSpec(walkerSpec, {
     }
 
     if (shadowHost) {
-      // Use anonymous walkers to fetch ::before / ::after pseudo elements
+      // Use anonymous walkers to fetch ::marker / ::before / ::after pseudo
+      // elements
       const firstChildWalker = this.getDocumentWalker(node.rawNode);
       const first = firstChildWalker.firstChild();
-      const hasBefore = first && first.nodeName === "_moz_generated_content_before";
+      const hasMarker = first && first.nodeName === "_moz_generated_content_marker";
+      const maybeBeforeNode = hasMarker ? firstChildWalker.nextSibling() : first;
+      const hasBefore = maybeBeforeNode &&
+        maybeBeforeNode.nodeName === "_moz_generated_content_before";
 
       const lastChildWalker = this.getDocumentWalker(node.rawNode);
       const last = lastChildWalker.lastChild();
@@ -877,8 +881,10 @@ var WalkerActor = protocol.ActorClassWithSpec(walkerSpec, {
       nodes = [
         // #shadow-root
         ...(hideShadowRoot ? [] : [node.rawNode.openOrClosedShadowRoot]),
+        // ::marker
+        ...(hasMarker ? [first] : []),
         // ::before
-        ...(hasBefore ? [first] : []),
+        ...(hasBefore ? [maybeBeforeNode] : []),
         // shadow host direct children
         ...nodes,
         // native anonymous content for UA widgets

From 00591e61ad04499127f968259a2cf4c8a62713ba Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:23 +0000
Subject: [PATCH 18/46] Bug 1539265 - Add a test for ::marker displaying in the
 markup view. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D25070

--HG--
extra : moz-landing-system : lando
---
 .../test/browser_rules_pseudo-element_02.js      | 16 ++++++++++++++++
 .../inspector/rules/test/doc_pseudoelement.html  |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js
index 2a95ec3c0a1d..d984d7c3f038 100644
--- a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js
+++ b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js
@@ -7,9 +7,11 @@
 // Test that pseudoelements are displayed correctly in the markup view.
 
 const TEST_URI = URL_ROOT + "doc_pseudoelement.html";
+const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
 
 add_task(async function() {
   await addTab(TEST_URI);
+  await pushPref(SHOWANON_PREF, true);
   const {inspector} = await openRuleView();
 
   const node = await getNodeFront("#topleft", inspector);
@@ -26,4 +28,18 @@ add_task(async function() {
   is(afterElement.tagName, "_moz_generated_content_after",
     "tag name is correct");
   await selectNode(afterElement, inspector);
+
+  const listNode = await getNodeFront("#list", inspector);
+  const listChildren = await inspector.markup.walker.children(listNode);
+
+  is(listChildren.nodes.length, 4, "<li> has correct number of children");
+  const markerElement = listChildren.nodes[0];
+  is(markerElement.tagName, "_moz_generated_content_marker",
+    "tag name is correct");
+  await selectNode(markerElement, inspector);
+
+  const listBeforeElement = listChildren.nodes[1];
+  is(listBeforeElement.tagName, "_moz_generated_content_before",
+    "tag name is correct");
+  await selectNode(listBeforeElement, inspector);
 });
diff --git a/devtools/client/inspector/rules/test/doc_pseudoelement.html b/devtools/client/inspector/rules/test/doc_pseudoelement.html
index 6145d4bf1ba9..ad61b5d94129 100644
--- a/devtools/client/inspector/rules/test/doc_pseudoelement.html
+++ b/devtools/client/inspector/rules/test/doc_pseudoelement.html
@@ -127,5 +127,9 @@ p:first-letter {
         <p>Bottom Left<br />Position</p>
     </div>
 
+    <ol>
+        <li id="list" class="box">List element</li>
+    </ol>
+
   </body>
 </html>

From 71b7e1fa5d39a1876bbb591f42a23b30daad4723 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:31 +0000
Subject: [PATCH 19/46] Bug 1539265 - Handle ::marker pseudo-elements in
 css-logic.js, so their rules show in the rule view. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D25071

--HG--
extra : moz-landing-system : lando
---
 .../test/browser_rules_pseudo-element_01.js   | 26 +++++++++++++++++++
 .../rules/test/doc_pseudoelement.html         |  4 +++
 devtools/server/actors/inspector/css-logic.js |  2 +-
 devtools/shared/inspector/css-logic.js        |  9 ++++---
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js
index 8631e72325e8..705696adaa69 100644
--- a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js
+++ b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js
@@ -8,9 +8,11 @@
 
 const TEST_URI = URL_ROOT + "doc_pseudoelement.html";
 const PSEUDO_PREF = "devtools.inspector.show_pseudo_elements";
+const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
 
 add_task(async function() {
   await pushPref(PSEUDO_PREF, true);
+  await pushPref(SHOWANON_PREF, true);
 
   await addTab(TEST_URI);
   const {inspector, view} = await openRuleView();
@@ -21,6 +23,7 @@ add_task(async function() {
   await testBottomLeft(inspector, view);
   await testParagraph(inspector, view);
   await testBody(inspector, view);
+  await testList(inspector, view);
 });
 
 async function testTopLeft(inspector, view) {
@@ -31,6 +34,7 @@ async function testTopLeft(inspector, view) {
       firstLineRulesNb: 2,
       firstLetterRulesNb: 1,
       selectionRulesNb: 1,
+      markerRulesNb: 0,
       afterRulesNb: 1,
       beforeRulesNb: 2,
     }
@@ -123,6 +127,7 @@ async function testTopRight(inspector, view) {
     firstLineRulesNb: 1,
     firstLetterRulesNb: 1,
     selectionRulesNb: 0,
+    markerRulesNb: 0,
     beforeRulesNb: 2,
     afterRulesNb: 1,
   });
@@ -145,6 +150,7 @@ async function testBottomRight(inspector, view) {
     firstLineRulesNb: 1,
     firstLetterRulesNb: 1,
     selectionRulesNb: 0,
+    markerRulesNb: 0,
     beforeRulesNb: 3,
     afterRulesNb: 1,
   });
@@ -156,6 +162,7 @@ async function testBottomLeft(inspector, view) {
     firstLineRulesNb: 1,
     firstLetterRulesNb: 1,
     selectionRulesNb: 0,
+    markerRulesNb: 0,
     beforeRulesNb: 2,
     afterRulesNb: 1,
   });
@@ -168,6 +175,7 @@ async function testParagraph(inspector, view) {
       firstLineRulesNb: 1,
       firstLetterRulesNb: 1,
       selectionRulesNb: 2,
+      markerRulesNb: 0,
       beforeRulesNb: 0,
       afterRulesNb: 0,
     });
@@ -197,6 +205,20 @@ async function testBody(inspector, view) {
   is(gutters.length, 0, "There are no gutter headings");
 }
 
+async function testList(inspector, view) {
+  await assertPseudoElementRulesNumbers("#list", inspector, view, {
+    elementRulesNb: 4,
+    firstLineRulesNb: 1,
+    firstLetterRulesNb: 1,
+    selectionRulesNb: 0,
+    markerRulesNb: 1,
+    beforeRulesNb: 1,
+    afterRulesNb: 1,
+  });
+
+  assertGutters(view);
+}
+
 function convertTextPropsToString(textProps) {
   return textProps.map(t => t.name + ": " + t.value).join("; ");
 }
@@ -218,6 +240,8 @@ async function assertPseudoElementRulesNumbers(selector, inspector, view, ruleNb
       rule.pseudoElement === ":first-letter"),
     selectionRules: elementStyle.rules.filter(rule =>
       rule.pseudoElement === ":selection"),
+    markerRules: elementStyle.rules.filter(rule =>
+      rule.pseudoElement === ":marker"),
     beforeRules: elementStyle.rules.filter(rule =>
       rule.pseudoElement === ":before"),
     afterRules: elementStyle.rules.filter(rule =>
@@ -232,6 +256,8 @@ async function assertPseudoElementRulesNumbers(selector, inspector, view, ruleNb
      selector + " has the correct number of :first-letter rules");
   is(rules.selectionRules.length, ruleNbs.selectionRulesNb,
      selector + " has the correct number of :selection rules");
+  is(rules.markerRules.length, ruleNbs.markerRulesNb,
+     selector + " has the correct number of :marker rules");
   is(rules.beforeRules.length, ruleNbs.beforeRulesNb,
      selector + " has the correct number of :before rules");
   is(rules.afterRules.length, ruleNbs.afterRulesNb,
diff --git a/devtools/client/inspector/rules/test/doc_pseudoelement.html b/devtools/client/inspector/rules/test/doc_pseudoelement.html
index ad61b5d94129..6c85c5560308 100644
--- a/devtools/client/inspector/rules/test/doc_pseudoelement.html
+++ b/devtools/client/inspector/rules/test/doc_pseudoelement.html
@@ -106,6 +106,10 @@ p:first-letter {
     left:0;
 }
 
+#list::marker {
+    color: purple;
+}
+
     </style>
   </head>
   <body>
diff --git a/devtools/server/actors/inspector/css-logic.js b/devtools/server/actors/inspector/css-logic.js
index e16580198e1d..b9afb49fe3fb 100644
--- a/devtools/server/actors/inspector/css-logic.js
+++ b/devtools/server/actors/inspector/css-logic.js
@@ -665,7 +665,7 @@ CssLogic.getSelectors = function(domRule) {
  *
  * @returns {Object}
  *            - {DOMNode} node The non-anonymous node
- *            - {string} pseudo One of ':before', ':after', or null.
+ *            - {string} pseudo One of ':marker', ':before', ':after', or null.
  */
 CssLogic.getBindingElementAndPseudo = getBindingElementAndPseudo;
 
diff --git a/devtools/shared/inspector/css-logic.js b/devtools/shared/inspector/css-logic.js
index 7521ebafaedd..1facbb6ae6e0 100644
--- a/devtools/shared/inspector/css-logic.js
+++ b/devtools/shared/inspector/css-logic.js
@@ -456,19 +456,22 @@ exports.getCssPath = getCssPath;
 exports.getXPath = getXPath;
 
 /**
- * Given a node, check to see if it is a ::before or ::after element.
+ * Given a node, check to see if it is a ::marker, ::before, or ::after element.
  * If so, return the node that is accessible from within the document
  * (the parent of the anonymous node), along with which pseudo element
  * it was.  Otherwise, return the node itself.
  *
  * @returns {Object}
  *            - {DOMNode} node The non-anonymous node
- *            - {string} pseudo One of ':before', ':after', or null.
+ *            - {string} pseudo One of ':marker', ':before', ':after', or null.
  */
 function getBindingElementAndPseudo(node) {
   let bindingElement = node;
   let pseudo = null;
-  if (node.nodeName == "_moz_generated_content_before") {
+  if (node.nodeName == "_moz_generated_content_marker") {
+    bindingElement = node.parentNode;
+    pseudo = ":marker";
+  } else if (node.nodeName == "_moz_generated_content_before") {
     bindingElement = node.parentNode;
     pseudo = ":before";
   } else if (node.nodeName == "_moz_generated_content_after") {

From 53e960c394a288a993a03252571a4537d8b2322d Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:38 +0000
Subject: [PATCH 20/46] Bug 1539265 - Add isMarkerPseudoElement function to
 layout/utils.js. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D25105

--HG--
extra : moz-landing-system : lando
---
 devtools/server/actors/inspector/node.js |  2 ++
 devtools/shared/fronts/node.js           |  3 +++
 devtools/shared/layout/utils.js          | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/devtools/server/actors/inspector/node.js b/devtools/server/actors/inspector/node.js
index 64a7a8ec63c3..eb405d5099e7 100644
--- a/devtools/server/actors/inspector/node.js
+++ b/devtools/server/actors/inspector/node.js
@@ -18,6 +18,7 @@ loader.lazyRequireGetter(this, "isAfterPseudoElement", "devtools/shared/layout/u
 loader.lazyRequireGetter(this, "isAnonymous", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isBeforePseudoElement", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isDirectShadowHostChild", "devtools/shared/layout/utils", true);
+loader.lazyRequireGetter(this, "isMarkerPseudoElement", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isNativeAnonymous", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isShadowAnonymous", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isShadowHost", "devtools/shared/layout/utils", true);
@@ -127,6 +128,7 @@ const NodeActor = protocol.ActorClassWithSpec(nodeSpec, {
 
       attrs: this.writeAttrs(),
       customElementLocation: this.getCustomElementLocation(),
+      isMarkerPseudoElement: isMarkerPseudoElement(this.rawNode),
       isBeforePseudoElement: isBeforePseudoElement(this.rawNode),
       isAfterPseudoElement: isAfterPseudoElement(this.rawNode),
       isAnonymous: isAnonymous(this.rawNode),
diff --git a/devtools/shared/fronts/node.js b/devtools/shared/fronts/node.js
index f73e1467c40e..4edacb199e5a 100644
--- a/devtools/shared/fronts/node.js
+++ b/devtools/shared/fronts/node.js
@@ -267,6 +267,9 @@ class NodeFront extends FrontClassWithSpec(nodeSpec) {
     return this._form.hasEventListeners;
   }
 
+  get isMarkerPseudoElement() {
+    return this._form.isMarkerPseudoElement;
+  }
   get isBeforePseudoElement() {
     return this._form.isBeforePseudoElement;
   }
diff --git a/devtools/shared/layout/utils.js b/devtools/shared/layout/utils.js
index fc988aee233c..abb9b6f9a284 100644
--- a/devtools/shared/layout/utils.js
+++ b/devtools/shared/layout/utils.js
@@ -649,6 +649,17 @@ function isDirectShadowHostChild(node) {
 }
 exports.isDirectShadowHostChild = isDirectShadowHostChild;
 
+/**
+ * Determine whether a node is a ::marker pseudo.
+ *
+ * @param {DOMNode} node
+ * @return {Boolean}
+ */
+function isMarkerPseudoElement(node) {
+  return node.nodeName === "_moz_generated_content_marker";
+}
+exports.isMarkerPseudoElement = isMarkerPseudoElement;
+
 /**
  * Determine whether a node is a ::before pseudo.
  *

From 7e5567449ae60349c523728d38ca9459f67ff2d1 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:45 +0000
Subject: [PATCH 21/46] Bug 1539265 - Handle ::marker pseudos during drag &
 drop of nodes in the markup view. r=jdescottes

Prior to this the tab would crash with signature [@ nsINode::InsertChildBefore ]
if trying to insert before the ::marker.

Differential Revision: https://phabricator.services.mozilla.com/D25106

--HG--
extra : moz-landing-system : lando
---
 devtools/client/inspector/markup/markup.js    | 16 +++--
 .../client/inspector/markup/test/browser.ini  |  1 +
 ...er_markup_dragdrop_before_marker_pseudo.js | 64 +++++++++++++++++++
 .../markup/test/doc_markup_dragdrop.html      |  6 ++
 4 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js

diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js
index 0c081aada250..6126ddb0b360 100644
--- a/devtools/client/inspector/markup/markup.js
+++ b/devtools/client/inspector/markup/markup.js
@@ -2180,12 +2180,16 @@ MarkupView.prototype = {
       nextSibling = target.parentNode.container.node;
     }
 
-    if (nextSibling && nextSibling.isBeforePseudoElement) {
-      nextSibling = target.parentNode.parentNode.children[1].container.node;
-    }
-    if (nextSibling && nextSibling.isAfterPseudoElement) {
-      parent = target.parentNode.container.node.parentNode();
-      nextSibling = null;
+    if (nextSibling) {
+      while (
+        nextSibling.isMarkerPseudoElement || nextSibling.isBeforePseudoElement
+      ) {
+        nextSibling = this.getContainer(nextSibling).elt.nextSibling.container.node;
+      }
+      if (nextSibling.isAfterPseudoElement) {
+        parent = target.parentNode.container.node.parentNode();
+        nextSibling = null;
+      }
     }
 
     if (parent.nodeType !== nodeConstants.ELEMENT_NODE) {
diff --git a/devtools/client/inspector/markup/test/browser.ini b/devtools/client/inspector/markup/test/browser.ini
index 028f2efbbf80..0173258f7d38 100644
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -115,6 +115,7 @@ skip-if = (os == 'linux' && bits == 32 && debug) || (os == "win" && processor ==
 [browser_markup_display_node_02.js]
 [browser_markup_dragdrop_autoscroll_01.js]
 [browser_markup_dragdrop_autoscroll_02.js]
+[browser_markup_dragdrop_before_marker_pseudo.js]
 [browser_markup_dragdrop_distance.js]
 [browser_markup_dragdrop_draggable.js]
 [browser_markup_dragdrop_dragRootNode.js]
diff --git a/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js b/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js
new file mode 100644
index 000000000000..04690d4720f3
--- /dev/null
+++ b/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js
@@ -0,0 +1,64 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test drag and dropping a node before a ::marker pseudo.
+
+const TEST_URL = URL_ROOT + "doc_markup_dragdrop.html";
+const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
+
+add_task(async function() {
+  await pushPref(SHOWANON_PREF, true);
+  const {inspector} = await openInspectorForURL(TEST_URL);
+
+  info("Expand #list node");
+  const parentFront = await getNodeFront("#list", inspector);
+  await inspector.markup.expandNode(parentFront.parentNode());
+  await inspector.markup.expandNode(parentFront);
+  await waitForMultipleChildrenUpdates(inspector);
+
+  info("Scroll #list into view");
+  const parentContainer = await getContainerForNodeFront(parentFront, inspector);
+  parentContainer.elt.scrollIntoView(true);
+
+  info("Test placing an element before a ::marker psuedo");
+  await moveElementBeforeMarker("#last-list-child", parentFront, inspector);
+  const childNodes = await getChildrenOf(parentFront, inspector);
+  is(childNodes[0], "_moz_generated_content_marker",
+     "::marker is still the first child of #list");
+  is(childNodes[1], "last-list-child",
+     "#last-list-child is now the second child of #list");
+  is(childNodes[2], "first-list-child",
+     "#first-list-child is now the last child of #list");
+});
+
+async function moveElementBeforeMarker(selector, parentFront, inspector) {
+  info(`Placing ${selector} before its parent's ::marker`);
+
+  const container = await getContainerForSelector(selector, inspector);
+  const parentContainer = await getContainerForNodeFront(parentFront, inspector);
+  const offsetY = (parentContainer.tagLine.offsetTop +
+    parentContainer.tagLine.offsetHeight) - container.tagLine.offsetTop;
+
+  const onMutated = inspector.once("markupmutation");
+  const uiUpdate = inspector.once("inspector-updated");
+
+  await simulateNodeDragAndDrop(inspector, selector, 0, offsetY);
+
+  const mutations = await onMutated;
+  await uiUpdate;
+
+  is(mutations.length, 2, "2 mutations were received");
+}
+
+async function getChildrenOf(parentFront, {walker}) {
+  const {nodes} = await walker.children(parentFront);
+  return nodes.map(node => {
+    if (node.isMarkerPseudoElement) {
+      return node.displayName;
+    }
+    return node.id;
+  });
+}
diff --git a/devtools/client/inspector/markup/test/doc_markup_dragdrop.html b/devtools/client/inspector/markup/test/doc_markup_dragdrop.html
index 25b9707e2007..a13d42cbceb0 100644
--- a/devtools/client/inspector/markup/test/doc_markup_dragdrop.html
+++ b/devtools/client/inspector/markup/test/doc_markup_dragdrop.html
@@ -25,6 +25,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=858038
     <div slot="slot1" class="slotted2">slot1-2</div>
   </test-component>
 
+  <ol>
+    <li id="list"><span id="first-list-child"
+      >List item start</span><span id="last-list-child"
+      >List item end</span></li>
+  </ol>
+
   <script>
     "use strict";
     customElements.define("test-component", class extends HTMLElement {

From 85f74da0e484084795369a65d204d776123d2b29 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:53 +0000
Subject: [PATCH 22/46] Bug 1539265 - Add a few optimisations for ::marker
 pseudos. r=jdescottes

Where there is existing for ::before and ::after.

Differential Revision: https://phabricator.services.mozilla.com/D25107

--HG--
extra : moz-landing-system : lando
---
 devtools/server/actors/inspector/event-collector.js | 3 ++-
 devtools/server/actors/inspector/node.js            | 4 +++-
 devtools/server/actors/inspector/walker.js          | 4 +++-
 devtools/shared/layout/utils.js                     | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/devtools/server/actors/inspector/event-collector.js b/devtools/server/actors/inspector/event-collector.js
index dbb541b432d8..ee31a9964939 100644
--- a/devtools/server/actors/inspector/event-collector.js
+++ b/devtools/server/actors/inspector/event-collector.js
@@ -12,6 +12,7 @@ const Services = require("Services");
 const {
   isAfterPseudoElement,
   isBeforePseudoElement,
+  isMarkerPseudoElement,
   isNativeAnonymous,
 } = require("devtools/shared/layout/utils");
 const Debugger = require("Debugger");
@@ -389,7 +390,7 @@ class JQueryEventCollector extends MainEventCollector {
 
     // If jQuery is not on the page, if this is an anonymous node or a pseudo
     // element we need to return early.
-    if (!jQuery || isNativeAnonymous(node) ||
+    if (!jQuery || isNativeAnonymous(node) || isMarkerPseudoElement(node) ||
         isBeforePseudoElement(node) || isAfterPseudoElement(node)) {
       if (checkOnly) {
         return false;
diff --git a/devtools/server/actors/inspector/node.js b/devtools/server/actors/inspector/node.js
index eb405d5099e7..e9e453d28b6c 100644
--- a/devtools/server/actors/inspector/node.js
+++ b/devtools/server/actors/inspector/node.js
@@ -188,7 +188,9 @@ const NodeActor = protocol.ActorClassWithSpec(nodeSpec, {
   get numChildren() {
     // For pseudo elements, childNodes.length returns 1, but the walker
     // will return 0.
-    if (isBeforePseudoElement(this.rawNode) || isAfterPseudoElement(this.rawNode)) {
+    if (isMarkerPseudoElement(this.rawNode) ||
+      isBeforePseudoElement(this.rawNode) || isAfterPseudoElement(this.rawNode)
+    ) {
       return 0;
     }
 
diff --git a/devtools/server/actors/inspector/walker.js b/devtools/server/actors/inspector/walker.js
index 012c097f9ab5..8fcbb9814b08 100644
--- a/devtools/server/actors/inspector/walker.js
+++ b/devtools/server/actors/inspector/walker.js
@@ -17,6 +17,7 @@ loader.lazyRequireGetter(this, "isAfterPseudoElement", "devtools/shared/layout/u
 loader.lazyRequireGetter(this, "isAnonymous", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isBeforePseudoElement", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isDirectShadowHostChild", "devtools/shared/layout/utils", true);
+loader.lazyRequireGetter(this, "isMarkerPseudoElement", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isNativeAnonymous", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isShadowHost", "devtools/shared/layout/utils", true);
 loader.lazyRequireGetter(this, "isShadowRoot", "devtools/shared/layout/utils", true);
@@ -536,7 +537,8 @@ var WalkerActor = protocol.ActorClassWithSpec(walkerSpec, {
    */
   inlineTextChild: function({ rawNode }) {
     // Quick checks to prevent creating a new walker if possible.
-    if (isBeforePseudoElement(rawNode) ||
+    if (isMarkerPseudoElement(rawNode) ||
+        isBeforePseudoElement(rawNode) ||
         isAfterPseudoElement(rawNode) ||
         isShadowHost(rawNode) ||
         rawNode.nodeType != Node.ELEMENT_NODE ||
diff --git a/devtools/shared/layout/utils.js b/devtools/shared/layout/utils.js
index abb9b6f9a284..a21a4359354b 100644
--- a/devtools/shared/layout/utils.js
+++ b/devtools/shared/layout/utils.js
@@ -638,6 +638,7 @@ exports.isShadowHost = isShadowHost;
 function isDirectShadowHostChild(node) {
   // Pseudo elements and native anonymous elements are always part of the anonymous tree.
   if (
+    isMarkerPseudoElement(node) ||
     isBeforePseudoElement(node) ||
     isAfterPseudoElement(node) ||
     isNativeAnonymous(node)) {

From adf896c1ab446ae3293e8f5c70f5c13031ab888e Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:45:55 +0000
Subject: [PATCH 23/46] Bug 1539265 - Don't represent ::marker pseudo-elements
 with the internal _moz_generated_content_marker tagName in the markup view.
 r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D25108

--HG--
extra : moz-landing-system : lando
---
 devtools/client/inspector/breadcrumbs.js         | 16 ++++++++++++----
 ...markup_shadowdom_marker_and_before_pseudos.js |  6 +++---
 .../inspector/markup/views/read-only-editor.js   |  8 +++++++-
 devtools/shared/fronts/node.js                   |  3 ++-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/devtools/client/inspector/breadcrumbs.js b/devtools/client/inspector/breadcrumbs.js
index cb5c09a01bcd..89abbf58514d 100644
--- a/devtools/client/inspector/breadcrumbs.js
+++ b/devtools/client/inspector/breadcrumbs.js
@@ -428,8 +428,12 @@ HTMLBreadcrumbs.prototype = {
    */
   prettyPrintNodeAsText: function(node) {
     let text = node.isShadowRoot ? SHADOW_ROOT_TAGNAME : node.displayName;
-    if (node.isPseudoElement) {
-      text = node.isBeforePseudoElement ? "::before" : "::after";
+    if (node.isMarkerPseudoElement) {
+      text = "::marker";
+    } else if (node.isBeforePseudoElement) {
+      text = "::before";
+    } else if (node.isAfterPseudoElement) {
+      text = "::after";
     }
 
     if (node.id) {
@@ -472,8 +476,12 @@ HTMLBreadcrumbs.prototype = {
     pseudosLabel.className = "breadcrumbs-widget-item-pseudo-classes plain";
 
     let tagText = node.isShadowRoot ? SHADOW_ROOT_TAGNAME : node.displayName;
-    if (node.isPseudoElement) {
-      tagText = node.isBeforePseudoElement ? "::before" : "::after";
+    if (node.isMarkerPseudoElement) {
+      tagText = "::marker";
+    } else if (node.isBeforePseudoElement) {
+      tagText = "::before";
+    } else if (node.isAfterPseudoElement) {
+      tagText = "::after";
     }
     let idText = node.id ? ("#" + node.id) : "";
     let classesText = "";
diff --git a/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js b/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
index 761e527bdde1..6402ecf52ff6 100644
--- a/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
+++ b/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
@@ -40,7 +40,7 @@ const TEST_DATA = [
     anonTree: `
       test-component
         #shadow-root
-        _moz_generated_content_marker
+        ::marker
         ::before`,
 
   }, {
@@ -79,7 +79,7 @@ const TEST_DATA = [
         #shadow-root
           slot
             div!slotted
-        _moz_generated_content_marker
+        ::marker
         ::before
         class="light-dom"`,
   }, {
@@ -107,7 +107,7 @@ const TEST_DATA = [
     anonTree: `
       test-component
         #shadow-root
-        _moz_generated_content_marker`,
+        ::marker`,
   },
 ];
 
diff --git a/devtools/client/inspector/markup/views/read-only-editor.js b/devtools/client/inspector/markup/views/read-only-editor.js
index 84e539efc5e2..63611043a234 100644
--- a/devtools/client/inspector/markup/views/read-only-editor.js
+++ b/devtools/client/inspector/markup/views/read-only-editor.js
@@ -16,7 +16,13 @@ function ReadOnlyEditor(container, node) {
 
   if (node.isPseudoElement) {
     this.tag.classList.add("theme-fg-color3");
-    this.tag.textContent = node.isBeforePseudoElement ? "::before" : "::after";
+    if (node.isMarkerPseudoElement) {
+      this.tag.textContent = "::marker";
+    } else if (node.isBeforePseudoElement) {
+      this.tag.textContent = "::before";
+    } else if (node.isAfterPseudoElement) {
+      this.tag.textContent = "::after";
+    }
   } else if (node.nodeType == nodeConstants.DOCUMENT_TYPE_NODE) {
     this.elt.classList.add("comment", "doctype");
     this.tag.textContent = node.doctypeString;
diff --git a/devtools/shared/fronts/node.js b/devtools/shared/fronts/node.js
index 4edacb199e5a..354480c0904d 100644
--- a/devtools/shared/fronts/node.js
+++ b/devtools/shared/fronts/node.js
@@ -277,7 +277,8 @@ class NodeFront extends FrontClassWithSpec(nodeSpec) {
     return this._form.isAfterPseudoElement;
   }
   get isPseudoElement() {
-    return this.isBeforePseudoElement || this.isAfterPseudoElement;
+    return this.isBeforePseudoElement || this.isAfterPseudoElement ||
+      this.isMarkerPseudoElement;
   }
   get isAnonymous() {
     return this._form.isAnonymous;

From 65872bf4683db09b4a8420558ec366fe416b9804 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:46:02 +0000
Subject: [PATCH 24/46] Bug 1539265 - Add ::marker pseudo-element handling to
 WalkerIndex. r=jdescottes

So ::marker pseudo elements can be found via searching for "::marker" in the
markup view.

Differential Revision: https://phabricator.services.mozilla.com/D25109

--HG--
extra : moz-landing-system : lando
---
 devtools/server/actors/utils/walker-search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/devtools/server/actors/utils/walker-search.js b/devtools/server/actors/utils/walker-search.js
index 86482a094676..7d4a385b4d62 100644
--- a/devtools/server/actors/utils/walker-search.js
+++ b/devtools/server/actors/utils/walker-search.js
@@ -93,7 +93,10 @@ WalkerIndex.prototype = {
         // For each element node, we get the tagname and all attributes names
         // and values
         const localName = node.localName;
-        if (localName === "_moz_generated_content_before") {
+        if (localName === "_moz_generated_content_marker") {
+          this._addToIndex("tag", node, "::marker");
+          this._addToIndex("text", node, node.textContent.trim());
+        } else if (localName === "_moz_generated_content_before") {
           this._addToIndex("tag", node, "::before");
           this._addToIndex("text", node, node.textContent.trim());
         } else if (localName === "_moz_generated_content_after") {

From fdb2b8f41268457d3287cbee1b73d1e31d23a03b Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:46:09 +0000
Subject: [PATCH 25/46] Bug 1539265 - Add ::marker to the list of suggested
 pseudo selectors. r=jdescottes

For autocompletion of : in selector contexts, like the Style Editor.

Differential Revision: https://phabricator.services.mozilla.com/D25110

--HG--
extra : moz-landing-system : lando
---
 devtools/server/actors/inspector/walker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devtools/server/actors/inspector/walker.js b/devtools/server/actors/inspector/walker.js
index 8fcbb9814b08..f59cbd1effdc 100644
--- a/devtools/server/actors/inspector/walker.js
+++ b/devtools/server/actors/inspector/walker.js
@@ -88,6 +88,7 @@ const PSEUDO_SELECTORS = [
   [":disabled", 0],
   [":checked", 1],
   ["::selection", 0],
+  ["::marker", 0],
 ];
 
 const HELPER_SHEET = "data:text/css;charset=utf-8," + encodeURIComponent(`

From 8bceae14891b7dc9b1ea85c1796287a8b582711f Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:36:20 +0000
Subject: [PATCH 26/46] Bug 1539265 - Handle ::marker pseudo-elements in reps.
 r=jdescottes,nchevobbe

Only place reps can display a ::marker currently is in the animation panel.

Differential Revision: https://phabricator.services.mozilla.com/D25165

--HG--
extra : moz-landing-system : lando
---
 .../devtools-reps/src/reps/element-node.js    | 20 ++++++++-----
 .../src/reps/stubs/element-node.js            | 13 +++++++++
 .../src/reps/tests/element-node.js            | 29 +++++++++++++++++++
 devtools/client/inspector/shared/utils.js     | 10 +++++--
 .../client/shared/components/reps/reps.js     | 15 ++++++++--
 5 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/element-node.js b/devtools/client/debugger/new/packages/devtools-reps/src/reps/element-node.js
index 763daeac3bbd..eda3f13a9d40 100644
--- a/devtools/client/debugger/new/packages/devtools-reps/src/reps/element-node.js
+++ b/devtools/client/debugger/new/packages/devtools-reps/src/reps/element-node.js
@@ -93,7 +93,8 @@ function getElements(grip, mode) {
     attributes,
     nodeName,
     isAfterPseudoElement,
-    isBeforePseudoElement
+    isBeforePseudoElement,
+    isMarkerPseudoElement
   } = grip.preview;
   const nodeNameElement = span(
     {
@@ -102,13 +103,16 @@ function getElements(grip, mode) {
     nodeName
   );
 
-  if (isAfterPseudoElement || isBeforePseudoElement) {
-    return [
-      span(
-        { className: "attrName" },
-        `::${isAfterPseudoElement ? "after" : "before"}`
-      )
-    ];
+  let pseudoNodeName;
+  if (isAfterPseudoElement) {
+    pseudoNodeName = "after";
+  } else if (isBeforePseudoElement) {
+    pseudoNodeName = "before";
+  } else if (isMarkerPseudoElement) {
+    pseudoNodeName = "marker";
+  }
+  if (pseudoNodeName) {
+    return [span({ className: "attrName" }, `::${pseudoNodeName}`)];
   }
 
   if (mode === MODE.TINY) {
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/element-node.js b/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/element-node.js
index 7fa5413be9bf..cd8e7718f9be 100644
--- a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/element-node.js
+++ b/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/element-node.js
@@ -248,6 +248,19 @@ stubs.set("NodeWithLongStringAttribute", {
   }
 });
 
+stubs.set("MarkerPseudoElement", {
+  type: "object",
+  actor: "server1.conn1.child1/obj26",
+  preview: {
+    kind: "DOMNode",
+    nodeType: 1,
+    nodeName: "_moz_generated_content_marker",
+    attributes: {},
+    attributesLength: 0,
+    isMarkerPseudoElement: true
+  }
+});
+
 stubs.set("BeforePseudoElement", {
   type: "object",
   actor: "server1.conn1.child1/obj27",
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/element-node.js b/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/element-node.js
index 76a1c4d21e5f..59099b1cea72 100644
--- a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/element-node.js
+++ b/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/element-node.js
@@ -465,6 +465,35 @@ describe("ElementNode - Element attribute cropping", () => {
   });
 });
 
+describe("ElementNode - : Marker pseudo element", () => {
+  const stub = stubs.get("MarkerPseudoElement");
+
+  it("selects ElementNode Rep", () => {
+    expect(getRep(stub)).toBe(ElementNode.rep);
+  });
+
+  it("renders with expected text content", () => {
+    const renderedComponent = shallow(
+      ElementNode.rep({
+        object: stub
+      })
+    );
+
+    expect(renderedComponent.text()).toEqual("::marker");
+  });
+
+  it("renders with expected text content in tiny mode", () => {
+    const renderedComponent = shallow(
+      ElementNode.rep({
+        object: stub,
+        mode: MODE.TINY
+      })
+    );
+
+    expect(renderedComponent.text()).toEqual("::marker");
+  });
+});
+
 describe("ElementNode - : Before pseudo element", () => {
   const stub = stubs.get("BeforePseudoElement");
 
diff --git a/devtools/client/inspector/shared/utils.js b/devtools/client/inspector/shared/utils.js
index 0609088a18bb..e1ceb10178be 100644
--- a/devtools/client/inspector/shared/utils.js
+++ b/devtools/client/inspector/shared/utils.js
@@ -139,10 +139,15 @@ function getSelectorFromGrip(grip) {
     nodeName,
     isAfterPseudoElement,
     isBeforePseudoElement,
+    isMarkerPseudoElement,
   } = grip.preview;
 
-  if (isAfterPseudoElement || isBeforePseudoElement) {
-    return `::${isAfterPseudoElement ? "after" : "before"}`;
+  if (isAfterPseudoElement) {
+    return "::after";
+  } else if (isBeforePseudoElement) {
+    return "::before";
+  } else if (isMarkerPseudoElement) {
+    return "::marker";
   }
 
   let selector = nodeName;
@@ -200,6 +205,7 @@ function translateNodeFrontToGrip(nodeFront) {
       attributesLength: attributes.length,
       isAfterPseudoElement: nodeFront.isAfterPseudoElement,
       isBeforePseudoElement: nodeFront.isBeforePseudoElement,
+      isMarkerPseudoElement: nodeFront.isMarkerPseudoElement,
       // All the grid containers are assumed to be in the DOM tree.
       isConnected: true,
       // nodeName is already lowerCased in Node grips
diff --git a/devtools/client/shared/components/reps/reps.js b/devtools/client/shared/components/reps/reps.js
index da9f6a4b643d..5200d911aefd 100644
--- a/devtools/client/shared/components/reps/reps.js
+++ b/devtools/client/shared/components/reps/reps.js
@@ -6282,14 +6282,23 @@ function getElements(grip, mode) {
     attributes,
     nodeName,
     isAfterPseudoElement,
-    isBeforePseudoElement
+    isBeforePseudoElement,
+    isMarkerPseudoElement
   } = grip.preview;
   const nodeNameElement = span({
     className: "tag-name"
   }, nodeName);
 
-  if (isAfterPseudoElement || isBeforePseudoElement) {
-    return [span({ className: "attrName" }, `::${isAfterPseudoElement ? "after" : "before"}`)];
+  let pseudoNodeName;
+  if (isAfterPseudoElement) {
+    pseudoNodeName = "after";
+  } else if (isBeforePseudoElement) {
+    pseudoNodeName = "before";
+  } else if (isMarkerPseudoElement) {
+    pseudoNodeName = "marker";
+  }
+  if (pseudoNodeName) {
+    return [span({ className: "attrName" }, `::${pseudoNodeName}`)];
   }
 
   if (mode === MODE.TINY) {

From da57ddce6da828ed832cdb422ec1aa216d31149c Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Tue, 2 Apr 2019 07:36:27 +0000
Subject: [PATCH 27/46] Bug 1539265 - Make ::marker pseudo-elements always
 visible in the markup view. r=jdescottes,mbalfanz,pbro

Instead of only when setting devtools.inspector.showAllAnonymousContent.

Differential Revision: https://phabricator.services.mozilla.com/D25166

--HG--
extra : moz-landing-system : lando
---
 .../browser_markup_accessibility_semantics.js | 12 +++----
 ...er_markup_dragdrop_before_marker_pseudo.js |  2 --
 ...kup_shadowdom_marker_and_before_pseudos.js | 34 +------------------
 .../test/browser_rules_pseudo-element_01.js   |  2 --
 .../test/browser_rules_pseudo-element_02.js   |  2 --
 devtools/server/actors/inspector/utils.js     |  9 ++---
 6 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/devtools/client/inspector/markup/test/browser_markup_accessibility_semantics.js b/devtools/client/inspector/markup/test/browser_markup_accessibility_semantics.js
index b7d4269e4db1..708c0e14611b 100644
--- a/devtools/client/inspector/markup/test/browser_markup_accessibility_semantics.js
+++ b/devtools/client/inspector/markup/test/browser_markup_accessibility_semantics.js
@@ -14,9 +14,9 @@ add_task(async function() {
     data:text/html;charset=utf-8,
     <h1>foo</h1>
     <span>bar</span>
-    <ul>
-      <li></li>
-    </ul>`);
+    <dl>
+      <dt></dt>
+    </dl>`);
   const markup = inspector.markup;
   const doc = markup.doc;
   const win = doc.defaultView;
@@ -25,7 +25,7 @@ add_task(async function() {
   const bodyContainer = await getContainerForSelector("body", inspector);
   const spanContainer = await getContainerForSelector("span", inspector);
   const headerContainer = await getContainerForSelector("h1", inspector);
-  const listContainer = await getContainerForSelector("ul", inspector);
+  const listContainer = await getContainerForSelector("dl", inspector);
 
   // Focus on the tree element.
   rootElt.focus();
@@ -71,7 +71,7 @@ add_task(async function() {
     "Closed tree item should have aria-expanded unset");
 
   info("Selecting and expanding list container");
-  await selectNode("ul", inspector);
+  await selectNode("dl", inspector);
   EventUtils.synthesizeKey("VK_RIGHT", {}, win);
   await waitForMultipleChildrenUpdates(inspector);
 
@@ -80,7 +80,7 @@ add_task(async function() {
     "Active descendant should not be set to list container tagLine");
   is(listContainer.tagLine.getAttribute("aria-expanded"), "true",
     "Open tree item should have aria-expanded set");
-  const listItemContainer = await getContainerForSelector("li", inspector);
+  const listItemContainer = await getContainerForSelector("dt", inspector);
   is(listItemContainer.tagLine.getAttribute("aria-level"),
     TOP_CONTAINER_LEVEL + 1,
     "Grand child container tagLine should have nested level up to date");
diff --git a/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js b/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js
index 04690d4720f3..464bd9ad9833 100644
--- a/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js
+++ b/devtools/client/inspector/markup/test/browser_markup_dragdrop_before_marker_pseudo.js
@@ -7,10 +7,8 @@
 // Test drag and dropping a node before a ::marker pseudo.
 
 const TEST_URL = URL_ROOT + "doc_markup_dragdrop.html";
-const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
 
 add_task(async function() {
-  await pushPref(SHOWANON_PREF, true);
   const {inspector} = await openInspectorForURL(TEST_URL);
 
   info("Expand #list node");
diff --git a/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js b/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
index 6402ecf52ff6..9df1a0af4c79 100644
--- a/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
+++ b/devtools/client/inspector/markup/test/browser_markup_shadowdom_marker_and_before_pseudos.js
@@ -9,8 +9,6 @@ requestLongerTimeout(1);
 // Test a few static pages using webcomponents with ::marker and ::before
 // pseudos and check that they are displayed as expected in the markup view.
 
-const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
-
 const TEST_DATA = [
   {
     // Test that ::before on an empty shadow host is displayed when the host
@@ -34,10 +32,6 @@ const TEST_DATA = [
         });
       </script>`,
     tree: `
-      test-component
-        #shadow-root
-        ::before`,
-    anonTree: `
       test-component
         #shadow-root
         ::marker
@@ -68,13 +62,6 @@ const TEST_DATA = [
         });
       </script>`,
     tree: `
-      test-component
-        #shadow-root
-          slot
-            div!slotted
-        ::before
-        class="light-dom"`,
-    anonTree: `
       test-component
         #shadow-root
           slot
@@ -102,16 +89,13 @@ const TEST_DATA = [
         });
       </script>`,
     tree: `
-      test-component
-        #shadow-root`,
-    anonTree: `
       test-component
         #shadow-root
         ::marker`,
   },
 ];
 
-for (const {url, tree, anonTree, title} of TEST_DATA) {
+for (const {url, tree, title} of TEST_DATA) {
   // Test each configuration in both open and closed modes
   add_task(async function() {
     info(`Testing: [${title}] in OPEN mode`);
@@ -125,20 +109,4 @@ for (const {url, tree, anonTree, title} of TEST_DATA) {
     await assertMarkupViewAsTree(tree, "test-component", inspector);
     await removeTab(tab);
   });
-  add_task(async function() {
-    await pushPref(SHOWANON_PREF, true);
-    info(`Testing: [${title}] in OPEN mode with showAllAnonymousContent`);
-    const {inspector, tab} = await openInspectorForURL(url.replace(/#MODE#/g, "open"));
-    await assertMarkupViewAsTree(anonTree, "test-component", inspector);
-    await removeTab(tab);
-    await pushPref(SHOWANON_PREF, false);
-  });
-  add_task(async function() {
-    await pushPref(SHOWANON_PREF, true);
-    info(`Testing: [${title}] in CLOSED mode with showAllAnonymousContent`);
-    const {inspector, tab} = await openInspectorForURL(url.replace(/#MODE#/g, "closed"));
-    await assertMarkupViewAsTree(anonTree, "test-component", inspector);
-    await removeTab(tab);
-    await pushPref(SHOWANON_PREF, false);
-  });
 }
diff --git a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js
index 705696adaa69..a9f876a06837 100644
--- a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js
+++ b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_01.js
@@ -8,11 +8,9 @@
 
 const TEST_URI = URL_ROOT + "doc_pseudoelement.html";
 const PSEUDO_PREF = "devtools.inspector.show_pseudo_elements";
-const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
 
 add_task(async function() {
   await pushPref(PSEUDO_PREF, true);
-  await pushPref(SHOWANON_PREF, true);
 
   await addTab(TEST_URI);
   const {inspector, view} = await openRuleView();
diff --git a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js
index d984d7c3f038..bef7dfe1a667 100644
--- a/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js
+++ b/devtools/client/inspector/rules/test/browser_rules_pseudo-element_02.js
@@ -7,11 +7,9 @@
 // Test that pseudoelements are displayed correctly in the markup view.
 
 const TEST_URI = URL_ROOT + "doc_pseudoelement.html";
-const SHOWANON_PREF = "devtools.inspector.showAllAnonymousContent";
 
 add_task(async function() {
   await addTab(TEST_URI);
-  await pushPref(SHOWANON_PREF, true);
   const {inspector} = await openRuleView();
 
   const node = await getNodeFront("#topleft", inspector);
diff --git a/devtools/server/actors/inspector/utils.js b/devtools/server/actors/inspector/utils.js
index 3b3ffdc4d723..7a8f1cf5d78d 100644
--- a/devtools/server/actors/inspector/utils.js
+++ b/devtools/server/actors/inspector/utils.js
@@ -60,13 +60,14 @@ function isInXULDocument(el) {
 
 /**
  * This DeepTreeWalker filter skips whitespace text nodes and anonymous
- * content with the exception of ::before and ::after and anonymous content
- * in XUL document (needed to show all elements in the browser toolbox).
+ * content with the exception of ::marker, ::before, and ::after, plus anonymous
+ * content in XUL document (needed to show all elements in the browser toolbox).
  */
 function standardTreeWalkerFilter(node) {
-  // ::before and ::after are native anonymous content, but we always
+  // ::marker, ::before, and ::after are native anonymous content, but we always
   // want to show them
-  if (node.nodeName === "_moz_generated_content_before" ||
+  if (node.nodeName === "_moz_generated_content_marker" ||
+      node.nodeName === "_moz_generated_content_before" ||
       node.nodeName === "_moz_generated_content_after") {
     return nodeFilterConstants.FILTER_ACCEPT;
   }

From c52ebc3ea9a12cd7f428dbd05380720cf493b40d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Tue, 2 Apr 2019 06:07:39 +0000
Subject: [PATCH 28/46] Bug 1540769 - Enable readability-redundant-preprocessor
 r=andi

Differential Revision: https://phabricator.services.mozilla.com/D25630

--HG--
extra : moz-landing-system : lando
---
 tools/clang-tidy/config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/clang-tidy/config.yaml b/tools/clang-tidy/config.yaml
index 69d80c57571e..869c0a84ac42 100644
--- a/tools/clang-tidy/config.yaml
+++ b/tools/clang-tidy/config.yaml
@@ -134,6 +134,7 @@ clang_checkers:
   - name: readability-misleading-indentation
   - name: readability-non-const-parameter
   - name: readability-redundant-control-flow
+  - name: readability-redundant-preprocessor
   - name: readability-redundant-smartptr-get
   - name: readability-redundant-string-cstr
   - name: readability-redundant-string-init

From 8f65480f36e4f9147923685d6025065ac87bf97d Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@mozilla.com>
Date: Tue, 2 Apr 2019 08:30:05 +0000
Subject: [PATCH 29/46] Bug 1540325 - Run clang tools tasks only on try &
 code-review, r=glandium,sylvestre

Differential Revision: https://phabricator.services.mozilla.com/D25562

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/source-test/clang.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/taskcluster/ci/source-test/clang.yml b/taskcluster/ci/source-test/clang.yml
index 646f0861605c..6476b5c9ae23 100644
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -1,4 +1,9 @@
 job-defaults:
+    # Run only on try and code-review tasks
+    # to avoid running clang tools on the whole codebase
+    run-on-projects:
+      - try
+
     platform: linux64/opt
     attributes:
         code-review: true

From 3c8351815ed1c14dd8c633ee0186e8419a5916d2 Mon Sep 17 00:00:00 2001
From: Thomas Nguyen <tnguyen@mozilla.com>
Date: Tue, 2 Apr 2019 08:53:28 +0000
Subject: [PATCH 30/46] Bug 1539408 Pass referrerInfo to
 gContextMenuContentData in non-remote r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D25419

--HG--
extra : moz-landing-system : lando
---
 browser/actors/ContextMenuChild.jsm    | 14 ++++++++++++++
 browser/base/content/utilityOverlay.js |  3 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm
index 88e260528281..9755dfc78c8c 100644
--- a/browser/actors/ContextMenuChild.jsm
+++ b/browser/actors/ContextMenuChild.jsm
@@ -32,6 +32,11 @@ XPCOMUtils.defineLazyGetter(this, "PageMenuChild", () => {
   return new tmp.PageMenuChild();
 });
 
+XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () =>
+  Components.Constructor("@mozilla.org/referrer-info;1",
+                         "nsIReferrerInfo",
+                         "init"));
+
 const messageListeners = {
   "ContextMenu:BookmarkFrame": function(aMessage) {
     let frame = this.getTarget(aMessage).ownerDocument;
@@ -602,6 +607,15 @@ class ContextMenuChild extends ActorChild {
 
       data.context.targetAsCPOW = targetAsCPOW;
 
+      data.referrerInfo = new ReferrerInfo(
+        referrerPolicy,
+        !context.linkHasNoReferrer,
+        data.documentURIObject);
+      data.frameReferrerInfo = new ReferrerInfo(
+        referrerPolicy,
+        !context.linkHasNoReferrer,
+        referrer ? Services.io.newURI(referrer) : null);
+
       mainWin.setContextMenuContentData(data);
     }
   }
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 953bbca243a3..2369f20a32bb 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -314,8 +314,7 @@ function openLinkIn(url, where, params) {
   var aAllowThirdPartyFixup = params.allowThirdPartyFixup;
   var aPostData             = params.postData;
   var aCharset              = params.charset;
-  var aReferrerInfo       = ("referrerInfo" in params)
-    ? params.referrerInfo
+  var aReferrerInfo       = params.referrerInfo ? params.referrerInfo
     : new ReferrerInfo(Ci.nsIHttpChannel.REFERRER_POLICY_UNSET, true, null);
   var aRelatedToCurrent     = params.relatedToCurrent;
   var aAllowInheritPrincipal = !!params.allowInheritPrincipal;

From a99fa2c128cd6c863b4cd6dae562a25df72b47cd Mon Sep 17 00:00:00 2001
From: Narcis Beleuzu <nbeleuzu@mozilla.com>
Date: Tue, 2 Apr 2019 12:29:16 +0300
Subject: [PATCH 31/46] Backed out changeset 9b9c50876092 (bug 1540325) for
 Linting failure on clang.yml. CLOSED TREE

---
 taskcluster/ci/source-test/clang.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/taskcluster/ci/source-test/clang.yml b/taskcluster/ci/source-test/clang.yml
index 6476b5c9ae23..646f0861605c 100644
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -1,9 +1,4 @@
 job-defaults:
-    # Run only on try and code-review tasks
-    # to avoid running clang tools on the whole codebase
-    run-on-projects:
-      - try
-
     platform: linux64/opt
     attributes:
         code-review: true

From df684f89db62fbc2bc557f83457a41acdb1a203f Mon Sep 17 00:00:00 2001
From: Jonas Allmann <jallmann@mozilla.com>
Date: Tue, 2 Apr 2019 08:56:25 +0000
Subject: [PATCH 32/46] Bug 1498569, Replace wizard.xml attributes with event
 listeners, r=Gijs

* Removed all occurences of custom onwizard* attributes.
* Removed custom handler code from wizard.xml.
* Updated eval()-usage whitelist.

Differential Revision: https://phabricator.services.mozilla.com/D24033

--HG--
extra : moz-landing-system : lando
---
 .../components/migration/content/migration.js | 19 ++++++++--
 .../migration/content/migration.xul           | 21 +++-------
 modules/libpref/init/all.js                   |  2 +-
 toolkit/content/widgets/wizard.xml            | 13 +------
 toolkit/mozapps/update/content/updates.js     | 24 ++++++++++++
 toolkit/mozapps/update/content/updates.xul    | 38 ++++++-------------
 .../profile/content/createProfileWizard.js    | 11 +++---
 .../profile/content/createProfileWizard.xul   |  5 +--
 8 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
index 10f9b487cd57..fdc5324dd7ac 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -50,6 +50,20 @@ var MigrationWizard = { /* exported MigrationWizard */
       }
     }
 
+    document.addEventListener("wizardcancel", function() { MigrationWizard.onWizardCancel(); });
+
+    document.getElementById("selectProfile").addEventListener("pageshow", function() { MigrationWizard.onSelectProfilePageShow(); });
+    document.getElementById("importItems").addEventListener("pageshow", function() { MigrationWizard.onImportItemsPageShow(); });
+    document.getElementById("migrating").addEventListener("pageshow", function() { MigrationWizard.onMigratingPageShow(); });
+    document.getElementById("done").addEventListener("pageshow", function() { MigrationWizard.onDonePageShow(); });
+
+    document.getElementById("selectProfile").addEventListener("pagerewound", function() { MigrationWizard.onSelectProfilePageRewound(); });
+    document.getElementById("importItems").addEventListener("pagerewound", function() { MigrationWizard.onImportItemsPageRewound(); });
+
+    document.getElementById("selectProfile").addEventListener("pageadvanced", function() { MigrationWizard.onSelectProfilePageAdvanced(); });
+    document.getElementById("importItems").addEventListener("pageadvanced", function() { MigrationWizard.onImportItemsPageAdvanced(); });
+    document.getElementById("importSource").addEventListener("pageadvanced", function(e) { MigrationWizard.onImportSourcePageAdvanced(e); });
+
     this.onImportSourcePageShow();
   },
 
@@ -145,7 +159,7 @@ var MigrationWizard = { /* exported MigrationWizard */
     }
   },
 
-  onImportSourcePageAdvanced() {
+  onImportSourcePageAdvanced(event) {
     var newSource = document.getElementById("importSourceGroup").selectedItem.id;
 
     if (newSource == "nothing") {
@@ -155,7 +169,7 @@ var MigrationWizard = { /* exported MigrationWizard */
       Services.telemetry.getHistogramById("FX_MIGRATION_SOURCE_BROWSER")
                         .add(MigrationUtils.getSourceIdForTelemetry("nothing"));
       document.documentElement.cancel();
-      return false;
+      event.preventDefault();
     }
 
     if (!this._migrator || (newSource != this._source)) {
@@ -184,7 +198,6 @@ var MigrationWizard = { /* exported MigrationWizard */
       else
         this._selectedProfile = null;
     }
-    return undefined;
   },
 
   // 2 - [Profile Selection]
diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
index 3f7a88dfaaa8..088853bf4390 100644
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
@@ -15,15 +15,13 @@
         onunload="MigrationWizard.uninit()"
         style="width: 40em;"
         buttons="accept,cancel"
-        branded="true"
-        onwizardcancel="return MigrationWizard.onWizardCancel();">
+        branded="true">
 
   <script type="application/javascript" src="chrome://global/content/customElements.js"/>
   <script type="application/javascript" src="chrome://browser/content/migration/migration.js"/>
 
   <wizardpage id="importSource" pageid="importSource" next="selectProfile"
-              label="&importSource.title;"
-              onpageadvanced="return MigrationWizard.onImportSourcePageAdvanced();">
+              label="&importSource.title;">
 #ifdef XP_WIN
     <description id="importAll" control="importSourceGroup">&importFrom.label;</description>
 #else
@@ -60,10 +58,7 @@
   </wizardpage>
 
   <wizardpage id="selectProfile" pageid="selectProfile" label="&selectProfile.title;"
-              next="importItems"
-              onpageshow="return MigrationWizard.onSelectProfilePageShow();"
-              onpagerewound="return MigrationWizard.onSelectProfilePageRewound();"
-              onpageadvanced="return MigrationWizard.onSelectProfilePageAdvanced();">
+              next="importItems">
     <description control="profiles">&selectProfile.label;</description>
 
     <radiogroup id="profiles" align="left"/>
@@ -71,9 +66,6 @@
 
   <wizardpage id="importItems" pageid="importItems" label="&importItems.title;"
               next="migrating"
-              onpageshow="return MigrationWizard.onImportItemsPageShow();"
-              onpagerewound="return MigrationWizard.onImportItemsPageRewound();"
-              onpageadvanced="return MigrationWizard.onImportItemsPageAdvanced();"
               oncommand="MigrationWizard.onImportItemCommand();">
     <description control="dataSources">&importItems.label;</description>
 
@@ -81,19 +73,16 @@
   </wizardpage>
 
   <wizardpage id="migrating" pageid="migrating" label="&migrating.title;"
-              next="done"
-              onpageshow="MigrationWizard.onMigratingPageShow();">
+              next="done">
     <description control="migratingItems">&migrating.label;</description>
 
     <vbox id="migratingItems" style="overflow: auto;" align="left" role="group"/>
   </wizardpage>
 
-  <wizardpage id="done" pageid="done" label="&done.title;"
-              onpageshow="MigrationWizard.onDonePageShow();">
+  <wizardpage id="done" pageid="done" label="&done.title;">
     <description control="doneItems">&done.label;</description>
 
     <vbox id="doneItems" style="overflow: auto;" align="left" role="group"/>
   </wizardpage>
 
 </wizard>
-
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 840c21cc2eb7..0651680f2559 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2696,7 +2696,7 @@ pref("csp.overrule_about_uris_without_csp_whitelist", false);
 pref("csp.skip_about_page_has_csp_assert", false);
 // assertion flag will be set to false after fixing Bug 1473549
 pref("security.allow_eval_with_system_principal", false);
-pref("security.uris_using_eval_with_system_principal", "autocomplete.xml,redux.js,react-redux.js,content-task.js,content-task.js,tree.xml,dialog.xml,preferencesbindings.js,wizard.xml,lodash.js,jszip.js,sinon-7.2.7.js,ajv-4.1.1.js,updates.js,setup,jsol.js,parent_utils.js,chrometask_chromescript");
+pref("security.uris_using_eval_with_system_principal", "autocomplete.xml,redux.js,react-redux.js,content-task.js,content-task.js,tree.xml,dialog.xml,preferencesbindings.js,lodash.js,jszip.js,sinon-7.2.7.js,ajv-4.1.1.js,updates.js,setup,jsol.js,parent_utils.js,chrometask_chromescript");
 #endif
 
 // Default Content Security Policy to apply to signed contents.
diff --git a/toolkit/content/widgets/wizard.xml b/toolkit/content/widgets/wizard.xml
index 337dda5639ba..7da2295c325e 100644
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -444,18 +444,7 @@
           event.initEvent(aType, true, true);
 
           // handle dom event handlers
-          var noCancel = aTarget.dispatchEvent(event);
-
-          // handle any xml attribute event handlers
-          var handler = aTarget.getAttribute("on"+aType);
-          if (handler != "") {
-            var fn = new Function("event", handler);
-            var returned = fn.apply(aTarget, [event]);
-            if (returned == false)
-              noCancel = false;
-          }
-
-          return noCancel;
+          return aTarget.dispatchEvent(event);
         ]]>
         </body>
       </method>
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index 43e9e0805b94..d5c698721566 100644
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -308,6 +308,30 @@ var gUpdates = {
     this._cacheButtonStrings("extra1");
     this._cacheButtonStrings("extra2");
 
+    document.addEventListener("wizardfinish", function() { gUpdates.onWizardFinish(); });
+    document.addEventListener("wizardcancel", function() { gUpdates.onWizardCancel(); });
+    document.addEventListener("wizardnext", function() { gUpdates.onWizardNext(); });
+
+    document.getElementById("checking").addEventListener("pageshow", function() { gCheckingPage.onPageShow(); });
+    document.getElementById("noupdatesfound").addEventListener("pageshow", function() { gNoUpdatesPage.onPageShow(); });
+    document.getElementById("manualUpdate").addEventListener("pageshow", function() { gManualUpdatePage.onPageShow(); });
+    document.getElementById("unsupported").addEventListener("pageshow", function() { gUnsupportedPage.onPageShow(); });
+    document.getElementById("updatesfoundbasic").addEventListener("pageshow", function() { gUpdatesFoundBasicPage.onPageShow(); });
+    document.getElementById("downloading").addEventListener("pageshow", function() { gDownloadingPage.onPageShow(); });
+    document.getElementById("errors").addEventListener("pageshow", function() { gErrorsPage.onPageShow(); });
+    document.getElementById("errorextra").addEventListener("pageshow", function() { gErrorExtraPage.onPageShow(); });
+    document.getElementById("errorpatching").addEventListener("pageshow", function() { gErrorPatchingPage.onPageShow(); });
+    document.getElementById("finished").addEventListener("pageshow", function() { gFinishedPage.onPageShow(); });
+    document.getElementById("finishedBackground").addEventListener("pageshow", function() { gFinishedPage.onPageShowBackground(); });
+
+    document.getElementById("updatesfoundbasic").addEventListener("extra1", function() { gUpdatesFoundBasicPage.onExtra1(); });
+    document.getElementById("downloading").addEventListener("extra1", function() { gDownloadingPage.onHide(); });
+    document.getElementById("finished").addEventListener("extra1", function() { gFinishedPage.onExtra1(); });
+    document.getElementById("finishedBackground").addEventListener("extra1", function() { gFinishedPage.onExtra1(); });
+
+    document.getElementById("updatesfoundbasic").addEventListener("extra2", function() { gUpdatesFoundBasicPage.onExtra2(); });
+    document.getElementById("finishedBackground").addEventListener("extra2", function() { gFinishedPage.onExtra2(); });
+
     // Advance to the Start page.
     this.getStartPageID(function(startPageID) {
       LOG("gUpdates", "onLoad - setting current page to startpage " + startPageID);
diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul
index b044403f8bb7..b5f959d5cce8 100644
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@@ -24,9 +24,6 @@
         title="&updateWizard.title;"
         windowtype="Update:Wizard"
         style="width: auto; height: auto"
-        onwizardfinish="gUpdates.onWizardFinish();"
-        onwizardcancel="gUpdates.onWizardCancel();"
-        onwizardnext="gUpdates.onWizardNext();"
         onload="gUpdates.onLoad();"
         onunload="gUpdates.onUnload();">
 
@@ -47,7 +44,7 @@
   <wizardpage id="dummy" pageid="dummy" firstpage="true"/>
 
   <wizardpage id="checking" pageid="checking" next="noupdatesfound"
-              object="gCheckingPage" onpageshow="gCheckingPage.onPageShow();">
+              object="gCheckingPage">
     <updateheader label="&checking.title;"/>
     <vbox class="update-content" flex="1">
       <label>&updateCheck.label;</label>
@@ -57,7 +54,7 @@
   </wizardpage>
 
   <wizardpage id="noupdatesfound" pageid="noupdatesfound"
-              object="gNoUpdatesPage" onpageshow="gNoUpdatesPage.onPageShow();">
+              object="gNoUpdatesPage">
     <updateheader label="&noupdatesfound.title;"/>
     <vbox class="update-content" flex="1">
       <label id="noUpdatesAutoEnabled" hidden="true">&noupdatesautoenabled.intro;</label>
@@ -65,8 +62,7 @@
     </vbox>
   </wizardpage>
 
-  <wizardpage id="manualUpdate" pageid="manualUpdate" object="gManualUpdatePage"
-              onpageshow="gManualUpdatePage.onPageShow();">
+  <wizardpage id="manualUpdate" pageid="manualUpdate" object="gManualUpdatePage">
     <updateheader label="&manualUpdate.title;"/>
     <vbox class="update-content" flex="1">
       <label id="manualUpdateDesc">&manualUpdate.desc;</label>
@@ -82,8 +78,7 @@
   </wizardpage>
 
   <wizardpage id="unsupported" pageid="unsupported"
-              object="gUnsupportedPage"
-              onpageshow="gUnsupportedPage.onPageShow();">
+              object="gUnsupportedPage">
     <updateheader label="&unsupported.title;"/>
     <vbox class="update-content" flex="1">
       <description flex="1">&unsupported.label;
@@ -95,10 +90,7 @@
   </wizardpage>
 
   <wizardpage id="updatesfoundbasic" pageid="updatesfoundbasic"
-              object="gUpdatesFoundBasicPage" next="downloading"
-              onpageshow="gUpdatesFoundBasicPage.onPageShow();"
-              onextra1="gUpdatesFoundBasicPage.onExtra1();"
-              onextra2="gUpdatesFoundBasicPage.onExtra2();">
+              object="gUpdatesFoundBasicPage" next="downloading">
     <updateheader id="updatesFoundBasicHeader" label=""/>
     <vbox class="update-content" flex="1">
       <label id="updatesFoundInto"/>
@@ -117,8 +109,7 @@
   </wizardpage>
 
   <wizardpage id="downloading" pageid="downloading"
-              object="gDownloadingPage" onextra1="gDownloadingPage.onHide();"
-              onpageshow="gDownloadingPage.onPageShow();">
+              object="gDownloadingPage">
     <updateheader label="&downloadPage.title;"/>
     <vbox class="update-content" flex="1">
       <hbox id="downloadStatusProgress">
@@ -138,8 +129,7 @@
     </vbox>
   </wizardpage>
 
-  <wizardpage id="errors" pageid="errors" object="gErrorsPage"
-              onpageshow="gErrorsPage.onPageShow();">
+  <wizardpage id="errors" pageid="errors" object="gErrorsPage">
     <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label id="errorIntro">&error.label;</label>
@@ -155,8 +145,7 @@
   </wizardpage>
 
   <wizardpage id="errorextra" pageid="errorextra"
-              object="gErrorExtraPage"
-              onpageshow="gErrorExtraPage.onPageShow();">
+              object="gErrorExtraPage">
     <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label id="bgErrorLabel">&genericBackgroundError.label;</label>
@@ -168,17 +157,14 @@
   </wizardpage>
 
   <wizardpage id="errorpatching" pageid="errorpatching" next="downloading"
-              object="gErrorPatchingPage"
-              onpageshow="gErrorPatchingPage.onPageShow();">
+              object="gErrorPatchingPage">
     <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label>&errorpatching.intro;</label>
     </vbox>
   </wizardpage>
 
-  <wizardpage id="finished" pageid="finished" object="gFinishedPage"
-              onpageshow="gFinishedPage.onPageShow();"
-              onextra1="gFinishedPage.onExtra1()">
+  <wizardpage id="finished" pageid="finished" object="gFinishedPage">
     <updateheader label="&finishedPage.title;"/>
     <vbox class="update-content" flex="1">
       <label>&finishedPage.text;</label>
@@ -186,9 +172,7 @@
   </wizardpage>
 
   <wizardpage id="finishedBackground" pageid="finishedBackground"
-              object="gFinishedPage" onextra1="gFinishedPage.onExtra1()"
-              onextra2="gFinishedPage.onExtra2()"
-              onpageshow="gFinishedPage.onPageShowBackground();">
+              object="gFinishedPage">
     <updateheader label="&finishedPage.title;"/>
     <vbox class="update-content" flex="1">
       <label>&finishedBackgroundPage.text;</label>
diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js
index f79a03820313..a2f4fdf86f3b 100644
--- a/toolkit/profile/content/createProfileWizard.js
+++ b/toolkit/profile/content/createProfileWizard.js
@@ -31,6 +31,9 @@ function initWizard() {
 
     // Initialize the profile location display.
     gProfileDisplay = document.getElementById("profileDisplay").firstChild;
+    document.addEventListener("wizardfinish", onFinish);
+    document.getElementById("explanation").addEventListener("pageshow", enableNextButton);
+    document.getElementById("createProfile").addEventListener("pageshow", initSecondWizardPage);
     setDisplayToDefaultFolder();
   } catch (e) {
     window.close();
@@ -169,7 +172,7 @@ function enableNextButton() {
   document.documentElement.canAdvance = true;
 }
 
-function onFinish() {
+function onFinish(event) {
   var profileName = document.getElementById("profileName").value;
   var profile;
 
@@ -184,7 +187,8 @@ function onFinish() {
     Services.prompt.alert(window, profileCreationFailedTitle,
                           profileCreationFailed + "\n" + e);
 
-    return false;
+    event.preventDefault();
+    return;
   }
 
   // window.opener is false if the Create Profile Wizard was opened from the
@@ -199,7 +203,4 @@ function onFinish() {
     var dialogParams = window.arguments[0].QueryInterface(I.nsIDialogParamBlock);
     dialogParams.objects.insertElementAt(profileLock, 0);
   }
-
-  // Exit the wizard.
-  return true;
 }
diff --git a/toolkit/profile/content/createProfileWizard.xul b/toolkit/profile/content/createProfileWizard.xul
index 10324a3586a2..335a717455b7 100644
--- a/toolkit/profile/content/createProfileWizard.xul
+++ b/toolkit/profile/content/createProfileWizard.xul
@@ -17,7 +17,6 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onwizardfinish="return onFinish();"
         onload="initWizard();"
         style="&window.size;">
   <script type="application/javascript"
@@ -28,7 +27,7 @@
 
   <script type="application/javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/>
 
-  <wizardpage id="explanation" onpageshow="enableNextButton();">
+  <wizardpage id="explanation">
     <description>&profileCreationExplanation_1.text;</description>
     <description>&profileCreationExplanation_2.text;</description>
     <description>&profileCreationExplanation_3.text;</description>
@@ -44,7 +43,7 @@
 #endif
   </wizardpage>
 
-  <wizardpage id="createProfile" onpageshow="initSecondWizardPage();">
+  <wizardpage id="createProfile">
     <description>&profileCreationIntro.text;</description> 
 
     <label accesskey="&profilePrompt.accesskey;" control="ProfileName">&profilePrompt.label;</label> 

From 2059353ba30aa219a8322ab5bdab3d1c87af4a29 Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@mozilla.com>
Date: Tue, 2 Apr 2019 09:38:56 +0000
Subject: [PATCH 33/46] Bug 1540325 - Run clang tools tasks only on try &
 code-review, r=glandium,sylvestre

Differential Revision: https://phabricator.services.mozilla.com/D25562

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/source-test/clang.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/taskcluster/ci/source-test/clang.yml b/taskcluster/ci/source-test/clang.yml
index 646f0861605c..84517ed5bf9d 100644
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -1,4 +1,9 @@
 job-defaults:
+    # Run only on try and code-review tasks
+    # to avoid running clang tools on the whole codebase
+    run-on-projects:
+        - try
+
     platform: linux64/opt
     attributes:
         code-review: true

From 1eafec159b0ebc856974475f0cbee2824ce43026 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Tue, 2 Apr 2019 09:16:43 +0000
Subject: [PATCH 34/46] Bug 1501310 - Move Baseline IC fallback code from
 JitRealm to JitRuntime. r=tcampbell

Fallback code is now generated (as a single JitCode instance) when we create the
JitRuntime.

In ICScript::Create we can now allocate the fallback stubs directly (we no
longer need a Compiler class for each fallback stub) because we no longer have
to handle the compile-code case.

Differential Revision: https://phabricator.services.mozilla.com/D24360

--HG--
extra : moz-landing-system : lando
---
 js/src/jit/BaselineBailouts.cpp |  13 +-
 js/src/jit/BaselineIC.cpp       | 460 ++++++++++++++++++----------
 js/src/jit/BaselineIC.h         | 525 ++++++--------------------------
 js/src/jit/BaselineICList.h     |  39 ++-
 js/src/jit/Ion.cpp              |  30 +-
 js/src/jit/JitRealm.h           |  98 ++++--
 6 files changed, 510 insertions(+), 655 deletions(-)

diff --git a/js/src/jit/BaselineBailouts.cpp b/js/src/jit/BaselineBailouts.cpp
index 9a7e146ee6f8..c4e8ef94cc52 100644
--- a/js/src/jit/BaselineBailouts.cpp
+++ b/js/src/jit/BaselineBailouts.cpp
@@ -442,24 +442,25 @@ static inline bool IsInlinableFallback(ICFallbackStub* icEntry) {
 #endif
 
 static inline void* GetStubReturnAddress(JSContext* cx, jsbytecode* pc) {
-  JitRealm* jitRealm = cx->realm()->jitRealm();
+  const BaselineICFallbackCode& code =
+      cx->runtime()->jitRuntime()->baselineICFallbackCode();
 
   if (IsGetPropPC(pc)) {
-    return jitRealm->bailoutReturnAddr(BailoutReturnStub::GetProp);
+    return code.bailoutReturnAddr(BailoutReturnKind::GetProp);
   }
   if (IsSetPropPC(pc)) {
-    return jitRealm->bailoutReturnAddr(BailoutReturnStub::SetProp);
+    return code.bailoutReturnAddr(BailoutReturnKind::SetProp);
   }
   if (IsGetElemPC(pc)) {
-    return jitRealm->bailoutReturnAddr(BailoutReturnStub::GetElem);
+    return code.bailoutReturnAddr(BailoutReturnKind::GetElem);
   }
 
   // This should be a call op of some kind, now.
   MOZ_ASSERT(IsCallPC(pc) && !IsSpreadCallPC(pc));
   if (IsConstructorCallPC(pc)) {
-    return jitRealm->bailoutReturnAddr(BailoutReturnStub::New);
+    return code.bailoutReturnAddr(BailoutReturnKind::New);
   }
-  return jitRealm->bailoutReturnAddr(BailoutReturnStub::Call);
+  return code.bailoutReturnAddr(BailoutReturnKind::Call);
 }
 
 static inline jsbytecode* GetNextNonLoopEntryPc(jsbytecode* pc,
diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index 6aea77d6b763..c33a9d086f42 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -36,6 +36,7 @@
 #include "vm/Opcodes.h"
 #include "vm/SelfHosting.h"
 #include "vm/TypedArrayObject.h"
+#include "vtune/VTuneWrapper.h"
 
 #include "builtin/Boolean-inl.h"
 
@@ -54,6 +55,26 @@ using mozilla::DebugOnly;
 namespace js {
 namespace jit {
 
+// Class used to emit all Baseline IC fallback code when initializing the
+// JitRuntime.
+class MOZ_RAII FallbackICCodeCompiler final : public ICStubCompilerBase {
+  BaselineICFallbackCode& code;
+  MacroAssembler& masm;
+
+  MOZ_MUST_USE bool emitCall(bool isSpread, bool isConstructing);
+  MOZ_MUST_USE bool emitGetElem(bool hasReceiver);
+  MOZ_MUST_USE bool emitGetProp(bool hasReceiver);
+
+ public:
+  FallbackICCodeCompiler(JSContext* cx, BaselineICFallbackCode& code,
+                         MacroAssembler& masm)
+      : ICStubCompilerBase(cx), code(code), masm(masm) {}
+
+#define DEF_METHOD(kind) MOZ_MUST_USE bool emit_##kind();
+  IC_BASELINE_FALLBACK_CODE_KIND_LIST(DEF_METHOD)
+#undef DEF_METHOD
+};
+
 #ifdef JS_JITSPEW
 void FallbackICSpew(JSContext* cx, ICFallbackStub* stub, const char* fmt, ...) {
   if (JitSpewEnabled(JitSpew_BaselineICFallback)) {
@@ -108,14 +129,39 @@ void ICEntry::trace(JSTracer* trc) {
   }
 }
 
+// Allocator for Baseline IC fallback stubs. These stubs use trampoline code
+// stored in JitRuntime.
+class MOZ_RAII FallbackStubAllocator {
+  JSContext* cx_;
+  ICStubSpace& stubSpace_;
+  const BaselineICFallbackCode& code_;
+
+ public:
+  FallbackStubAllocator(JSContext* cx, ICStubSpace& stubSpace)
+      : cx_(cx),
+        stubSpace_(stubSpace),
+        code_(cx->runtime()->jitRuntime()->baselineICFallbackCode()) {}
+
+  template <typename T, typename... Args>
+  T* newStub(BaselineICFallbackKind kind, Args&&... args) {
+    TrampolinePtr addr = code_.addr(kind);
+    return ICStub::NewFallback<T>(cx_, &stubSpace_, addr,
+                                  std::forward<Args>(args)...);
+  }
+};
+
 /* static */
 UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
   MOZ_ASSERT(cx->realm()->jitRealm());
   MOZ_ASSERT(jit::IsBaselineEnabled(cx));
 
   FallbackICStubSpace stubSpace;
+  FallbackStubAllocator alloc(cx, stubSpace);
+
   js::Vector<ICEntry, 16, SystemAllocPolicy> icEntries;
 
+  using Kind = BaselineICFallbackKind;
+
   auto addIC = [cx, &icEntries, script](jsbytecode* pc, ICStub* stub) {
     if (!stub) {
       MOZ_ASSERT(cx->isExceptionPending());
@@ -133,14 +179,16 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
   // Note: we pass a nullptr pc to indicate this is a non-op IC.
   // See ICEntry::NonOpPCOffset.
   if (JSFunction* fun = script->functionNonDelazifying()) {
-    ICTypeMonitor_Fallback::Compiler compiler(cx, uint32_t(0));
-    if (!addIC(nullptr, compiler.getStub(&stubSpace))) {
+    ICStub* stub =
+        alloc.newStub<ICTypeMonitor_Fallback>(Kind::TypeMonitor, nullptr, 0);
+    if (!addIC(nullptr, stub)) {
       return nullptr;
     }
 
     for (size_t i = 0; i < fun->nargs(); i++) {
-      ICTypeMonitor_Fallback::Compiler compiler(cx, i + 1);
-      if (!addIC(nullptr, compiler.getStub(&stubSpace))) {
+      ICStub* stub = alloc.newStub<ICTypeMonitor_Fallback>(Kind::TypeMonitor,
+                                                           nullptr, i + 1);
+      if (!addIC(nullptr, stub)) {
         return nullptr;
       }
     }
@@ -166,8 +214,8 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_OR:
       case JSOP_IFEQ:
       case JSOP_IFNE: {
-        ICToBool_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICToBool_Fallback>(Kind::ToBool);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -176,8 +224,8 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_NEG:
       case JSOP_INC:
       case JSOP_DEC: {
-        ICUnaryArith_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICUnaryArith_Fallback>(Kind::UnaryArith);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -194,8 +242,8 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_DIV:
       case JSOP_MOD:
       case JSOP_POW: {
-        ICBinaryArith_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICBinaryArith_Fallback>(Kind::BinaryArith);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -208,15 +256,16 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_GE:
       case JSOP_STRICTEQ:
       case JSOP_STRICTNE: {
-        ICCompare_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICCompare_Fallback>(Kind::Compare);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_LOOPENTRY: {
-        ICWarmUpCounter_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub =
+            alloc.newStub<ICWarmUpCounter_Fallback>(Kind::WarmUpCounter);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -227,16 +276,17 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
         if (!group) {
           return nullptr;
         }
-        ICNewArray_Fallback::Compiler stubCompiler(cx, group);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub =
+            alloc.newStub<ICNewArray_Fallback>(Kind::NewArray, group);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_NEWOBJECT:
       case JSOP_NEWINIT: {
-        ICNewObject_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICNewObject_Fallback>(Kind::NewObject);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -247,8 +297,8 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_INITELEM_INC:
       case JSOP_SETELEM:
       case JSOP_STRICTSETELEM: {
-        ICSetElem_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICSetElem_Fallback>(Kind::SetElem);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -263,8 +313,8 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_STRICTSETNAME:
       case JSOP_SETGNAME:
       case JSOP_STRICTSETGNAME: {
-        ICSetProp_Fallback::Compiler compiler(cx);
-        if (!addIC(pc, compiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICSetProp_Fallback>(Kind::SetProp);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -272,66 +322,78 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_GETPROP:
       case JSOP_CALLPROP:
       case JSOP_LENGTH:
-      case JSOP_GETPROP_SUPER:
       case JSOP_GETBOUNDNAME: {
-        bool hasReceiver = (op == JSOP_GETPROP_SUPER);
-        ICGetProp_Fallback::Compiler compiler(cx, hasReceiver);
-        if (!addIC(pc, compiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICGetProp_Fallback>(Kind::GetProp);
+        if (!addIC(pc, stub)) {
+          return nullptr;
+        }
+        break;
+      }
+      case JSOP_GETPROP_SUPER: {
+        ICStub* stub = alloc.newStub<ICGetProp_Fallback>(Kind::GetPropSuper);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_GETELEM:
-      case JSOP_CALLELEM:
+      case JSOP_CALLELEM: {
+        ICStub* stub = alloc.newStub<ICGetElem_Fallback>(Kind::GetElem);
+        if (!addIC(pc, stub)) {
+          return nullptr;
+        }
+        break;
+      }
       case JSOP_GETELEM_SUPER: {
-        bool hasReceiver = (op == JSOP_GETELEM_SUPER);
-        ICGetElem_Fallback::Compiler stubCompiler(cx, hasReceiver);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICGetElem_Fallback>(Kind::GetElemSuper);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_IN: {
-        ICIn_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICIn_Fallback>(Kind::In);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_HASOWN: {
-        ICHasOwn_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICHasOwn_Fallback>(Kind::HasOwn);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_GETNAME:
       case JSOP_GETGNAME: {
-        ICGetName_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICGetName_Fallback>(Kind::GetName);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_BINDNAME:
       case JSOP_BINDGNAME: {
-        ICBindName_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICBindName_Fallback>(Kind::BindName);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_GETALIASEDVAR:
       case JSOP_GETIMPORT: {
-        ICTypeMonitor_Fallback::Compiler compiler(cx, nullptr);
-        if (!addIC(pc, compiler.getStub(&stubSpace))) {
+        ICStub* stub =
+            alloc.newStub<ICTypeMonitor_Fallback>(Kind::TypeMonitor, nullptr);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_GETINTRINSIC: {
-        ICGetIntrinsic_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub =
+            alloc.newStub<ICGetIntrinsic_Fallback>(Kind::GetIntrinsic);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -339,54 +401,60 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
       case JSOP_CALL:
       case JSOP_CALL_IGNORES_RV:
       case JSOP_CALLITER:
-      case JSOP_SUPERCALL:
       case JSOP_FUNCALL:
       case JSOP_FUNAPPLY:
-      case JSOP_NEW:
       case JSOP_EVAL:
       case JSOP_STRICTEVAL: {
-        bool construct = JSOp(*pc) == JSOP_NEW || JSOp(*pc) == JSOP_SUPERCALL;
-        ICCall_Fallback::Compiler stubCompiler(cx,
-                                               /* isConstructing = */ construct,
-                                               /* isSpread = */ false);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICCall_Fallback>(Kind::Call);
+        if (!addIC(pc, stub)) {
+          return nullptr;
+        }
+        break;
+      }
+      case JSOP_SUPERCALL:
+      case JSOP_NEW: {
+        ICStub* stub = alloc.newStub<ICCall_Fallback>(Kind::CallConstructing);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_SPREADCALL:
-      case JSOP_SPREADSUPERCALL:
-      case JSOP_SPREADNEW:
       case JSOP_SPREADEVAL:
       case JSOP_STRICTSPREADEVAL: {
-        bool construct =
-            JSOp(*pc) == JSOP_SPREADNEW || JSOp(*pc) == JSOP_SPREADSUPERCALL;
-        ICCall_Fallback::Compiler stubCompiler(cx,
-                                               /* isConstructing = */ construct,
-                                               /* isSpread = */ true);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICCall_Fallback>(Kind::SpreadCall);
+        if (!addIC(pc, stub)) {
+          return nullptr;
+        }
+        break;
+      }
+      case JSOP_SPREADSUPERCALL:
+      case JSOP_SPREADNEW: {
+        ICStub* stub =
+            alloc.newStub<ICCall_Fallback>(Kind::SpreadCallConstructing);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_INSTANCEOF: {
-        ICInstanceOf_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICInstanceOf_Fallback>(Kind::InstanceOf);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_TYPEOF:
       case JSOP_TYPEOFEXPR: {
-        ICTypeOf_Fallback::Compiler stubCompiler(cx);
-        if (!addIC(pc, stubCompiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICTypeOf_Fallback>(Kind::TypeOf);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
       }
       case JSOP_ITER: {
-        ICGetIterator_Fallback::Compiler compiler(cx);
-        if (!addIC(pc, compiler.getStub(&stubSpace))) {
+        ICStub* stub = alloc.newStub<ICGetIterator_Fallback>(Kind::GetIterator);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -398,8 +466,9 @@ UniquePtr<ICScript> ICScript::create(JSContext* cx, JSScript* script) {
         if (!templateObject) {
           return nullptr;
         }
-        ICRest_Fallback::Compiler compiler(cx, templateObject);
-        if (!addIC(pc, compiler.getStub(&stubSpace))) {
+        ICStub* stub =
+            alloc.newStub<ICRest_Fallback>(Kind::Rest, templateObject);
+        if (!addIC(pc, stub)) {
           return nullptr;
         }
         break;
@@ -504,11 +573,6 @@ bool ICStub::makesGCCalls() const {
   }
 }
 
-void ICStub::traceCode(JSTracer* trc, const char* name) {
-  JitCode* stubJitCode = jitCode();
-  TraceManuallyBarrieredEdge(trc, &stubJitCode, name);
-}
-
 void ICStub::updateCode(JitCode* code) {
   // Write barrier on the old code.
   JitCode::writeBarrierPre(jitCode());
@@ -517,7 +581,11 @@ void ICStub::updateCode(JitCode* code) {
 
 /* static */
 void ICStub::trace(JSTracer* trc) {
-  traceCode(trc, "shared-stub-jitcode");
+  // Fallback stubs use runtime-wide trampoline code we don't need to trace.
+  if (!usesTrampolineCode()) {
+    JitCode* stubJitCode = jitCode();
+    TraceManuallyBarrieredEdge(trc, &stubJitCode, "baseline-ic-stub-code");
+  }
 
   // If the stub is a monitored fallback stub, then trace the monitor ICs
   // hanging off of that stub.  We don't need to worry about the regular
@@ -781,8 +849,7 @@ bool DoWarmUpCounterFallbackOSR(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICWarmUpCounter_Fallback::Compiler::generateStubCode(
-    MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_WarmUpCounter() {
   // Push a stub frame so that we can perform a non-tail call.
   enterStubFrame(masm, R1.scratchReg());
 
@@ -1005,12 +1072,14 @@ bool ICMonitoredFallbackStub::initMonitoringChain(JSContext* cx,
                                                   JSScript* script) {
   MOZ_ASSERT(fallbackMonitorStub_ == nullptr);
 
-  ICTypeMonitor_Fallback::Compiler compiler(cx, this);
   ICStubSpace* space = script->icScript()->fallbackStubSpace();
-  ICTypeMonitor_Fallback* stub = compiler.getStub(space);
+  FallbackStubAllocator alloc(cx, *space);
+  auto* stub = alloc.newStub<ICTypeMonitor_Fallback>(
+      BaselineICFallbackKind::TypeMonitor, this);
   if (!stub) {
     return false;
   }
+
   fallbackMonitorStub_ = stub;
   return true;
 }
@@ -1030,8 +1099,9 @@ bool ICMonitoredFallbackStub::addMonitorStubForValue(JSContext* cx,
 bool ICUpdatedStub::initUpdatingChain(JSContext* cx, ICStubSpace* space) {
   MOZ_ASSERT(firstUpdateStub_ == nullptr);
 
-  ICTypeUpdate_Fallback::Compiler compiler(cx);
-  ICTypeUpdate_Fallback* stub = compiler.getStub(space);
+  FallbackStubAllocator alloc(cx, *space);
+  auto* stub =
+      alloc.newStub<ICTypeUpdate_Fallback>(BaselineICFallbackKind::TypeUpdate);
   if (!stub) {
     return false;
   }
@@ -1049,6 +1119,17 @@ ICStubSpace* ICStubCompiler::StubSpaceForStub(bool makesGCCalls,
   return script->zone()->jitZone()->optimizedStubSpace();
 }
 
+static void InitMacroAssemblerForICStub(StackMacroAssembler& masm) {
+#ifndef JS_USE_LINK_REGISTER
+  // The first value contains the return addres,
+  // which we pull into ICTailCallReg for tail calls.
+  masm.adjustFrame(sizeof(intptr_t));
+#endif
+#ifdef JS_CODEGEN_ARM
+  masm.setSecondScratchReg(BaselineSecondScratchReg);
+#endif
+}
+
 JitCode* ICStubCompiler::getStubCode() {
   JitRealm* realm = cx->realm()->jitRealm();
 
@@ -1062,14 +1143,7 @@ JitCode* ICStubCompiler::getStubCode() {
   // Compile new stubcode.
   JitContext jctx(cx, nullptr);
   StackMacroAssembler masm;
-#ifndef JS_USE_LINK_REGISTER
-  // The first value contains the return addres,
-  // which we pull into ICTailCallReg for tail calls.
-  masm.adjustFrame(sizeof(intptr_t));
-#endif
-#ifdef JS_CODEGEN_ARM
-  masm.setSecondScratchReg(BaselineSecondScratchReg);
-#endif
+  InitMacroAssemblerForICStub(masm);
 
   if (!generateStubCode(masm)) {
     return nullptr;
@@ -1085,10 +1159,6 @@ JitCode* ICStubCompiler::getStubCode() {
     return nullptr;
   }
 
-  // After generating code, run postGenerateStubCode().  We must not fail
-  // after this point.
-  postGenerateStubCode(masm, newStubCode);
-
   MOZ_ASSERT(entersStubFrame_ == ICStub::NonCacheIRStubMakesGCCalls(kind));
   MOZ_ASSERT(!inStubFrame_);
 
@@ -1099,8 +1169,8 @@ JitCode* ICStubCompiler::getStubCode() {
   return newStubCode;
 }
 
-bool ICStubCompiler::tailCallVMInternal(MacroAssembler& masm,
-                                        TailCallVMFunctionId id) {
+bool ICStubCompilerBase::tailCallVMInternal(MacroAssembler& masm,
+                                            TailCallVMFunctionId id) {
   TrampolinePtr code = cx->runtime()->jitRuntime()->getVMWrapper(id);
   const VMFunctionData& fun = GetVMFunction(id);
   MOZ_ASSERT(fun.expectTailCall == TailCall);
@@ -1109,7 +1179,7 @@ bool ICStubCompiler::tailCallVMInternal(MacroAssembler& masm,
   return true;
 }
 
-bool ICStubCompiler::callVMInternal(MacroAssembler& masm, VMFunctionId id) {
+bool ICStubCompilerBase::callVMInternal(MacroAssembler& masm, VMFunctionId id) {
   MOZ_ASSERT(inStubFrame_);
 
   TrampolinePtr code = cx->runtime()->jitRuntime()->getVMWrapper(id);
@@ -1120,18 +1190,19 @@ bool ICStubCompiler::callVMInternal(MacroAssembler& masm, VMFunctionId id) {
 }
 
 template <typename Fn, Fn fn>
-bool ICStubCompiler::callVM(MacroAssembler& masm) {
+bool ICStubCompilerBase::callVM(MacroAssembler& masm) {
   VMFunctionId id = VMFunctionToId<Fn, fn>::id;
   return callVMInternal(masm, id);
 }
 
 template <typename Fn, Fn fn>
-bool ICStubCompiler::tailCallVM(MacroAssembler& masm) {
+bool ICStubCompilerBase::tailCallVM(MacroAssembler& masm) {
   TailCallVMFunctionId id = TailCallVMFunctionToId<Fn, fn>::id;
   return tailCallVMInternal(masm, id);
 }
 
-void ICStubCompiler::enterStubFrame(MacroAssembler& masm, Register scratch) {
+void ICStubCompilerBase::enterStubFrame(MacroAssembler& masm,
+                                        Register scratch) {
   EmitBaselineEnterStubFrame(masm, scratch);
 #ifdef DEBUG
   framePushedAtEnterStubFrame_ = masm.framePushed();
@@ -1145,7 +1216,7 @@ void ICStubCompiler::enterStubFrame(MacroAssembler& masm, Register scratch) {
 #endif
 }
 
-void ICStubCompiler::assumeStubFrame() {
+void ICStubCompilerBase::assumeStubFrame() {
   MOZ_ASSERT(!inStubFrame_);
   inStubFrame_ = true;
 
@@ -1158,7 +1229,8 @@ void ICStubCompiler::assumeStubFrame() {
 #endif
 }
 
-void ICStubCompiler::leaveStubFrame(MacroAssembler& masm, bool calledIntoIon) {
+void ICStubCompilerBase::leaveStubFrame(MacroAssembler& masm,
+                                        bool calledIntoIon) {
   MOZ_ASSERT(entersStubFrame_ && inStubFrame_);
   inStubFrame_ = false;
 
@@ -1171,7 +1243,8 @@ void ICStubCompiler::leaveStubFrame(MacroAssembler& masm, bool calledIntoIon) {
   EmitBaselineLeaveStubFrame(masm, calledIntoIon);
 }
 
-void ICStubCompiler::pushStubPayload(MacroAssembler& masm, Register scratch) {
+void ICStubCompilerBase::pushStubPayload(MacroAssembler& masm,
+                                         Register scratch) {
   if (inStubFrame_) {
     masm.loadPtr(Address(BaselineFrameReg, 0), scratch);
     masm.pushBaselineFramePtr(scratch, scratch);
@@ -1180,7 +1253,8 @@ void ICStubCompiler::pushStubPayload(MacroAssembler& masm, Register scratch) {
   }
 }
 
-void ICStubCompiler::PushStubPayload(MacroAssembler& masm, Register scratch) {
+void ICStubCompilerBase::PushStubPayload(MacroAssembler& masm,
+                                         Register scratch) {
   pushStubPayload(masm, scratch);
   masm.adjustFrame(sizeof(intptr_t));
 }
@@ -1427,7 +1501,7 @@ bool DoTypeMonitorFallback(JSContext* cx, BaselineFrame* frame,
   return stub->addMonitorStubForValue(cx, frame, types, value);
 }
 
-bool ICTypeMonitor_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_TypeMonitor() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Restore the tail call register.
@@ -1766,7 +1840,7 @@ bool DoTypeUpdateFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICTypeUpdate_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_TypeUpdate() {
   // Just store false into R1.scratchReg() and return.
   masm.move32(Imm32(0), R1.scratchReg());
   EmitReturnFromIC(masm);
@@ -1892,7 +1966,7 @@ bool DoToBoolFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICToBool_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_ToBool() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Restore the tail call register.
@@ -2106,14 +2180,14 @@ bool DoGetElemSuperFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICGetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emitGetElem(bool hasReceiver) {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Restore the tail call register.
   EmitRestoreTailCallReg(masm);
 
   // Super property getters use a |this| that differs from base object
-  if (hasReceiver_) {
+  if (hasReceiver) {
     // State: receiver in R0, index in R1, obj on the stack
 
     // Ensure stack is fully synced for the expression decompiler.
@@ -2157,7 +2231,13 @@ bool ICGetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   // Ion inlined frames. The return address pushed onto reconstructed stack
   // will point here.
   assumeStubFrame();
-  bailoutReturnOffset_.bind(masm.currentOffset());
+  if (hasReceiver) {
+    code.initBailoutReturnOffset(BailoutReturnKind::GetElemSuper,
+                                 masm.currentOffset());
+  } else {
+    code.initBailoutReturnOffset(BailoutReturnKind::GetElem,
+                                 masm.currentOffset());
+  }
 
   leaveStubFrame(masm, true);
 
@@ -2175,12 +2255,12 @@ bool ICGetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   return true;
 }
 
-void ICGetElem_Fallback::Compiler::postGenerateStubCode(MacroAssembler& masm,
-                                                        Handle<JitCode*> code) {
-  BailoutReturnStub kind = hasReceiver_ ? BailoutReturnStub::GetElemSuper
-                                        : BailoutReturnStub::GetElem;
-  void* address = code->raw() + bailoutReturnOffset_.offset();
-  cx->realm()->jitRealm()->initBailoutReturnAddr(address, getKey(), kind);
+bool FallbackICCodeCompiler::emit_GetElem() {
+  return emitGetElem(/* hasReceiver = */ false);
+}
+
+bool FallbackICCodeCompiler::emit_GetElemSuper() {
+  return emitGetElem(/* hasReceiver = */ true);
 }
 
 static void SetUpdateStubData(ICCacheIR_Updated* stub,
@@ -2326,7 +2406,7 @@ bool DoSetElemFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICSetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_SetElem() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   EmitRestoreTailCallReg(masm);
@@ -2467,7 +2547,7 @@ bool DoInFallback(JSContext* cx, BaselineFrame* frame, ICIn_Fallback* stub,
   return true;
 }
 
-bool ICIn_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_In() {
   EmitRestoreTailCallReg(masm);
 
   // Sync for the decompiler.
@@ -2509,7 +2589,7 @@ bool DoHasOwnFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICHasOwn_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_HasOwn() {
   EmitRestoreTailCallReg(masm);
 
   // Sync for the decompiler.
@@ -2572,7 +2652,7 @@ bool DoGetNameFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICGetName_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_GetName() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   EmitRestoreTailCallReg(masm);
@@ -2616,7 +2696,7 @@ bool DoBindNameFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICBindName_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_BindName() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   EmitRestoreTailCallReg(masm);
@@ -2662,7 +2742,7 @@ bool DoGetIntrinsicFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICGetIntrinsic_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_GetIntrinsic() {
   EmitRestoreTailCallReg(masm);
 
   masm.push(ICStubReg);
@@ -2837,13 +2917,13 @@ bool DoGetPropSuperFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICGetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emitGetProp(bool hasReceiver) {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   EmitRestoreTailCallReg(masm);
 
   // Super property getters use a |this| that differs from base object
-  if (hasReceiver_) {
+  if (hasReceiver) {
     // Push arguments.
     masm.pushValue(R0);
     masm.pushValue(R1);
@@ -2875,7 +2955,13 @@ bool ICGetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   // Ion inlined frames. The return address pushed onto reconstructed stack
   // will point here.
   assumeStubFrame();
-  bailoutReturnOffset_.bind(masm.currentOffset());
+  if (hasReceiver) {
+    code.initBailoutReturnOffset(BailoutReturnKind::GetPropSuper,
+                                 masm.currentOffset());
+  } else {
+    code.initBailoutReturnOffset(BailoutReturnKind::GetProp,
+                                 masm.currentOffset());
+  }
 
   leaveStubFrame(masm, true);
 
@@ -2893,12 +2979,12 @@ bool ICGetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   return true;
 }
 
-void ICGetProp_Fallback::Compiler::postGenerateStubCode(MacroAssembler& masm,
-                                                        Handle<JitCode*> code) {
-  BailoutReturnStub kind = hasReceiver_ ? BailoutReturnStub::GetPropSuper
-                                        : BailoutReturnStub::GetProp;
-  void* address = code->raw() + bailoutReturnOffset_.offset();
-  cx->realm()->jitRealm()->initBailoutReturnAddr(address, getKey(), kind);
+bool FallbackICCodeCompiler::emit_GetProp() {
+  return emitGetProp(/* hasReceiver = */ false);
+}
+
+bool FallbackICCodeCompiler::emit_GetPropSuper() {
+  return emitGetProp(/* hasReceiver = */ true);
 }
 
 //
@@ -3045,7 +3131,7 @@ bool DoSetPropFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICSetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_SetProp() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   EmitRestoreTailCallReg(masm);
@@ -3079,7 +3165,8 @@ bool ICSetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   // Ion inlined frames. The return address pushed onto reconstructed stack
   // will point here.
   assumeStubFrame();
-  bailoutReturnOffset_.bind(masm.currentOffset());
+  code.initBailoutReturnOffset(BailoutReturnKind::SetProp,
+                               masm.currentOffset());
 
   leaveStubFrame(masm, true);
   EmitReturnFromIC(masm);
@@ -3087,13 +3174,6 @@ bool ICSetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   return true;
 }
 
-void ICSetProp_Fallback::Compiler::postGenerateStubCode(MacroAssembler& masm,
-                                                        Handle<JitCode*> code) {
-  BailoutReturnStub kind = BailoutReturnStub::SetProp;
-  void* address = code->raw() + bailoutReturnOffset_.offset();
-  cx->realm()->jitRealm()->initBailoutReturnAddr(address, getKey(), kind);
-}
-
 //
 // Call_Fallback
 //
@@ -3886,7 +3966,7 @@ bool DoSpreadCallFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-void ICCallStubCompiler::pushCallArguments(MacroAssembler& masm,
+void ICStubCompilerBase::pushCallArguments(MacroAssembler& masm,
                                            AllocatableGeneralRegisterSet regs,
                                            Register argcReg, bool isJitCall,
                                            bool isConstructing) {
@@ -4195,7 +4275,7 @@ void ICCallStubCompiler::pushArrayArguments(
   masm.bind(&copyDone);
 }
 
-bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emitCall(bool isSpread, bool isConstructing) {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Values are on the stack left-to-right. Calling convention wants them
@@ -4204,7 +4284,7 @@ bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
 
   AllocatableGeneralRegisterSet regs(availableGeneralRegs(0));
 
-  if (MOZ_UNLIKELY(isSpread_)) {
+  if (MOZ_UNLIKELY(isSpread)) {
     // Push a stub frame so that we can perform a non-tail call.
     enterStubFrame(masm, R1.scratchReg());
 
@@ -4213,22 +4293,26 @@ bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
     // calling enterStubFrame.
 
     // newTarget
-    if (isConstructing_) {
+    uint32_t valueOffset = 0;
+    if (isConstructing) {
       masm.pushValue(Address(BaselineFrameReg, STUB_FRAME_SIZE));
+      valueOffset++;
     }
 
     // array
-    uint32_t valueOffset = isConstructing_;
     masm.pushValue(Address(BaselineFrameReg,
-                           valueOffset++ * sizeof(Value) + STUB_FRAME_SIZE));
+                           valueOffset * sizeof(Value) + STUB_FRAME_SIZE));
+    valueOffset++;
 
     // this
     masm.pushValue(Address(BaselineFrameReg,
-                           valueOffset++ * sizeof(Value) + STUB_FRAME_SIZE));
+                           valueOffset * sizeof(Value) + STUB_FRAME_SIZE));
+    valueOffset++;
 
     // callee
     masm.pushValue(Address(BaselineFrameReg,
-                           valueOffset++ * sizeof(Value) + STUB_FRAME_SIZE));
+                           valueOffset * sizeof(Value) + STUB_FRAME_SIZE));
+    valueOffset++;
 
     masm.push(masm.getStackPointer());
     masm.push(ICStubReg);
@@ -4255,7 +4339,7 @@ bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   regs.take(R0.scratchReg());  // argc.
 
   pushCallArguments(masm, regs, R0.scratchReg(), /* isJitCall = */ false,
-                    isConstructing_);
+                    isConstructing);
 
   masm.push(masm.getStackPointer());
   masm.push(R0.scratchReg());
@@ -4276,7 +4360,14 @@ bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   // Ion inlined frames. The return address pushed onto reconstructed stack
   // will point here.
   assumeStubFrame();
-  bailoutReturnOffset_.bind(masm.currentOffset());
+
+  MOZ_ASSERT(!isSpread);
+
+  if (isConstructing) {
+    code.initBailoutReturnOffset(BailoutReturnKind::New, masm.currentOffset());
+  } else {
+    code.initBailoutReturnOffset(BailoutReturnKind::Call, masm.currentOffset());
+  }
 
   // Load passed-in ThisV into R1 just in case it's needed.  Need to do this
   // before we leave the stub frame since that info will be lost.
@@ -4287,7 +4378,7 @@ bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
 
   // If this is a |constructing| call, if the callee returns a non-object, we
   // replace it with the |this| object passed in.
-  if (isConstructing_) {
+  if (isConstructing) {
     MOZ_ASSERT(JSReturnOperand == R0);
     Label skipThisReplace;
 
@@ -4315,16 +4406,20 @@ bool ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   return true;
 }
 
-void ICCall_Fallback::Compiler::postGenerateStubCode(MacroAssembler& masm,
-                                                     Handle<JitCode*> code) {
-  if (MOZ_UNLIKELY(isSpread_)) {
-    return;
-  }
+bool FallbackICCodeCompiler::emit_Call() {
+  return emitCall(/* isSpread = */ false, /* isConstructing = */ false);
+}
 
-  void* address = code->raw() + bailoutReturnOffset_.offset();
-  BailoutReturnStub kind =
-      isConstructing_ ? BailoutReturnStub::New : BailoutReturnStub::Call;
-  cx->realm()->jitRealm()->initBailoutReturnAddr(address, getKey(), kind);
+bool FallbackICCodeCompiler::emit_CallConstructing() {
+  return emitCall(/* isSpread = */ false, /* isConstructing = */ true);
+}
+
+bool FallbackICCodeCompiler::emit_SpreadCall() {
+  return emitCall(/* isSpread = */ true, /* isConstructing = */ false);
+}
+
+bool FallbackICCodeCompiler::emit_SpreadCallConstructing() {
+  return emitCall(/* isSpread = */ true, /* isConstructing = */ true);
 }
 
 bool ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm) {
@@ -5281,7 +5376,7 @@ bool DoGetIteratorFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICGetIterator_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_GetIterator() {
   EmitRestoreTailCallReg(masm);
 
   // Sync stack for the decompiler.
@@ -5339,7 +5434,7 @@ bool DoInstanceOfFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICInstanceOf_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_InstanceOf() {
   EmitRestoreTailCallReg(masm);
 
   // Sync stack for the decompiler.
@@ -5375,7 +5470,7 @@ bool DoTypeOfFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICTypeOf_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_TypeOf() {
   EmitRestoreTailCallReg(masm);
 
   masm.pushValue(R0);
@@ -5464,7 +5559,7 @@ bool DoRestFallback(JSContext* cx, BaselineFrame* frame, ICRest_Fallback* stub,
   return true;
 }
 
-bool ICRest_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_Rest() {
   EmitRestoreTailCallReg(masm);
 
   masm.push(ICStubReg);
@@ -5531,7 +5626,7 @@ bool DoUnaryArithFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICUnaryArith_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_UnaryArith() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Restore the tail call register.
@@ -5655,7 +5750,7 @@ bool DoBinaryArithFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICBinaryArith_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_BinaryArith() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Restore the tail call register.
@@ -5752,7 +5847,7 @@ bool DoCompareFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICCompare_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_Compare() {
   MOZ_ASSERT(R0 == JSReturnOperand);
 
   // Restore the tail call register.
@@ -5813,7 +5908,7 @@ bool DoNewArrayFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICNewArray_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_NewArray() {
   EmitRestoreTailCallReg(masm);
 
   masm.push(R0.scratchReg());  // length
@@ -5868,7 +5963,7 @@ bool DoNewObjectFallback(JSContext* cx, BaselineFrame* frame,
   return true;
 }
 
-bool ICNewObject_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
+bool FallbackICCodeCompiler::emit_NewObject() {
   EmitRestoreTailCallReg(masm);
 
   masm.push(ICStubReg);  // stub.
@@ -5879,5 +5974,42 @@ bool ICNewObject_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
   return tailCallVM<Fn, DoNewObjectFallback>(masm);
 }
 
+bool JitRuntime::generateBaselineICFallbackCode(JSContext* cx) {
+  StackMacroAssembler masm;
+
+  BaselineICFallbackCode& fallbackCode = baselineICFallbackCode_.ref();
+  FallbackICCodeCompiler compiler(cx, fallbackCode, masm);
+
+  JitSpew(JitSpew_Codegen, "# Emitting Baseline IC fallback code");
+
+#define EMIT_CODE(kind)                                            \
+  {                                                                \
+    uint32_t offset = startTrampolineCode(masm);                   \
+    InitMacroAssemblerForICStub(masm);                             \
+    if (!compiler.emit_##kind()) {                                 \
+      return false;                                                \
+    }                                                              \
+    fallbackCode.initOffset(BaselineICFallbackKind::kind, offset); \
+  }
+  IC_BASELINE_FALLBACK_CODE_KIND_LIST(EMIT_CODE)
+#undef EMIT_CODE
+
+  Linker linker(masm, "BaselineICFallback");
+  JitCode* code = linker.newCode(cx, CodeKind::Other);
+  if (!code) {
+    return false;
+  }
+
+#ifdef JS_ION_PERF
+  writePerfSpewerJitCodeProfile(code, "BaselineICFallback");
+#endif
+#ifdef MOZ_VTUNE
+  vtune::MarkStub(code, "BaselineICFallback");
+#endif
+
+  fallbackCode.initCode(code);
+  return true;
+}
+
 }  // namespace jit
 }  // namespace js
diff --git a/js/src/jit/BaselineIC.h b/js/src/jit/BaselineIC.h
index 9370ceea417f..f88e733bf99b 100644
--- a/js/src/jit/BaselineIC.h
+++ b/js/src/jit/BaselineIC.h
@@ -503,7 +503,6 @@ class ICStub {
     Updated = 0x4
   };
 
-  void traceCode(JSTracer* trc, const char* name);
   void updateCode(JitCode* stubCode);
   void trace(JSTracer* trc);
 
@@ -520,6 +519,16 @@ class ICStub {
     return result;
   }
 
+  template <typename T, typename... Args>
+  static T* NewFallback(JSContext* cx, ICStubSpace* space, TrampolinePtr code,
+                        Args&&... args) {
+    T* result = space->allocate<T>(code, std::forward<Args>(args)...);
+    if (MOZ_UNLIKELY(!result)) {
+      ReportOutOfMemory(cx);
+    }
+    return result;
+  }
+
  protected:
   // The raw jitcode to call for this stub.
   uint8_t* stubCode_;
@@ -537,8 +546,8 @@ class ICStub {
   Trait trait_ : 3;
   Kind kind_ : 13;
 
-  inline ICStub(Kind kind, JitCode* stubCode)
-      : stubCode_(stubCode->raw()),
+  inline ICStub(Kind kind, uint8_t* stubCode)
+      : stubCode_(stubCode),
         next_(nullptr),
         extra_(0),
         trait_(Regular),
@@ -546,14 +555,22 @@ class ICStub {
     MOZ_ASSERT(stubCode != nullptr);
   }
 
-  inline ICStub(Kind kind, Trait trait, JitCode* stubCode)
-      : stubCode_(stubCode->raw()),
+  inline ICStub(Kind kind, JitCode* stubCode) : ICStub(kind, stubCode->raw()) {
+    MOZ_ASSERT(stubCode != nullptr);
+  }
+
+  inline ICStub(Kind kind, Trait trait, uint8_t* stubCode)
+      : stubCode_(stubCode),
         next_(nullptr),
         extra_(0),
         trait_(trait),
         kind_(kind) {
     MOZ_ASSERT(stubCode != nullptr);
   }
+  inline ICStub(Kind kind, Trait trait, JitCode* stubCode)
+      : ICStub(kind, trait, stubCode->raw()) {
+    MOZ_ASSERT(stubCode != nullptr);
+  }
 
   inline Trait trait() const {
     // Workaround for MSVC reading trait_ as signed value.
@@ -640,7 +657,15 @@ class ICStub {
 
   inline ICStub** addressOfNext() { return &next_; }
 
-  inline JitCode* jitCode() { return JitCode::FromExecutable(stubCode_); }
+  bool usesTrampolineCode() const {
+    // All fallback code is stored in a single JitCode instance, so we can't
+    // call JitCode::FromExecutable on the raw pointer.
+    return isFallback() || isTypeMonitor_Fallback() || isTypeUpdate_Fallback();
+  }
+  JitCode* jitCode() {
+    MOZ_ASSERT(!usesTrampolineCode());
+    return JitCode::FromExecutable(stubCode_);
+  }
 
   inline uint8_t* rawStubCode() const { return stubCode_; }
 
@@ -705,15 +730,15 @@ class ICFallbackStub : public ICStub {
   // last stub's "next_" field.
   ICStub** lastStubPtrAddr_;
 
-  ICFallbackStub(Kind kind, JitCode* stubCode)
-      : ICStub(kind, ICStub::Fallback, stubCode),
+  ICFallbackStub(Kind kind, TrampolinePtr stubCode)
+      : ICStub(kind, ICStub::Fallback, stubCode.value),
         icEntry_(nullptr),
         state_(),
         enteredCount_(0),
         lastStubPtrAddr_(nullptr) {}
 
-  ICFallbackStub(Kind kind, Trait trait, JitCode* stubCode)
-      : ICStub(kind, trait, stubCode),
+  ICFallbackStub(Kind kind, Trait trait, TrampolinePtr stubCode)
+      : ICStub(kind, trait, stubCode.value),
         icEntry_(nullptr),
         state_(),
         enteredCount_(0),
@@ -954,41 +979,21 @@ class ICCacheIR_Updated : public ICUpdatedStub,
 };
 
 // Base class for stubcode compilers.
-class ICStubCompiler {
-  // Prevent GC in the middle of stub compilation.
-  js::gc::AutoSuppressGC suppressGC;
-
+class ICStubCompilerBase {
  protected:
   JSContext* cx;
-  ICStub::Kind kind;
-  bool inStubFrame_;
+  bool inStubFrame_ = false;
 
 #ifdef DEBUG
-  bool entersStubFrame_;
-  uint32_t framePushedAtEnterStubFrame_;
+  bool entersStubFrame_ = false;
+  uint32_t framePushedAtEnterStubFrame_ = 0;
 #endif
 
-  // By default the stubcode key is just the kind.
-  virtual int32_t getKey() const { return static_cast<int32_t>(kind); }
+  explicit ICStubCompilerBase(JSContext* cx) : cx(cx) {}
 
-  virtual MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) = 0;
-  virtual void postGenerateStubCode(MacroAssembler& masm,
-                                    Handle<JitCode*> genCode) {}
-
-  JitCode* getStubCode();
-
-  ICStubCompiler(JSContext* cx, ICStub::Kind kind)
-      : suppressGC(cx),
-        cx(cx),
-        kind(kind),
-        inStubFrame_(false)
-#ifdef DEBUG
-        ,
-        entersStubFrame_(false),
-        framePushedAtEnterStubFrame_(0)
-#endif
-  {
-  }
+  void pushCallArguments(MacroAssembler& masm,
+                         AllocatableGeneralRegisterSet regs, Register argcReg,
+                         bool isJitCall, bool isConstructing = false);
 
   // Push a payload specialized per compiler needed to execute stubs.
   void PushStubPayload(MacroAssembler& masm, Register scratch);
@@ -1056,6 +1061,24 @@ class ICStubCompiler {
 
     return regs;
   }
+};
+
+class ICStubCompiler : public ICStubCompilerBase {
+  // Prevent GC in the middle of stub compilation.
+  js::gc::AutoSuppressGC suppressGC;
+
+ protected:
+  ICStub::Kind kind;
+
+  // By default the stubcode key is just the kind.
+  virtual int32_t getKey() const { return static_cast<int32_t>(kind); }
+
+  virtual MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) = 0;
+
+  JitCode* getStubCode();
+
+  ICStubCompiler(JSContext* cx, ICStub::Kind kind)
+      : ICStubCompilerBase(cx), suppressGC(cx), kind(kind) {}
 
  protected:
   template <typename T, typename... Args>
@@ -1080,23 +1103,8 @@ class ICStubCompiler {
 class ICWarmUpCounter_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICWarmUpCounter_Fallback(JitCode* stubCode)
+  explicit ICWarmUpCounter_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::WarmUpCounter_Fallback, stubCode) {}
-
- public:
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::WarmUpCounter_Fallback) {}
-
-    ICWarmUpCounter_Fallback* getStub(ICStubSpace* space) override {
-      return newStub<ICWarmUpCounter_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // Monitored fallback stubs - as the name implies.
@@ -1106,7 +1114,7 @@ class ICMonitoredFallbackStub : public ICFallbackStub {
   // getFallbackMonitorStub if needed.
   ICTypeMonitor_Fallback* fallbackMonitorStub_;
 
-  ICMonitoredFallbackStub(Kind kind, JitCode* stubCode)
+  ICMonitoredFallbackStub(Kind kind, TrampolinePtr stubCode)
       : ICFallbackStub(kind, ICStub::MonitoredFallback, stubCode),
         fallbackMonitorStub_(nullptr) {}
 
@@ -1251,10 +1259,10 @@ class ICTypeMonitor_Fallback : public ICStub {
 
   static const uint32_t BYTECODE_INDEX = (1 << 23) - 1;
 
-  ICTypeMonitor_Fallback(JitCode* stubCode,
+  ICTypeMonitor_Fallback(TrampolinePtr stubCode,
                          ICMonitoredFallbackStub* mainFallbackStub,
-                         uint32_t argumentIndex)
-      : ICStub(ICStub::TypeMonitor_Fallback, stubCode),
+                         uint32_t argumentIndex = BYTECODE_INDEX)
+      : ICStub(ICStub::TypeMonitor_Fallback, stubCode.value),
         mainFallbackStub_(mainFallbackStub),
         firstMonitorStub_(thisFromCtor()),
         lastMonitorStubPtrAddr_(nullptr),
@@ -1348,31 +1356,6 @@ class ICTypeMonitor_Fallback : public ICStub {
                                            HandleValue val);
 
   void resetMonitorStubChain(Zone* zone);
-
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-    ICMonitoredFallbackStub* mainFallbackStub_;
-    uint32_t argumentIndex_;
-
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, ICMonitoredFallbackStub* mainFallbackStub)
-        : ICStubCompiler(cx, ICStub::TypeMonitor_Fallback),
-          mainFallbackStub_(mainFallbackStub),
-          argumentIndex_(BYTECODE_INDEX) {}
-
-    Compiler(JSContext* cx, uint32_t argumentIndex)
-        : ICStubCompiler(cx, ICStub::TypeMonitor_Fallback),
-          mainFallbackStub_(nullptr),
-          argumentIndex_(argumentIndex) {}
-
-    ICTypeMonitor_Fallback* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeMonitor_Fallback>(space, getStubCode(),
-                                             mainFallbackStub_, argumentIndex_);
-    }
-  };
 };
 
 class ICTypeMonitor_PrimitiveSet : public TypeCheckPrimitiveSetStub {
@@ -1494,23 +1477,8 @@ class ICTypeMonitor_AnyValue : public ICStub {
 class ICTypeUpdate_Fallback : public ICStub {
   friend class ICStubSpace;
 
-  explicit ICTypeUpdate_Fallback(JitCode* stubCode)
-      : ICStub(ICStub::TypeUpdate_Fallback, stubCode) {}
-
- public:
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::TypeUpdate_Fallback) {}
-
-    ICTypeUpdate_Fallback* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeUpdate_Fallback>(space, getStubCode());
-    }
-  };
+  explicit ICTypeUpdate_Fallback(TrampolinePtr stubCode)
+      : ICStub(ICStub::TypeUpdate_Fallback, stubCode.value) {}
 };
 
 class ICTypeUpdate_PrimitiveSet : public TypeCheckPrimitiveSetStub {
@@ -1633,25 +1601,11 @@ class ICTypeUpdate_AnyValue : public ICStub {
 class ICToBool_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICToBool_Fallback(JitCode* stubCode)
+  explicit ICToBool_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::ToBool_Fallback, stubCode) {}
 
  public:
   static const uint32_t MAX_OPTIMIZED_STUBS = 8;
-
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::ToBool_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICToBool_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // GetElem
@@ -1661,7 +1615,7 @@ class ICToBool_Fallback : public ICFallbackStub {
 class ICGetElem_Fallback : public ICMonitoredFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICGetElem_Fallback(JitCode* stubCode)
+  explicit ICGetElem_Fallback(TrampolinePtr stubCode)
       : ICMonitoredFallbackStub(ICStub::GetElem_Fallback, stubCode) {}
 
   static const uint16_t EXTRA_NEGATIVE_INDEX = 0x1;
@@ -1673,30 +1627,6 @@ class ICGetElem_Fallback : public ICMonitoredFallbackStub {
 
   void setSawNonIntegerIndex() { extra_ |= SAW_NON_INTEGER_INDEX_BIT; }
   bool sawNonIntegerIndex() const { return extra_ & SAW_NON_INTEGER_INDEX_BIT; }
-
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    CodeOffset bailoutReturnOffset_;
-    bool hasReceiver_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-    void postGenerateStubCode(MacroAssembler& masm,
-                              Handle<JitCode*> code) override;
-
-    virtual int32_t getKey() const override {
-      return static_cast<int32_t>(kind) |
-             (static_cast<int32_t>(hasReceiver_) << 16);
-    }
-
-   public:
-    explicit Compiler(JSContext* cx, bool hasReceiver = false)
-        : ICStubCompiler(cx, ICStub::GetElem_Fallback),
-          hasReceiver_(hasReceiver) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICGetElem_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // SetElem
@@ -1706,7 +1636,7 @@ class ICGetElem_Fallback : public ICMonitoredFallbackStub {
 class ICSetElem_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICSetElem_Fallback(JitCode* stubCode)
+  explicit ICSetElem_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::SetElem_Fallback, stubCode) {}
 
   static const size_t HasDenseAddFlag = 0x1;
@@ -1718,20 +1648,6 @@ class ICSetElem_Fallback : public ICFallbackStub {
 
   void noteHasTypedArrayOOB() { extra_ |= HasTypedArrayOOBFlag; }
   bool hasTypedArrayOOB() const { return extra_ & HasTypedArrayOOBFlag; }
-
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::SetElem_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICSetElem_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // In
@@ -1739,22 +1655,8 @@ class ICSetElem_Fallback : public ICFallbackStub {
 class ICIn_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICIn_Fallback(JitCode* stubCode)
+  explicit ICIn_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::In_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::In_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICIn_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // HasOwn
@@ -1762,22 +1664,8 @@ class ICIn_Fallback : public ICFallbackStub {
 class ICHasOwn_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICHasOwn_Fallback(JitCode* stubCode)
+  explicit ICHasOwn_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::HasOwn_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::HasOwn_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICHasOwn_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // GetName
@@ -1786,22 +1674,8 @@ class ICHasOwn_Fallback : public ICFallbackStub {
 class ICGetName_Fallback : public ICMonitoredFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICGetName_Fallback(JitCode* stubCode)
+  explicit ICGetName_Fallback(TrampolinePtr stubCode)
       : ICMonitoredFallbackStub(ICStub::GetName_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::GetName_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICGetName_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // BindName
@@ -1809,22 +1683,8 @@ class ICGetName_Fallback : public ICMonitoredFallbackStub {
 class ICBindName_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICBindName_Fallback(JitCode* stubCode)
+  explicit ICBindName_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::BindName_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::BindName_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICBindName_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // GetIntrinsic
@@ -1832,22 +1692,8 @@ class ICBindName_Fallback : public ICFallbackStub {
 class ICGetIntrinsic_Fallback : public ICMonitoredFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICGetIntrinsic_Fallback(JitCode* stubCode)
+  explicit ICGetIntrinsic_Fallback(TrampolinePtr stubCode)
       : ICMonitoredFallbackStub(ICStub::GetIntrinsic_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::GetIntrinsic_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICGetIntrinsic_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // GetProp
@@ -1857,7 +1703,7 @@ class ICGetIntrinsic_Fallback : public ICMonitoredFallbackStub {
 class ICGetProp_Fallback : public ICMonitoredFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICGetProp_Fallback(JitCode* stubCode)
+  explicit ICGetProp_Fallback(TrampolinePtr stubCode)
       : ICMonitoredFallbackStub(ICStub::GetProp_Fallback, stubCode) {}
 
  public:
@@ -1867,29 +1713,6 @@ class ICGetProp_Fallback : public ICMonitoredFallbackStub {
   bool hasAccessedGetter() const {
     return extra_ & (1u << ACCESSED_GETTER_BIT);
   }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    CodeOffset bailoutReturnOffset_;
-    bool hasReceiver_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-    void postGenerateStubCode(MacroAssembler& masm,
-                              Handle<JitCode*> code) override;
-
-    virtual int32_t getKey() const override {
-      return static_cast<int32_t>(kind) |
-             (static_cast<int32_t>(hasReceiver_) << 16);
-    }
-
-   public:
-    explicit Compiler(JSContext* cx, bool hasReceiver = false)
-        : ICStubCompiler(cx, ICStub::GetProp_Fallback),
-          hasReceiver_(hasReceiver) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICGetProp_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // SetProp
@@ -1901,25 +1724,8 @@ class ICGetProp_Fallback : public ICMonitoredFallbackStub {
 class ICSetProp_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICSetProp_Fallback(JitCode* stubCode)
+  explicit ICSetProp_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::SetProp_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    CodeOffset bailoutReturnOffset_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-    void postGenerateStubCode(MacroAssembler& masm,
-                              Handle<JitCode*> code) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::SetProp_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICSetProp_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // Call
@@ -1939,9 +1745,6 @@ class ICCallStubCompiler : public ICStubCompiler {
 
   enum FunApplyThing { FunApply_MagicArgs, FunApply_Array };
 
-  void pushCallArguments(MacroAssembler& masm,
-                         AllocatableGeneralRegisterSet regs, Register argcReg,
-                         bool isJitCall, bool isConstructing = false);
   void pushSpreadCallArguments(MacroAssembler& masm,
                                AllocatableGeneralRegisterSet regs,
                                Register argcReg, bool isJitCall,
@@ -1964,7 +1767,7 @@ class ICCall_Fallback : public ICMonitoredFallbackStub {
   static const uint32_t MAX_OPTIMIZED_STUBS = 16;
 
  private:
-  explicit ICCall_Fallback(JitCode* stubCode)
+  explicit ICCall_Fallback(TrampolinePtr stubCode)
       : ICMonitoredFallbackStub(ICStub::Call_Fallback, stubCode) {}
 
  public:
@@ -1973,33 +1776,6 @@ class ICCall_Fallback : public ICMonitoredFallbackStub {
     // Return hasStub(Call_AnyNative) after Call_AnyNative stub is added.
     return false;
   }
-
-  // Compiler for this stub kind.
-  class Compiler : public ICCallStubCompiler {
-   protected:
-    bool isConstructing_;
-    bool isSpread_;
-    CodeOffset bailoutReturnOffset_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-    void postGenerateStubCode(MacroAssembler& masm,
-                              Handle<JitCode*> code) override;
-
-    virtual int32_t getKey() const override {
-      return static_cast<int32_t>(kind) |
-             (static_cast<int32_t>(isSpread_) << 16) |
-             (static_cast<int32_t>(isConstructing_) << 17);
-    }
-
-   public:
-    Compiler(JSContext* cx, bool isConstructing, bool isSpread)
-        : ICCallStubCompiler(cx, ICStub::Call_Fallback),
-          isConstructing_(isConstructing),
-          isSpread_(isSpread) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICCall_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 class ICCall_Scripted : public ICMonitoredStub {
@@ -2421,22 +2197,8 @@ class ICCall_ConstStringSplit : public ICMonitoredStub {
 class ICGetIterator_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICGetIterator_Fallback(JitCode* stubCode)
+  explicit ICGetIterator_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::GetIterator_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::GetIterator_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICGetIterator_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // InstanceOf
@@ -2444,22 +2206,8 @@ class ICGetIterator_Fallback : public ICFallbackStub {
 class ICInstanceOf_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICInstanceOf_Fallback(JitCode* stubCode)
+  explicit ICInstanceOf_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::InstanceOf_Fallback, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::InstanceOf_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICInstanceOf_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // TypeOf
@@ -2468,24 +2216,11 @@ class ICInstanceOf_Fallback : public ICFallbackStub {
 class ICTypeOf_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICTypeOf_Fallback(JitCode* stubCode)
+  explicit ICTypeOf_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::TypeOf_Fallback, stubCode) {}
 
  public:
   static const uint32_t MAX_OPTIMIZED_STUBS = 6;
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::TypeOf_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeOf_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 class ICRest_Fallback : public ICFallbackStub {
@@ -2493,7 +2228,7 @@ class ICRest_Fallback : public ICFallbackStub {
 
   GCPtrArrayObject templateObject_;
 
-  ICRest_Fallback(JitCode* stubCode, ArrayObject* templateObject)
+  ICRest_Fallback(TrampolinePtr stubCode, ArrayObject* templateObject)
       : ICFallbackStub(ICStub::Rest_Fallback, stubCode),
         templateObject_(templateObject) {}
 
@@ -2501,21 +2236,6 @@ class ICRest_Fallback : public ICFallbackStub {
   static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
   GCPtrArrayObject& templateObject() { return templateObject_; }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    RootedArrayObject templateObject;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, ArrayObject* templateObject)
-        : ICStubCompiler(cx, ICStub::Rest_Fallback),
-          templateObject(cx, templateObject) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICRest_Fallback>(space, getStubCode(), templateObject);
-    }
-  };
 };
 
 // UnaryArith
@@ -2527,7 +2247,7 @@ class ICRest_Fallback : public ICFallbackStub {
 class ICUnaryArith_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICUnaryArith_Fallback(JitCode* stubCode)
+  explicit ICUnaryArith_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(UnaryArith_Fallback, stubCode) {
     extra_ = 0;
   }
@@ -2535,20 +2255,6 @@ class ICUnaryArith_Fallback : public ICFallbackStub {
  public:
   bool sawDoubleResult() { return extra_; }
   void setSawDoubleResult() { extra_ = 1; }
-
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::UnaryArith_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICUnaryArith_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // Compare
@@ -2564,23 +2270,8 @@ class ICUnaryArith_Fallback : public ICFallbackStub {
 class ICCompare_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICCompare_Fallback(JitCode* stubCode)
+  explicit ICCompare_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::Compare_Fallback, stubCode) {}
-
- public:
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::Compare_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICCompare_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // BinaryArith
@@ -2591,7 +2282,7 @@ class ICCompare_Fallback : public ICFallbackStub {
 class ICBinaryArith_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
-  explicit ICBinaryArith_Fallback(JitCode* stubCode)
+  explicit ICBinaryArith_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(BinaryArith_Fallback, stubCode) {
     extra_ = 0;
   }
@@ -2603,20 +2294,6 @@ class ICBinaryArith_Fallback : public ICFallbackStub {
 
   bool sawDoubleResult() const { return extra_ & SAW_DOUBLE_RESULT_BIT; }
   void setSawDoubleResult() { extra_ |= SAW_DOUBLE_RESULT_BIT; }
-
-  // Compiler for this stub kind.
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::BinaryArith_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICBinaryArith_Fallback>(space, getStubCode());
-    }
-  };
 };
 
 // JSOP_NEWARRAY
@@ -2630,26 +2307,12 @@ class ICNewArray_Fallback : public ICFallbackStub {
   // template object itself is not.
   GCPtrObjectGroup templateGroup_;
 
-  ICNewArray_Fallback(JitCode* stubCode, ObjectGroup* templateGroup)
+  ICNewArray_Fallback(TrampolinePtr stubCode, ObjectGroup* templateGroup)
       : ICFallbackStub(ICStub::NewArray_Fallback, stubCode),
         templateObject_(nullptr),
         templateGroup_(templateGroup) {}
 
  public:
-  class Compiler : public ICStubCompiler {
-    RootedObjectGroup templateGroup;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, ObjectGroup* templateGroup)
-        : ICStubCompiler(cx, ICStub::NewArray_Fallback),
-          templateGroup(cx, templateGroup) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICNewArray_Fallback>(space, getStubCode(), templateGroup);
-    }
-  };
-
   GCPtrObject& templateObject() { return templateObject_; }
 
   void setTemplateObject(JSObject* obj) {
@@ -2672,23 +2335,11 @@ class ICNewObject_Fallback : public ICFallbackStub {
 
   GCPtrObject templateObject_;
 
-  explicit ICNewObject_Fallback(JitCode* stubCode)
+  explicit ICNewObject_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::NewObject_Fallback, stubCode),
         templateObject_(nullptr) {}
 
  public:
-  class Compiler : public ICStubCompiler {
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, ICStub::NewObject_Fallback) {}
-
-    ICStub* getStub(ICStubSpace* space) override {
-      return newStub<ICNewObject_Fallback>(space, getStubCode());
-    }
-  };
-
   GCPtrObject& templateObject() { return templateObject_; }
 
   void setTemplateObject(JSObject* obj) { templateObject_ = obj; }
diff --git a/js/src/jit/BaselineICList.h b/js/src/jit/BaselineICList.h
index 06df71846445..279a002088c0 100644
--- a/js/src/jit/BaselineICList.h
+++ b/js/src/jit/BaselineICList.h
@@ -10,7 +10,8 @@
 namespace js {
 namespace jit {
 
-// List of IC stub kinds that can only run in Baseline.
+// List of Baseline IC stub kinds. The stub kind determines the structure of the
+// ICStub data.
 #define IC_BASELINE_STUB_KIND_LIST(_) \
   _(WarmUpCounter_Fallback)           \
                                       \
@@ -60,7 +61,6 @@ namespace jit {
   _(GetIterator_Fallback)             \
                                       \
   _(InstanceOf_Fallback)              \
-  _(InstanceOf_Function)              \
                                       \
   _(TypeOf_Fallback)                  \
                                       \
@@ -76,6 +76,41 @@ namespace jit {
   _(CacheIR_Monitored)                \
   _(CacheIR_Updated)
 
+// List of fallback trampolines. Each of these fallback trampolines exists as
+// part of the JitRuntime. Note that some fallback stubs in previous list may
+// have multiple trampolines in this list. For example, Call_Fallback has
+// constructing/spread variants here with different calling conventions needing
+// different trampolines.
+#define IC_BASELINE_FALLBACK_CODE_KIND_LIST(_) \
+  _(WarmUpCounter)                             \
+  _(TypeMonitor)                               \
+  _(TypeUpdate)                                \
+  _(NewArray)                                  \
+  _(NewObject)                                 \
+  _(ToBool)                                    \
+  _(UnaryArith)                                \
+  _(Call)                                      \
+  _(CallConstructing)                          \
+  _(SpreadCall)                                \
+  _(SpreadCallConstructing)                    \
+  _(GetElem)                                   \
+  _(GetElemSuper)                              \
+  _(SetElem)                                   \
+  _(In)                                        \
+  _(HasOwn)                                    \
+  _(GetName)                                   \
+  _(BindName)                                  \
+  _(GetIntrinsic)                              \
+  _(SetProp)                                   \
+  _(GetIterator)                               \
+  _(InstanceOf)                                \
+  _(TypeOf)                                    \
+  _(Rest)                                      \
+  _(BinaryArith)                               \
+  _(Compare)                                   \
+  _(GetProp)                                   \
+  _(GetPropSuper)
+
 }  // namespace jit
 }  // namespace js
 
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index 11af5fd7a52e..5c14b3a9fc52 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -200,6 +200,23 @@ bool JitRuntime::initialize(JSContext* cx) {
 
   JitContext jctx(cx, nullptr);
 
+  if (!generateTrampolines(cx)) {
+    return false;
+  }
+
+  if (!generateBaselineICFallbackCode(cx)) {
+    return false;
+  }
+
+  jitcodeGlobalTable_ = cx->new_<JitcodeGlobalTable>();
+  if (!jitcodeGlobalTable_) {
+    return false;
+  }
+
+  return true;
+}
+
+bool JitRuntime::generateTrampolines(JSContext* cx) {
   StackMacroAssembler masm;
 
   Label bailoutTail;
@@ -305,11 +322,6 @@ bool JitRuntime::initialize(JSContext* cx) {
   vtune::MarkStub(trampolineCode_, "Trampolines");
 #endif
 
-  jitcodeGlobalTable_ = cx->new_<JitcodeGlobalTable>();
-  if (!jitcodeGlobalTable_) {
-    return false;
-  }
-
   return true;
 }
 
@@ -561,14 +573,6 @@ void JitRealm::sweep(JS::Realm* realm) {
 
   stubCodes_->sweep();
 
-  // If the sweep removed a bailout Fallback stub, nullptr the corresponding
-  // return addr.
-  for (auto& it : bailoutReturnStubInfo_) {
-    if (!stubCodes_->lookup(it.key)) {
-      it = BailoutReturnStubInfo();
-    }
-  }
-
   for (ReadBarrieredJitCode& stub : stubs_) {
     if (stub && IsAboutToBeFinalized(&stub)) {
       stub.set(nullptr);
diff --git a/js/src/jit/JitRealm.h b/js/src/jit/JitRealm.h
index be66e31b870a..51594e0d6cca 100644
--- a/js/src/jit/JitRealm.h
+++ b/js/src/jit/JitRealm.h
@@ -9,11 +9,13 @@
 
 #include "mozilla/Array.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/EnumeratedArray.h"
 #include "mozilla/MemoryReporting.h"
 
 #include <utility>
 
 #include "builtin/TypedObject.h"
+#include "jit/BaselineICList.h"
 #include "jit/CompileInfo.h"
 #include "jit/ICStubSpace.h"
 #include "jit/IonCode.h"
@@ -62,6 +64,60 @@ struct EnterJitData {
   bool constructing;
 };
 
+enum class BaselineICFallbackKind {
+#define DEF_ENUM_KIND(kind) kind,
+  IC_BASELINE_FALLBACK_CODE_KIND_LIST(DEF_ENUM_KIND)
+#undef DEF_ENUM_KIND
+      Count
+};
+
+enum class BailoutReturnKind {
+  GetProp,
+  GetPropSuper,
+  SetProp,
+  GetElem,
+  GetElemSuper,
+  Call,
+  New,
+  Count
+};
+
+// Class storing code and offsets for all Baseline IC fallback trampolines. This
+// is stored in JitRuntime and generated when creating the JitRuntime.
+class BaselineICFallbackCode {
+  JitCode* code_ = nullptr;
+  using OffsetArray =
+      mozilla::EnumeratedArray<BaselineICFallbackKind,
+                               BaselineICFallbackKind::Count, uint32_t>;
+  OffsetArray offsets_ = {};
+
+  // Keep track of offset into various baseline stubs' code at return
+  // point from called script.
+  using BailoutReturnArray =
+      mozilla::EnumeratedArray<BailoutReturnKind, BailoutReturnKind::Count,
+                               uint32_t>;
+  BailoutReturnArray bailoutReturnOffsets_ = {};
+
+ public:
+  BaselineICFallbackCode() = default;
+  BaselineICFallbackCode(const BaselineICFallbackCode&) = delete;
+  void operator=(const BaselineICFallbackCode&) = delete;
+
+  void initOffset(BaselineICFallbackKind kind, uint32_t offset) {
+    offsets_[kind] = offset;
+  }
+  void initCode(JitCode* code) { code_ = code; }
+  void initBailoutReturnOffset(BailoutReturnKind kind, uint32_t offset) {
+    bailoutReturnOffsets_[kind] = offset;
+  }
+  TrampolinePtr addr(BaselineICFallbackKind kind) const {
+    return TrampolinePtr(code_->raw() + offsets_[kind]);
+  }
+  uint8_t* bailoutReturnAddr(BailoutReturnKind kind) const {
+    return code_->raw() + bailoutReturnOffsets_[kind];
+  }
+};
+
 typedef void (*EnterJitCode)(void* code, unsigned argc, Value* argv,
                              InterpreterFrame* fp, CalleeToken calleeToken,
                              JSObject* envChain, size_t numStackValues,
@@ -155,6 +211,8 @@ class JitRuntime {
   // trampolineCode_.
   VMWrapperOffsets tailCallFunctionWrapperOffsets_;
 
+  MainThreadData<BaselineICFallbackCode> baselineICFallbackCode_;
+
   // Global table of jitcode native address => bytecode address mappings.
   UnprotectedData<JitcodeGlobalTable*> jitcodeGlobalTable_;
 
@@ -181,6 +239,9 @@ class JitRuntime {
   MainThreadData<uint64_t> disambiguationId_;
 
  private:
+  bool generateTrampolines(JSContext* cx);
+  bool generateBaselineICFallbackCode(JSContext* cx);
+
   void generateLazyLinkStub(MacroAssembler& masm);
   void generateInterpreterStub(MacroAssembler& masm);
   void generateDoubleToInt32ValueStub(MacroAssembler& masm);
@@ -242,6 +303,10 @@ class JitRuntime {
 
   ExecutableAllocator& execAlloc() { return execAlloc_.ref(); }
 
+  const BaselineICFallbackCode& baselineICFallbackCode() const {
+    return baselineICFallbackCode_.ref();
+  }
+
   IonCompilationId nextCompilationId() {
     return IonCompilationId(nextCompilationId_++);
   }
@@ -471,17 +536,6 @@ class JitZone {
   void purgeIonCacheIRStubInfo() { ionCacheIRStubInfoSet_.clearAndCompact(); }
 };
 
-enum class BailoutReturnStub {
-  GetProp,
-  GetPropSuper,
-  SetProp,
-  GetElem,
-  GetElemSuper,
-  Call,
-  New,
-  Count
-};
-
 class JitRealm {
   friend class JitActivation;
 
@@ -491,20 +545,6 @@ class JitRealm {
                 ZoneAllocPolicy, IcStubCodeMapGCPolicy<uint32_t>>;
   ICStubCodeMap* stubCodes_;
 
-  // Keep track of offset into various baseline stubs' code at return
-  // point from called script.
-  struct BailoutReturnStubInfo {
-    void* addr;
-    uint32_t key;
-
-    BailoutReturnStubInfo() : addr(nullptr), key(0) {}
-    BailoutReturnStubInfo(void* addr_, uint32_t key_)
-        : addr(addr_), key(key_) {}
-  };
-  mozilla::EnumeratedArray<BailoutReturnStub, BailoutReturnStub::Count,
-                           BailoutReturnStubInfo>
-      bailoutReturnStubInfo_;
-
   // The JitRealm stores stubs to concatenate strings inline and perform RegExp
   // calls inline. These bake in zone and realm specific pointers and can't be
   // stored in JitRuntime. They also are dependent on the value of
@@ -557,14 +597,6 @@ class JitRealm {
     }
     return true;
   }
-  void initBailoutReturnAddr(void* addr, uint32_t key, BailoutReturnStub kind) {
-    MOZ_ASSERT(bailoutReturnStubInfo_[kind].addr == nullptr);
-    bailoutReturnStubInfo_[kind] = BailoutReturnStubInfo{addr, key};
-  }
-  void* bailoutReturnAddr(BailoutReturnStub kind) {
-    MOZ_ASSERT(bailoutReturnStubInfo_[kind].addr);
-    return bailoutReturnStubInfo_[kind].addr;
-  }
 
   JitRealm();
   ~JitRealm();

From c5b3ecc6209cea33180e903bd5f62417a6fcceca Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Tue, 2 Apr 2019 09:10:30 +0000
Subject: [PATCH 35/46] Bug 1540940 - Use growByUninitialized instead of growBy
 for BytecodeEmitter code and notes vectors. r=arai

Differential Revision: https://phabricator.services.mozilla.com/D25724

--HG--
extra : moz-landing-system : lando
---
 js/src/frontend/BytecodeEmitter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 668678abd959..9bfa38518d5c 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -224,7 +224,7 @@ bool BytecodeEmitter::markSimpleBreakpoint() {
 bool BytecodeEmitter::emitCheck(JSOp op, ptrdiff_t delta, ptrdiff_t* offset) {
   *offset = code().length();
 
-  if (!code().growBy(delta)) {
+  if (!code().growByUninitialized(delta)) {
     ReportOutOfMemory(cx);
     return false;
   }
@@ -9193,7 +9193,7 @@ bool BytecodeEmitter::emitTree(
 
 static bool AllocSrcNote(JSContext* cx, SrcNotesVector& notes,
                          unsigned* index) {
-  if (!notes.growBy(1)) {
+  if (!notes.growByUninitialized(1)) {
     ReportOutOfMemory(cx);
     return false;
   }

From 9ce2e13bcc402f1eea8c0083ecfe5bb29a6e7944 Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Mon, 1 Apr 2019 17:48:05 +0000
Subject: [PATCH 36/46] Bug 1538248 - Verify authenticity of Remote Settings
 records for Normandy r=mythmon,Gijs

Verify authenticity of Remote Settings records for Normandy

Differential Revision: https://phabricator.services.mozilla.com/D24716

--HG--
extra : moz-landing-system : lando
---
 .../components/normandy/lib/NormandyApi.jsm   | 98 +++++++++++--------
 .../components/normandy/lib/RecipeRunner.jsm  | 31 +++---
 .../test/browser/browser_RecipeRunner.js      | 59 +++++++++--
 3 files changed, 128 insertions(+), 60 deletions(-)

diff --git a/toolkit/components/normandy/lib/NormandyApi.jsm b/toolkit/components/normandy/lib/NormandyApi.jsm
index 88fba0629144..de8d3aee6ec4 100644
--- a/toolkit/components/normandy/lib/NormandyApi.jsm
+++ b/toolkit/components/normandy/lib/NormandyApi.jsm
@@ -55,11 +55,12 @@ var NormandyApi = {
   },
 
   absolutify(url) {
-    const apiBase = prefs.getCharPref("api_url");
-    const server = new URL(apiBase).origin;
     if (url.startsWith("http")) {
       return url;
-    } else if (url.startsWith("/")) {
+    }
+    const apiBase = prefs.getCharPref("api_url");
+    const server = new URL(apiBase).origin;
+    if (url.startsWith("/")) {
       return server + url;
     }
     throw new Error("Can't use relative urls");
@@ -87,50 +88,65 @@ var NormandyApi = {
     const rawText = await objectsResponse.text();
     const objectsWithSigs = JSON.parse(rawText);
 
-    const verifiedObjects = [];
+    return Promise.all(
+      objectsWithSigs.map(async (item) => {
+        // Check that the rawtext (the object and the signature)
+        // includes the CanonicalJSON version of the object. This isn't
+        // strictly needed, but it is a great benefit for debugging
+        // signature problems.
+        const object = item[type];
+        const serialized = CanonicalJSON.stringify(object);
+        if (!rawText.includes(serialized)) {
+          log.debug(rawText, serialized);
+          throw new NormandyApi.InvalidSignatureError(
+            `Canonical ${type} serialization does not match!`);
+        }
+        // Verify content signature using cryptography (will throw if fails).
+        await this.verifyObjectSignature(serialized, item.signature, type);
+        return object;
+      })
+    );
+  },
 
-    for (const objectWithSig of objectsWithSigs) {
-      const {signature, x5u} = objectWithSig.signature;
-      const object = objectWithSig[type];
+  /**
+   * Verify content signature, by serializing the specified `object` as
+   * canonical JSON, and using the Normandy signer verifier to check that
+   * it matches the signature specified in `signaturePayload`.
+   *
+   * @param {object|String} data The object (or string) to be checked
+   * @param {object} signaturePayload The signature information
+   * @param {String} signaturePayload.x5u The certificate chain URL
+   * @param {String} signaturePayload.signature base64 signature bytes
+   * @param {String} type The object type (eg. `"recipe"`, `"action"`)
+   *
+   * @throws {NormandyApi.InvalidSignatureError} if signature is invalid.
+   */
+  async verifyObjectSignature(data, signaturePayload, type) {
+    const { signature, x5u } = signaturePayload;
+    const certChainResponse = await this.get(this.absolutify(x5u));
+    const certChain = await certChainResponse.text();
+    const builtSignature = `p384ecdsa=${signature}`;
 
-      const serialized = CanonicalJSON.stringify(object);
-      // Check that the rawtext (the object and the signature)
-      // includes the CanonicalJSON version of the object. This isn't
-      // strictly needed, but it is a great benefit for debugging
-      // signature problems.
-      if (!rawText.includes(serialized)) {
-        log.debug(rawText, serialized);
-        throw new NormandyApi.InvalidSignatureError(
-          `Canonical ${type} serialization does not match!`);
-      }
+    const serialized = typeof data == "string" ? data : CanonicalJSON.stringify(data);
 
-      const certChainResponse = await this.get(this.absolutify(x5u));
-      const certChain = await certChainResponse.text();
-      const builtSignature = `p384ecdsa=${signature}`;
+    const verifier = Cc["@mozilla.org/security/contentsignatureverifier;1"]
+      .createInstance(Ci.nsIContentSignatureVerifier);
 
-      const verifier = Cc["@mozilla.org/security/contentsignatureverifier;1"]
-        .createInstance(Ci.nsIContentSignatureVerifier);
-
-      let valid;
-      try {
-        valid = verifier.verifyContentSignature(
-          serialized,
-          builtSignature,
-          certChain,
-          "normandy.content-signature.mozilla.org"
-        );
-      } catch (err) {
-        throw new NormandyApi.InvalidSignatureError(`${type} signature validation failed: ${err}`);
-      }
-
-      if (!valid) {
-        throw new NormandyApi.InvalidSignatureError(`${type} signature is not valid`);
-      }
-
-      verifiedObjects.push(object);
+    let valid;
+    try {
+      valid = verifier.verifyContentSignature(
+        serialized,
+        builtSignature,
+        certChain,
+        "normandy.content-signature.mozilla.org"
+      );
+    } catch (err) {
+      throw new NormandyApi.InvalidSignatureError(`${type} signature validation failed: ${err}`);
     }
 
-    return verifiedObjects;
+    if (!valid) {
+      throw new NormandyApi.InvalidSignatureError(`${type} signature is not valid`);
+    }
   },
 
   /**
diff --git a/toolkit/components/normandy/lib/RecipeRunner.jsm b/toolkit/components/normandy/lib/RecipeRunner.jsm
index 13761858f80f..ba2bd0d3a09e 100644
--- a/toolkit/components/normandy/lib/RecipeRunner.jsm
+++ b/toolkit/components/normandy/lib/RecipeRunner.jsm
@@ -50,7 +50,7 @@ const PREFS_TO_WATCH = [
 
 XPCOMUtils.defineLazyGetter(this, "gRemoteSettingsClient", () => {
   return RemoteSettings(REMOTE_SETTINGS_COLLECTION, {
-    filterFunc: async recipe => (await RecipeRunner.checkFilter(recipe)) ? recipe : null,
+    filterFunc: async entry => (await RecipeRunner.checkFilter(entry.recipe)) ? entry : null,
   });
 });
 
@@ -215,7 +215,15 @@ var RecipeRunner = {
     try {
       recipesToRun = await this.loadRecipes();
     } catch (e) {
-      // The legacy call to `Normandy.fetchRecipes()` can throw.
+      // Either we failed at fetching the recipes from server (legacy),
+      // or the recipes signature verification failed.
+      let status = Uptake.RUNNER_SERVER_ERROR;
+      if (/NetworkError/.test(e)) {
+        status = Uptake.RUNNER_NETWORK_ERROR;
+      } else if (e instanceof NormandyApi.InvalidSignatureError) {
+        status = Uptake.RUNNER_INVALID_SIGNATURE;
+      }
+      await Uptake.reportRunner(status);
       return;
     }
 
@@ -242,10 +250,17 @@ var RecipeRunner = {
    */
   async loadRecipes() {
     // If RemoteSettings is enabled, we read the list of recipes from there.
-    // The JEXL filtering is done via the provided callback.
+    // The JEXL filtering is done via the provided callback (see `gRemoteSettingsClient`).
     if (await FeatureGate.isEnabled("normandy-remote-settings")) {
-      return gRemoteSettingsClient.get();
+      // First, fetch recipes whose JEXL filters match.
+      const entries = await gRemoteSettingsClient.get();
+      // Then, verify the signature of each recipe. It will throw if invalid.
+      return Promise.all(entries.map(async ( { recipe, signature } ) => {
+        await NormandyApi.verifyObjectSignature(recipe, signature, "recipe");
+        return recipe;
+      }));
     }
+
     // Obtain the recipes from the Normandy server (legacy).
     let recipes;
     try {
@@ -257,14 +272,6 @@ var RecipeRunner = {
     } catch (e) {
       const apiUrl = Services.prefs.getCharPref(API_URL_PREF);
       log.error(`Could not fetch recipes from ${apiUrl}: "${e}"`);
-
-      let status = Uptake.RUNNER_SERVER_ERROR;
-      if (/NetworkError/.test(e)) {
-        status = Uptake.RUNNER_NETWORK_ERROR;
-      } else if (e instanceof NormandyApi.InvalidSignatureError) {
-        status = Uptake.RUNNER_INVALID_SIGNATURE;
-      }
-      await Uptake.reportRunner(status);
       throw e;
     }
     // Evaluate recipe filters
diff --git a/toolkit/components/normandy/test/browser/browser_RecipeRunner.js b/toolkit/components/normandy/test/browser/browser_RecipeRunner.js
index bb75e0f93cd7..22245aecca7f 100644
--- a/toolkit/components/normandy/test/browser/browser_RecipeRunner.js
+++ b/toolkit/components/normandy/test/browser/browser_RecipeRunner.js
@@ -205,33 +205,42 @@ decorate_task(
       ["features.normandy-remote-settings.enabled", true],
     ],
   }),
+  withStub(NormandyApi, "verifyObjectSignature"),
   withStub(ActionsManager.prototype, "runRecipe"),
   withStub(ActionsManager.prototype, "fetchRemoteActions"),
   withStub(ActionsManager.prototype, "finalize"),
   withStub(Uptake, "reportRecipe"),
   async function testReadFromRemoteSettings(
+    verifyObjectSignatureStub,
     runRecipeStub,
     fetchRemoteActionsStub,
     finalizeStub,
     reportRecipeStub,
   ) {
-    const matchRecipe = { id: "match", action: "matchAction", filter_expression: "true", _status: "synced", enabled: true };
-    const noMatchRecipe = { id: "noMatch", action: "noMatchAction", filter_expression: "false", _status: "synced", enabled: true };
-    const missingRecipe = { id: "missing", action: "missingAction", filter_expression: "true", _status: "synced", enabled: true };
+    const matchRecipe =  { name: "match", action: "matchAction", filter_expression: "true" };
+    const noMatchRecipe = { name: "noMatch", action: "noMatchAction", filter_expression: "false" };
+    const missingRecipe = { name: "missing", action: "missingAction", filter_expression: "true" };
 
     const rsCollection = await RecipeRunner._remoteSettingsClientForTesting.openCollection();
-    await rsCollection.create(matchRecipe, { synced: true });
-    await rsCollection.create(noMatchRecipe, { synced: true });
-    await rsCollection.create(missingRecipe, { synced: true });
+    await rsCollection.clear();
+    const fakeSig = { signature: "abc" };
+    await rsCollection.create({ id: "match", recipe: matchRecipe, signature: fakeSig }, { synced: true });
+    await rsCollection.create({ id: "noMatch", recipe: noMatchRecipe, signature: fakeSig }, { synced: true });
+    await rsCollection.create({ id: "missing", recipe: missingRecipe, signature: fakeSig }, { synced: true });
     await rsCollection.db.saveLastModified(42);
     rsCollection.db.close();
 
     await RecipeRunner.run();
 
+    Assert.deepEqual(
+      verifyObjectSignatureStub.args,
+      [[matchRecipe, fakeSig, "recipe"], [missingRecipe, fakeSig, "recipe"]],
+      "recipes with matching filters should have their signature verified",
+    );
     Assert.deepEqual(
       runRecipeStub.args,
       [[matchRecipe], [missingRecipe]],
-      "recipe with matching filters should be executed",
+      "recipes with matching filters should be executed",
     );
     Assert.deepEqual(
       reportRecipeStub.args,
@@ -241,6 +250,42 @@ decorate_task(
   }
 );
 
+decorate_task(
+  withPrefEnv({
+    set: [
+      ["features.normandy-remote-settings.enabled", true],
+    ],
+  }),
+  withStub(ActionsManager.prototype, "runRecipe"),
+  withStub(NormandyApi, "get"),
+  withStub(Uptake, "reportRunner"),
+  async function testBadSignatureFromRemoteSettings(
+    runRecipeStub,
+    normandyGetStub,
+    reportRunnerStub,
+  ) {
+    normandyGetStub.resolves({ async text() { return "---CERT x5u----"; } });
+
+    const matchRecipe = { name: "badSig", action: "matchAction", filter_expression: "true" };
+
+    const rsCollection = await RecipeRunner._remoteSettingsClientForTesting.openCollection();
+    await rsCollection.clear();
+    const badSig = { x5u: "http://localhost/x5u", signature: "abc" };
+    await rsCollection.create({ id: "badSig", recipe: matchRecipe, signature: badSig }, { synced: true });
+    await rsCollection.db.saveLastModified(42);
+    rsCollection.db.close();
+
+    await RecipeRunner.run();
+
+    ok(!runRecipeStub.called, "no recipe is executed");
+    Assert.deepEqual(
+      reportRunnerStub.args,
+      [[Uptake.RUNNER_INVALID_SIGNATURE]],
+      "RecipeRunner should report uptake telemetry",
+    );
+  }
+);
+
 decorate_task(
   withMockNormandyApi,
   async function testRunFetchFail(mockApi) {

From f0624a23a4e3e8b6505d17b514633ede7184091c Mon Sep 17 00:00:00 2001
From: Florin Strugariu <fstrugariu@mozilla.com>
Date: Mon, 1 Apr 2019 15:00:50 +0000
Subject: [PATCH 37/46] Bug 1540629 remove screenshots from tp6-8-404 r=rwood

Differential Revision: https://phabricator.services.mozilla.com/D25563

--HG--
extra : moz-landing-system : lando
---
 testing/raptor/raptor/tests/raptor-tp6-8-404.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing/raptor/raptor/tests/raptor-tp6-8-404.ini b/testing/raptor/raptor/tests/raptor-tp6-8-404.ini
index 54e8ea561081..09f20dac609f 100644
--- a/testing/raptor/raptor/tests/raptor-tp6-8-404.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-8-404.ini
@@ -17,7 +17,6 @@ page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
-screen_capture=true
 
 [raptor-tp6-ebay-mitm-404-recordings-202-firefox]
 apps = firefox

From ea8010a2cc9b1b1b8c1fc25121376e0b4c3220fc Mon Sep 17 00:00:00 2001
From: Khyati Agarwal <f20160385@hyderabad.bits-pilani.ac.in>
Date: Tue, 2 Apr 2019 10:26:04 +0000
Subject: [PATCH 38/46] bug 1533290 - Stop using --panel-disabled-color for
 subviewbutton shortcuts (where the subviewbutton is also a menuitem) r=dao

Stop using --panel-disabled-color for subviewbutton shortcuts (where the subviewbutton is also a menuitem)

Differential Revision: https://phabricator.services.mozilla.com/D25521

--HG--
extra : moz-landing-system : lando
---
 browser/themes/shared/customizableui/panelUI.inc.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 17f5a1180b3d..5407661f929f 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -1319,7 +1319,6 @@ menuitem.panel-subview-footer@menuStateActive@,
   -moz-box-pack: end;
   margin-inline-start: 10px;
   margin-inline-end: auto;
-  color: var(--panel-disabled-color);
 }
 
 #PanelUI-remotetabs-tabslist > toolbarbutton[itemtype="tab"],

From cbbbdeac6d630ed5fad03ac4296497bca523eded Mon Sep 17 00:00:00 2001
From: violet <violet.bugreport@gmail.com>
Date: Tue, 2 Apr 2019 10:09:31 +0000
Subject: [PATCH 39/46] Bug 1455824 - Disable TEST 18 of
 test_font_loading_api.html on Android for fragile timeout behavior r=emilio

TEST 18 of layout/style/test/test_font_loading_api.html is fragile on Android in the sense
that adding a new mochitest in an irrelevant directory (e.g. layout/svg/test)
might cause a failure rate close to 50%. See Comment 34 in Bug 1455824.
Increasing SimpleTest.requestLongerTimeout() doesn't make much difference, see
https://treeherder.mozilla.org/#/jobs?repo=try&revision=c954cc8621372252a500fe1db04fb06edd636d9c.

Comment 43 and 44 from Testing team suggested the drastical failure increasing
is probably only related to different task grouping when a new testcase is added
elsewhere.

We should probably disable it now on Android platform, because it might cause
false-negative and confusion when someone lands an unrelated mochitest in
an irrelevant directory.

Differential Revision: https://phabricator.services.mozilla.com/D25718

--HG--
extra : moz-landing-system : lando
---
 layout/style/test/test_font_loading_api.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/layout/style/test/test_font_loading_api.html b/layout/style/test/test_font_loading_api.html
index 48acba73c920..dbfbe1b1d3a7 100644
--- a/layout/style/test/test_font_loading_api.html
+++ b/layout/style/test/test_font_loading_api.html
@@ -409,6 +409,13 @@ function runTest() {
     // (TEST 18) Test passing valid url() source strings to the FontFace
     // constructor.
     var p = Promise.resolve();
+
+    // The sub-test is very fragile on Android platform, see Bug 1455824,
+    // especially Comment 34.
+    if (navigator.appVersion.includes("Android")) {
+      return p;
+    }
+
     sourceWindows.forEach(function({ win, what }) {
       p = p.then(function() {
         var srcTests = Promise.resolve();

From cb61e41e7ac6e9d8804e883dcbd283208c0d1aec Mon Sep 17 00:00:00 2001
From: Dhyey Thakore <dhyey35@gmail.com>
Date: Tue, 2 Apr 2019 11:17:00 +0000
Subject: [PATCH 40/46] Bug 1258809 - fix and re-enable netmonitor devtools
 details UI test, r=Honza

Differential Revision: https://phabricator.services.mozilla.com/D24003

--HG--
extra : moz-landing-system : lando
---
 devtools/client/netmonitor/test/browser.ini   |   1 -
 .../browser_net_simple-request-details.js     | 337 +++++++++---------
 2 files changed, 160 insertions(+), 178 deletions(-)

diff --git a/devtools/client/netmonitor/test/browser.ini b/devtools/client/netmonitor/test/browser.ini
index 3c988d05b634..d368ba293bd7 100644
--- a/devtools/client/netmonitor/test/browser.ini
+++ b/devtools/client/netmonitor/test/browser.ini
@@ -187,7 +187,6 @@ skip-if = os == 'win' # bug 1391264
 [browser_net_set-cookie-same-site.js]
 [browser_net_simple-request-data.js]
 [browser_net_simple-request-details.js]
-skip-if = true # Bug 1258809
 [browser_net_simple-request.js]
 [browser_net_sort-01.js]
 [browser_net_sort-02.js]
diff --git a/devtools/client/netmonitor/test/browser_net_simple-request-details.js b/devtools/client/netmonitor/test/browser_net_simple-request-details.js
index aa8aa07848e3..78306c5fca31 100644
--- a/devtools/client/netmonitor/test/browser_net_simple-request-details.js
+++ b/devtools/client/netmonitor/test/browser_net_simple-request-details.js
@@ -13,14 +13,13 @@ add_task(async function() {
   const { tab, monitor } = await initNetMonitor(SIMPLE_SJS);
   info("Starting test... ");
 
-  const { document, store, windowRequire, NetMonitorView } = monitor.panelWin;
+  const { document, store, windowRequire } = monitor.panelWin;
   const Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
-  const { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
+  const { PANELS } = windowRequire("devtools/client/netmonitor/src/constants");
   const {
     getSelectedRequest,
     getSortedRequests,
   } = windowRequire("devtools/client/netmonitor/src/selectors/index");
-  const Editor = require("devtools/client/shared/sourceeditor/editor");
 
   store.dispatch(Actions.batchEnable(false));
 
@@ -35,6 +34,8 @@ add_task(async function() {
   is(!!document.querySelector(".network-details-panel"), false,
     "The network details panel should still be hidden after first request.");
 
+  const waitForHeaders = waitForDOM(document, ".headers-overview");
+
   store.dispatch(Actions.toggleNetworkDetails());
 
   isnot(getSelectedRequest(store.getState()), undefined,
@@ -44,11 +45,13 @@ add_task(async function() {
   is(!!document.querySelector(".network-details-panel"), true,
     "The network details panel should not be hidden after toggle button was pressed.");
 
-  testHeadersTab();
+  await waitForHeaders;
+
+  await testHeadersTab();
   await testCookiesTab();
-  testParamsTab();
+  await testParamsTab();
   await testResponseTab();
-  testTimingsTab();
+  await testTimingsTab();
   return teardown(monitor);
 
   function getSelectedIndex(state) {
@@ -58,215 +61,195 @@ add_task(async function() {
     return getSortedRequests(state).findIndex(r => r.id === state.requests.selectedId);
   }
 
-  function testHeadersTab() {
-    const tabEl = document.querySelectorAll("#details-pane tab")[0];
-    const tabpanel = document.querySelectorAll("#details-pane tabpanel")[0];
+  async function testHeadersTab() {
+    const tabEl = document.querySelectorAll(".network-details-panel .tabs-menu a")[0];
+    const tabpanel = document.querySelector(".network-details-panel .tab-panel");
 
-    is(tabEl.getAttribute("selected"), "true",
+    is(tabEl.getAttribute("aria-selected"), "true",
       "The headers tab in the network details pane should be selected.");
-
-    is(tabpanel.querySelector("#headers-summary-url-value").getAttribute("value"),
+    // Request URL
+    is(tabpanel.querySelectorAll(".tabpanel-summary-value")[0].innerText,
       SIMPLE_SJS, "The url summary value is incorrect.");
-    is(tabpanel.querySelector("#headers-summary-url-value").getAttribute("tooltiptext"),
-      SIMPLE_SJS, "The url summary tooltiptext is incorrect.");
-    is(tabpanel.querySelector("#headers-summary-method-value").getAttribute("value"),
+    // Request method
+    is(tabpanel.querySelectorAll(".tabpanel-summary-value")[1].innerText,
       "GET", "The method summary value is incorrect.");
-    is(tabpanel.querySelector("#headers-summary-address-value").getAttribute("value"),
+    // Remote address
+    is(tabpanel.querySelectorAll(".tabpanel-summary-value")[2].innerText,
       "127.0.0.1:8888", "The remote address summary value is incorrect.");
-    is(tabpanel.querySelector("#headers-summary-status-circle").getAttribute("data-code"),
+    // Status code
+    is(tabpanel.querySelector(".requests-list-status-code").innerText,
       "200", "The status summary code is incorrect.");
-    is(tabpanel.querySelector("#headers-summary-status-value").getAttribute("value"),
-      "200 Och Aye", "The status summary value is incorrect.");
+    is(tabpanel.querySelector(".status-text").getAttribute("value"),
+      "Och Aye", "The status summary value is incorrect.");
+    // Version
+    is(tabpanel.querySelectorAll(".tabpanel-summary-value")[4].innerText,
+    "HTTP/1.1", "The HTTP version is incorrect.");
 
-    is(tabpanel.querySelectorAll(".variables-view-scope").length, 2,
+    await waitForRequestData(store, ["requestHeaders", "responseHeaders"]);
+
+    is(tabpanel.querySelectorAll(".treeTable tbody .tree-section").length, 2,
       "There should be 2 header scopes displayed in this tabpanel.");
-    is(tabpanel.querySelectorAll(".variable-or-property").length, 19,
-      "There should be 19 header values displayed in this tabpanel.");
 
-    is(tabpanel.querySelectorAll(".variables-view-empty-notice").length, 0,
-      "The empty notice should not be displayed in this tabpanel.");
+    is(tabpanel.querySelectorAll(":not(.tree-section) > .treeLabelCell").length,
+      23, "There should be 23 header values displayed in this tabpanel.");
 
-    const responseScope = tabpanel.querySelectorAll(".variables-view-scope")[0];
-    const requestScope = tabpanel.querySelectorAll(".variables-view-scope")[1];
+    const headersTable = tabpanel.querySelector(".treeTable tbody");
+    const responseScope = headersTable.querySelectorAll("tr[id^='/Response headers']");
+    const requestScope = headersTable.querySelectorAll("tr[id^='/Request headers']");
 
-    is(responseScope.querySelector(".name").getAttribute("value"),
-      L10N.getStr("responseHeaders") + " (" +
-      L10N.getFormatStr("networkMenu.sizeKB",
-        L10N.numberWithDecimals(330 / 1024, 3)) + ")",
+    ok(headersTable.querySelectorAll(".tree-section .treeLabel")[0].innerHTML
+      .match(new RegExp(L10N.getStr("responseHeaders") + " \\([0-9]+ .+\\)")),
       "The response headers scope doesn't have the correct title.");
 
-    ok(requestScope.querySelector(".name").getAttribute("value").includes(
-      L10N.getStr("requestHeaders") + " (0"),
+    ok(headersTable.querySelectorAll(".tree-section .treeLabel")[1].innerHTML.includes(
+      L10N.getStr("requestHeaders") + " ("),
       "The request headers scope doesn't have the correct title.");
-    // Can't test for full request headers title because the size may
-    // vary across platforms ("User-Agent" header differs). We're pretty
-    // sure it's smaller than 1 MB though, so it starts with a 0.
 
-    is(responseScope.querySelectorAll(".variables-view-variable .name")[0]
-      .getAttribute("value"),
-      "Cache-Control", "The first response header name was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .value")[0]
-      .getAttribute("value"),
-      "\"no-cache, no-store, must-revalidate\"",
-      "The first response header value was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .name")[1]
-      .getAttribute("value"),
-      "Connection", "The second response header name was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .value")[1]
-      .getAttribute("value"),
-      "\"close\"", "The second response header value was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .name")[2]
-      .getAttribute("value"),
-      "Content-Length", "The third response header name was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .value")[2]
-      .getAttribute("value"),
-      "\"12\"", "The third response header value was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .name")[3]
-      .getAttribute("value"),
-      "Content-Type", "The fourth response header name was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .value")[3]
-      .getAttribute("value"),
-      "\"text/plain; charset=utf-8\"", "The fourth response header value was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .name")[9]
-      .getAttribute("value"),
-      "foo-bar", "The last response header name was incorrect.");
-    is(responseScope.querySelectorAll(".variables-view-variable .value")[9]
-      .getAttribute("value"),
-      "\"baz\"", "The last response header value was incorrect.");
+    const responseHeaders = [
+      {
+        name: "cache-control",
+        value: "no-cache, no-store, must-revalidate",
+        pos: "first",
+        index: 1,
+      },
+      {
+        name: "connection",
+        value: "close",
+        pos: "second",
+        index: 2,
+      },
+      {
+        name: "content-length",
+        value: "12",
+        pos: "third",
+        index: 3,
+      },
+      {
+        name: "content-type",
+        value: "text/plain; charset=utf-8",
+        pos: "fourth",
+        index: 4,
+      },
+      {
+        name: "foo-bar",
+        value: "baz",
+        pos: "seventh",
+        index: 7,
+      },
+    ];
+    responseHeaders.forEach((header) => {
+      is(responseScope[header.index].querySelector(".treeLabel").innerHTML,
+        header.name, `The ${header.pos} response header name was incorrect.`);
+      is(responseScope[header.index].querySelector(".objectBox").innerHTML,
+        header.value, `The ${header.pos} response header value was incorrect.`);
+    });
 
-    is(requestScope.querySelectorAll(".variables-view-variable .name")[0]
-      .getAttribute("value"),
-      "Host", "The first request header name was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .value")[0]
-      .getAttribute("value"),
-      "\"example.com\"", "The first request header value was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .name")[6]
-      .getAttribute("value"),
-      "Connection", "The ante-penultimate request header name was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .value")[6]
-      .getAttribute("value"),
-      "\"keep-alive\"", "The ante-penultimate request header value was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .name")[7]
-      .getAttribute("value"),
-      "Pragma", "The penultimate request header name was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .value")[7]
-      .getAttribute("value"),
-      "\"no-cache\"", "The penultimate request header value was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .name")[8]
-      .getAttribute("value"),
-      "Cache-Control", "The last request header name was incorrect.");
-    is(requestScope.querySelectorAll(".variables-view-variable .value")[8]
-      .getAttribute("value"),
-      "\"no-cache\"", "The last request header value was incorrect.");
+    const requestHeaders = [
+      {
+        name: "Cache-Control",
+        value: "no-cache",
+        pos: "fourth",
+        index: 4,
+      },
+      {
+        name: "Connection",
+        value: "keep-alive",
+        pos: "fifth",
+        index: 5,
+      },
+      {
+        name: "Host",
+        value: "example.com",
+        pos: "seventh",
+        index: 7,
+      },
+      {
+        name: "Pragma",
+        value: "no-cache",
+        pos: "eighth",
+        index: 8,
+      },
+    ];
+    requestHeaders.forEach((header) => {
+      is(requestScope[header.index].querySelector(".treeLabel").innerHTML,
+        header.name, `The ${header.pos} request header name was incorrect.`);
+      is(requestScope[header.index].querySelector(".objectBox").innerHTML,
+        header.value, `The ${header.pos} request header value was incorrect.`);
+    });
   }
 
   async function testCookiesTab() {
-    const onEvent = monitor.panelWin.api.once(EVENTS.TAB_UPDATED);
-    EventUtils.sendMouseEvent({ type: "mousedown" },
-      document.querySelectorAll("#details-pane tab")[1]);
-    await onEvent;
+    const tabpanel = await selectTab(PANELS.COOKIES, 1);
 
-    const tabEl = document.querySelectorAll("#details-pane tab")[1];
-    const tabpanel = document.querySelectorAll("#details-pane tabpanel")[1];
-
-    is(tabEl.getAttribute("selected"), "true",
-      "The cookies tab in the network details pane should be selected.");
-
-    is(tabpanel.querySelectorAll(".variables-view-scope").length, 2,
+    const cookieTable = tabpanel.querySelector(".treeTable tbody");
+    is(cookieTable.querySelectorAll(".tree-section").length, 2,
       "There should be 2 cookie scopes displayed in this tabpanel.");
-    is(tabpanel.querySelectorAll(".variable-or-property").length, 6,
-      "There should be 6 cookie values displayed in this tabpanel.");
+    // 2 Cookies in response - 1 httpOnly and 1 value for each cookie - total 6
+    is(cookieTable.querySelectorAll("tr[id^='/Response cookies/'").length, 6,
+      "There should be 6 rows displayed in response cookies table");
+    is(cookieTable.querySelectorAll("tr[id^='/Request cookies/'").length, 2,
+      "There should be 2 cookie values displayed in request cookies table.");
   }
 
-  function testParamsTab() {
-    EventUtils.sendMouseEvent({ type: "mousedown" },
-      document.querySelectorAll("#details-pane tab")[2]);
+  async function testParamsTab() {
+    const tabpanel = await selectTab(PANELS.PARAMS, 2);
 
-    const tabEl = document.querySelectorAll("#details-pane tab")[2];
-    const tabpanel = document.querySelectorAll("#details-pane tabpanel")[2];
-
-    is(tabEl.getAttribute("selected"), "true",
-      "The params tab in the network details pane should be selected.");
-
-    is(tabpanel.querySelectorAll(".variables-view-scope").length, 0,
+    is(tabpanel.querySelectorAll(".panel-container").length, 0,
       "There should be no param scopes displayed in this tabpanel.");
-    is(tabpanel.querySelectorAll(".variable-or-property").length, 0,
-      "There should be no param values displayed in this tabpanel.");
-    is(tabpanel.querySelectorAll(".variables-view-empty-notice").length, 1,
+    is(tabpanel.querySelectorAll(".empty-notice").length, 1,
       "The empty notice should be displayed in this tabpanel.");
-
-    is(tabpanel.querySelector("#request-params-box")
-      .hasAttribute("hidden"), false,
-      "The request params box should not be hidden.");
-    is(tabpanel.querySelector("#request-post-data-textarea-box")
-      .hasAttribute("hidden"), true,
-      "The request post data textarea box should be hidden.");
   }
 
   async function testResponseTab() {
-    const onEvent = monitor.panelWin.api.once(EVENTS.TAB_UPDATED);
-    EventUtils.sendMouseEvent({ type: "mousedown" },
-      document.querySelectorAll("#details-pane tab")[3]);
-    await onEvent;
+    const tabpanel = await selectTab(PANELS.RESPONSE, 3);
+    await waitForDOM(document, ".treeTable tbody");
 
-    const tabEl = document.querySelectorAll("#details-pane tab")[3];
-    const tabpanel = document.querySelectorAll("#details-pane tabpanel")[3];
-
-    is(tabEl.getAttribute("selected"), "true",
-      "The response tab in the network details pane should be selected.");
-
-    is(tabpanel.querySelector("#response-content-info-header")
-      .hasAttribute("hidden"), true,
-      "The response info header should be hidden.");
-    is(tabpanel.querySelector("#response-content-json-box")
-      .hasAttribute("hidden"), true,
-      "The response content json box should be hidden.");
-    is(tabpanel.querySelector("#response-content-textarea-box")
-      .hasAttribute("hidden"), false,
-      "The response content textarea box should not be hidden.");
-    is(tabpanel.querySelector("#response-content-image-box")
-      .hasAttribute("hidden"), true,
-      "The response content image box should be hidden.");
-
-    const editor = await NetMonitorView.editor("#response-content-textarea");
-    is(editor.getText(), "Hello world!",
-      "The text shown in the source editor is incorrect.");
-    is(editor.getMode(), Editor.modes.text,
-      "The mode active in the source editor is incorrect.");
+    const responseTable = tabpanel.querySelector(".treeTable tbody");
+    is(responseTable.querySelectorAll(".tree-section").length, 1,
+      "There should be 1 response scope displayed in this tabpanel.");
+    is(responseTable.querySelectorAll(".editor-row-container").length, 1,
+      "The response payload tab should be open initially.");
   }
 
-  function testTimingsTab() {
-    EventUtils.sendMouseEvent({ type: "mousedown" },
-      document.querySelectorAll("#details-pane tab")[4]);
+  async function testTimingsTab() {
+    const tabpanel = await selectTab(PANELS.TIMINGS, 4);
 
-    const tabEl = document.querySelectorAll("#details-pane tab")[4];
-    const tabpanel = document.querySelectorAll("#details-pane tabpanel")[4];
+    const displayFormat = new RegExp(/[0-9]+ ms$/);
+    const propsToVerify = [
+      "blocked",
+      "dns",
+      "connect",
+      "ssl",
+      "send",
+      "wait",
+      "receive",
+    ];
 
-    is(tabEl.getAttribute("selected"), "true",
-      "The timings tab in the network details pane should be selected.");
+    // To ensure that test case for a new property is written, otherwise this
+    // test will fail
+    is(tabpanel.querySelectorAll(".tabpanel-summary-container").length,
+      propsToVerify.length,
+      `There should be exactly ${propsToVerify.length} values
+      displayed in this tabpanel`);
 
-    ok(tabpanel.querySelector("#timings-summary-blocked .requests-list-timings-total")
-      .getAttribute("value").match(/[0-9]+/),
-      "The blocked timing info does not appear to be correct.");
+    propsToVerify.forEach((propName) => {
+      ok(tabpanel.querySelector(`#timings-summary-${propName}
+      .requests-list-timings-total`)
+        .innerHTML.match(displayFormat),
+        `The ${propName} timing info does not appear to be correct.`);
+    });
+  }
 
-    ok(tabpanel.querySelector("#timings-summary-dns .requests-list-timings-total")
-      .getAttribute("value").match(/[0-9]+/),
-      "The dns timing info does not appear to be correct.");
+  async function selectTab(tabName, pos) {
+    const tabEl = document.querySelectorAll(".network-details-panel .tabs-menu a")[pos];
 
-    ok(tabpanel.querySelector("#timings-summary-connect .requests-list-timings-total")
-      .getAttribute("value").match(/[0-9]+/),
-      "The connect timing info does not appear to be correct.");
+    const onPanelOpen = waitForDOM(document, `#${tabName}-panel`);
+    EventUtils.sendMouseEvent({ type: "click" }, tabEl);
+    await onPanelOpen;
 
-    ok(tabpanel.querySelector("#timings-summary-send .requests-list-timings-total")
-      .getAttribute("value").match(/[0-9]+/),
-      "The send timing info does not appear to be correct.");
+    is(tabEl.getAttribute("aria-selected"), "true",
+      `The ${tabName} tab in the network details pane should be selected.`);
 
-    ok(tabpanel.querySelector("#timings-summary-wait .requests-list-timings-total")
-      .getAttribute("value").match(/[0-9]+/),
-      "The wait timing info does not appear to be correct.");
-
-    ok(tabpanel.querySelector("#timings-summary-receive .requests-list-timings-total")
-      .getAttribute("value").match(/[0-9]+/),
-      "The receive timing info does not appear to be correct.");
+    return document.querySelector(".network-details-panel .tab-panel");
   }
 });

From f481b075d71a8cbaec8d87bde8d4f2d3e1534502 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Tue, 2 Apr 2019 09:31:09 +0000
Subject: [PATCH 41/46] Bug 1540650 - Fix UrlbarTestUtils to correctly get the
 title separator for QuantumBar following rtl changes (bug 1540650). r=dao

Differential Revision: https://phabricator.services.mozilla.com/D25581

--HG--
extra : moz-landing-system : lando
---
 browser/components/urlbar/tests/UrlbarTestUtils.jsm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/browser/components/urlbar/tests/UrlbarTestUtils.jsm b/browser/components/urlbar/tests/UrlbarTestUtils.jsm
index 5f90ee861374..e7934aac10ed 100644
--- a/browser/components/urlbar/tests/UrlbarTestUtils.jsm
+++ b/browser/components/urlbar/tests/UrlbarTestUtils.jsm
@@ -463,14 +463,12 @@ class UrlbarAbstraction {
         url: urls.length > 0 ? urls[0].textContent : null,
         typeIcon: typeIconStyle["background-image"],
       };
-      let actionElement = element.getElementsByClassName("urlbarView-action")[0];
-      let urlElement = element.getElementsByClassName("urlbarView-url")[0];
       details.element = {
-        action: actionElement,
+        action: element.getElementsByClassName("urlbarView-action")[0],
         row: element,
-        separator: urlElement || actionElement,
+        separator: element.getElementsByClassName("urlbarView-title-separator")[0],
         title: element.getElementsByClassName("urlbarView-title")[0],
-        url: urlElement,
+        url: element.getElementsByClassName("urlbarView-url")[0],
       };
       if (details.type == UrlbarUtils.RESULT_TYPE.SEARCH) {
         details.searchParams = {

From 07f8d9c3d4f04b1089d1567e149e9dacfcfbaa13 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Tue, 2 Apr 2019 10:05:01 +0000
Subject: [PATCH 42/46] Bug 1540662 - Fix the UITour starting an address bar
 search with QuantumBar enabled. r=mak

Differential Revision: https://phabricator.services.mozilla.com/D25588

--HG--
extra : moz-landing-system : lando
---
 browser/components/uitour/UITour.jsm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 0d7304124c7f..d4f5c2a83e8b 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -1318,7 +1318,10 @@ var UITour = {
       urlbar.value = SEARCH_STRING;
       urlbar.select();
       if (quantumbar) {
-        urlbar.startQuery();
+        urlbar.startQuery({
+          searchString: SEARCH_STRING,
+          allowAutofill: false,
+        });
       } else {
         urlbar.controller.startSearch(SEARCH_STRING);
       }

From 00087edc021b1c3f70f830c05d1cfd47026d6508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Mon, 1 Apr 2019 10:18:21 +0000
Subject: [PATCH 43/46] Bug 1539782: Don't attempt to resolve an already
 settled promise in the debugger. r=arai

Differential Revision: https://phabricator.services.mozilla.com/D25575

--HG--
extra : moz-landing-system : lando
---
 .../debug/onEnterFrame-async-resumption-11.js | 28 +++++++++++++++++++
 .../debug/onEnterFrame-async-resumption-12.js | 28 +++++++++++++++++++
 js/src/vm/Debugger.cpp                        | 12 ++++----
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 js/src/jit-test/tests/debug/onEnterFrame-async-resumption-11.js
 create mode 100644 js/src/jit-test/tests/debug/onEnterFrame-async-resumption-12.js

diff --git a/js/src/jit-test/tests/debug/onEnterFrame-async-resumption-11.js b/js/src/jit-test/tests/debug/onEnterFrame-async-resumption-11.js
new file mode 100644
index 000000000000..32adf64d857d
--- /dev/null
+++ b/js/src/jit-test/tests/debug/onEnterFrame-async-resumption-11.js
@@ -0,0 +1,28 @@
+// If the async function's promise is already resolved, any attempt to return
+// a differerent return value gets ignored.
+
+let g = newGlobal({newCompartment: true});
+g.eval(`
+    async function f() {
+        throw "ok";
+    }
+`);
+
+let dbg = new Debugger(g);
+
+let hits = 0;
+dbg.onEnterFrame = frame => {
+    frame.onPop = () => {
+        hits += 1;
+
+        // Normal functions can override the return value, but async functions
+        // have already resolved their promise, so this return request will get
+        // ignored.
+        return {return: "FAIL"};
+    };
+};
+
+g.f().catch(x => {
+    assertEq(hits, 1);
+    assertEq(x, "ok");
+});
diff --git a/js/src/jit-test/tests/debug/onEnterFrame-async-resumption-12.js b/js/src/jit-test/tests/debug/onEnterFrame-async-resumption-12.js
new file mode 100644
index 000000000000..28ad0c4c44ca
--- /dev/null
+++ b/js/src/jit-test/tests/debug/onEnterFrame-async-resumption-12.js
@@ -0,0 +1,28 @@
+// If the async function's promise is already resolved, any attempt to return
+// a differerent return value gets ignored.
+
+let g = newGlobal({newCompartment: true});
+g.eval(`
+    async function f() {
+        return "ok";
+    }
+`);
+
+let dbg = new Debugger(g);
+
+let hits = 0;
+dbg.onEnterFrame = frame => {
+    frame.onPop = () => {
+        hits += 1;
+
+        // Normal functions can override the return value, but async functions
+        // have already resolved their promise, so this return request will get
+        // ignored.
+        return {return: "FAIL"};
+    };
+};
+
+g.f().then(x => {
+    assertEq(hits, 1);
+    assertEq(x, "ok");
+});
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index a3a6519133de..63966db6a9e4 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1645,11 +1645,13 @@ static void AdjustGeneratorResumptionValue(JSContext* cx,
           cx, &genObj->as<AsyncFunctionGeneratorObject>());
 
       // 1.  `return <value>` fulfills and returns the async function's promise.
-      JSObject* promise = AsyncFunctionResolve(
-          cx, asyncGenObj, vp, AsyncFunctionResolveKind::Fulfill);
-      if (!promise) {
-        getAndClearExceptionThenThrow();
-        return;
+      Rooted<PromiseObject*> promise(cx, asyncGenObj->promise());
+      if (promise->state() == JS::PromiseState::Pending) {
+        if (!AsyncFunctionResolve(cx, asyncGenObj, vp,
+                                  AsyncFunctionResolveKind::Fulfill)) {
+          getAndClearExceptionThenThrow();
+          return;
+        }
       }
       vp.setObject(*promise);
 

From ad4932c97a005c9b5e0f0a4ae61f3f461dd75b5a Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Tue, 2 Apr 2019 08:51:30 +0000
Subject: [PATCH 44/46] Bug 1540625 - Fix isInWarningGroup invalid PropTypes.
 r=Honza.

The propType is changed to *not* required as the function is
only passed when the grouping pref is true.

Differential Revision: https://phabricator.services.mozilla.com/D25560

--HG--
extra : moz-landing-system : lando
---
 devtools/client/webconsole/components/ConsoleOutput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/client/webconsole/components/ConsoleOutput.js b/devtools/client/webconsole/components/ConsoleOutput.js
index def9d464717e..5835f7c5d1db 100644
--- a/devtools/client/webconsole/components/ConsoleOutput.js
+++ b/devtools/client/webconsole/components/ConsoleOutput.js
@@ -61,7 +61,7 @@ class ConsoleOutput extends Component {
       messagesTableData: PropTypes.object.isRequired,
       messagesRepeat: PropTypes.object.isRequired,
       warningGroups: PropTypes.object.isRequired,
-      isInWarningGroup: PropTypes.isRequired,
+      isInWarningGroup: PropTypes.func,
       networkMessagesUpdate: PropTypes.object.isRequired,
       visibleMessages: PropTypes.array.isRequired,
       networkMessageActiveTabId: PropTypes.string.isRequired,

From b23835262f0b8888eed9ca09a7a128e91cd41a93 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 2 Apr 2019 20:45:25 +0900
Subject: [PATCH 45/46] Followup for bug 1538060 - Unbust OSX ccov builds.
 r=me,a=CristianB

We rename the gcov_flush patch to force a rebuild of clang with the
updated patch.
---
 build/build-clang/clang-8-android.json              |  2 +-
 build/build-clang/clang-8-linux64.json              |  2 +-
 build/build-clang/clang-8-macosx64.json             |  1 +
 ...me_gcov_flush_.patch => rename_gcov_flush.patch} | 13 +++++++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 rename build/build-clang/{rename_gcov_flush_.patch => rename_gcov_flush.patch} (65%)

diff --git a/build/build-clang/clang-8-android.json b/build/build-clang/clang-8-android.json
index b8e8fa31832c..c3f1496a822b 100644
--- a/build/build-clang/clang-8-android.json
+++ b/build/build-clang/clang-8-android.json
@@ -47,6 +47,6 @@
     "patches": [
       "static-llvm-symbolizer.patch",
       "find_symbolizer_linux.patch",
-      "rename_gcov_flush_.patch"
+      "rename_gcov_flush.patch"
     ]
 }
diff --git a/build/build-clang/clang-8-linux64.json b/build/build-clang/clang-8-linux64.json
index 045de34d74c4..880bb12e7c47 100644
--- a/build/build-clang/clang-8-linux64.json
+++ b/build/build-clang/clang-8-linux64.json
@@ -18,7 +18,7 @@
     "patches": [
       "static-llvm-symbolizer.patch",
       "find_symbolizer_linux.patch",
-      "rename_gcov_flush_.patch",
+      "rename_gcov_flush.patch",
       "android-mangling-error.patch"
     ]
 }
diff --git a/build/build-clang/clang-8-macosx64.json b/build/build-clang/clang-8-macosx64.json
index 15743b4dad13..e81714d01318 100644
--- a/build/build-clang/clang-8-macosx64.json
+++ b/build/build-clang/clang-8-macosx64.json
@@ -22,6 +22,7 @@
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
       "static-llvm-symbolizer.patch",
+      "rename_gcov_flush.patch",
       "compiler-rt-cross-compile.patch",
       "compiler-rt-no-codesign.patch"
     ]
diff --git a/build/build-clang/rename_gcov_flush_.patch b/build/build-clang/rename_gcov_flush.patch
similarity index 65%
rename from build/build-clang/rename_gcov_flush_.patch
rename to build/build-clang/rename_gcov_flush.patch
index 56b559d24ca6..803036da1def 100644
--- a/build/build-clang/rename_gcov_flush_.patch
+++ b/build/build-clang/rename_gcov_flush.patch
@@ -25,3 +25,16 @@ index 9af64ed332c..bcebe303ff4 100644
      Builder.CreateCall(GCOVFlush);
      I->getParent()->splitBasicBlock(I);
    }
+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
+index e113f9a679..b3a07b18c0 100644
+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
+@@ -1058,7 +1058,7 @@ void Darwin::addProfileRTLibs(const ArgList &Args,
+   // runtime's functionality.
+   if (hasExportSymbolDirective(Args)) {
+     if (needsGCovInstrumentation(Args)) {
+-      addExportedSymbol(CmdArgs, "___gcov_flush");
++      addExportedSymbol(CmdArgs, "___custom_llvm_gcov_flush");
+       addExportedSymbol(CmdArgs, "_flush_fn_list");
+       addExportedSymbol(CmdArgs, "_writeout_fn_list");
+     } else {

From fc4f272cd447373ef0b22b0c8f7ef93e80d02653 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 2 Apr 2019 23:48:01 +0900
Subject: [PATCH 46/46] Followup for bug 1538060 again. More bustage fix.
 r=me,a=CristianB

---
 tools/code-coverage/CodeCoverageHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/code-coverage/CodeCoverageHandler.cpp b/tools/code-coverage/CodeCoverageHandler.cpp
index 378760e8b738..5260838ec991 100644
--- a/tools/code-coverage/CodeCoverageHandler.cpp
+++ b/tools/code-coverage/CodeCoverageHandler.cpp
@@ -33,7 +33,7 @@ using namespace mozilla;
 // Linux, to avoid naming clashes in builds which mix GCC and LLVM. So, when we
 // are building with LLVM exclusively, we need to use __custom_llvm_gcov_flush
 // instead.
-#if defined(XP_LINUX) && defined(__clang__)
+#if !defined(XP_WIN) && defined(__clang__)
 #  define __gcov_flush __custom_llvm_gcov_flush
 #endif