Backed out changeset 3336c8e9a43f (bug 1756518) for causing build bus…

…tages at Unified_cpp_xre_dllservices. CLOSED TREE
dothq · Mar 4, 2022 · 2fa3391 · 2fa3391
1 parent 02023dd
commit 2fa3391
Show file tree

Hide file tree

Showing 22 changed files with 72 additions and 221 deletions.
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
@@ -2766,15 +2766,6 @@ BrowserGlue.prototype = {
         },
       },
 
-      {
-        task: () => {
-          Services.obs.notifyObservers(
-            null,
-            "unblock-untrusted-modules-thread"
-          );
-        },
-      },
-
       // WebDriver components (Remote Agent and Marionette) need to be
       // initialized as very last step.
       {

diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
@@ -676,8 +676,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetXPCOMProcessAttributes(
     FullLookAndFeel&& aLookAndFeelData, dom::SystemFontList&& aFontList,
     Maybe<SharedMemoryHandle>&& aSharedUASheetHandle,
     const uintptr_t& aSharedUASheetAddress,
-    nsTArray<SharedMemoryHandle>&& aSharedFontListBlocks,
-    const bool& aIsReadyForBackgroundProcessing) {
+    nsTArray<SharedMemoryHandle>&& aSharedFontListBlocks) {
   if (!sShutdownCanary) {
     return IPC_OK();
   }
@@ -692,8 +691,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetXPCOMProcessAttributes(
 
   gfx::gfxVars::SetValuesForInitialize(aXPCOMInit.gfxNonDefaultVarUpdates());
   InitSharedUASheets(std::move(aSharedUASheetHandle), aSharedUASheetAddress);
-  InitXPCOM(std::move(aXPCOMInit), aInitialData,
-            aIsReadyForBackgroundProcessing);
+  InitXPCOM(std::move(aXPCOMInit), aInitialData);
   InitGraphicsDeviceData(aXPCOMInit.contentDeviceData());
 
   return IPC_OK();
@@ -1325,8 +1323,7 @@ void ContentChild::InitSharedUASheets(Maybe<SharedMemoryHandle>&& aHandle,
 
 void ContentChild::InitXPCOM(
     XPCOMInitData&& aXPCOMInit,
-    const mozilla::dom::ipc::StructuredCloneData& aInitialData,
-    bool aIsReadyForBackgroundProcessing) {
+    const mozilla::dom::ipc::StructuredCloneData& aInitialData) {
 #ifdef MOZ_WIDGET_GTK
   // LookAndFeel::NativeInit takes a long time to run on Linux, here we schedule
   // it as soon as possible after BackgroundChild::Startup to give
@@ -1339,7 +1336,7 @@ void ContentChild::InitXPCOM(
   // DLL services untrusted modules processing depends on
   // BackgroundChild::Startup having been called
   RefPtr<DllServices> dllSvc(DllServices::Get());
-  dllSvc->StartUntrustedModulesProcessor(aIsReadyForBackgroundProcessing);
+  dllSvc->StartUntrustedModulesProcessor();
 #endif  // defined(XP_WIN)
 
   PBackgroundChild* actorChild = BackgroundChild::GetOrCreateForCurrentThread();
@@ -1466,14 +1463,6 @@ mozilla::ipc::IPCResult ContentChild::RecvGetUntrustedModulesData(
       [aResolver](nsresult aReason) { aResolver(Nothing()); });
   return IPC_OK();
 }
-
-mozilla::ipc::IPCResult ContentChild::RecvUnblockUntrustedModulesThread() {
-  if (nsCOMPtr<nsIObserverService> obs =
-          mozilla::services::GetObserverService()) {
-    obs->NotifyObservers(nullptr, "unblock-untrusted-modules-thread", nullptr);
-  }
-  return IPC_OK();
-}
 #endif  // defined(XP_WIN)
 
 PCycleCollectWithLogsChild* ContentChild::AllocPCycleCollectWithLogsChild(

diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
@@ -124,8 +124,7 @@ class ContentChild final : public PContentChild,
             bool aIsForBrowser);
 
   void InitXPCOM(XPCOMInitData&& aXPCOMInit,
-                 const mozilla::dom::ipc::StructuredCloneData& aInitialData,
-                 bool aIsReadyForBackgroundProcessing);
+                 const mozilla::dom::ipc::StructuredCloneData& aInitialData);
 
   void InitSharedUASheets(Maybe<base::SharedMemoryHandle>&& aHandle,
                           uintptr_t aAddress);
@@ -539,16 +538,14 @@ class ContentChild final : public PContentChild,
 #if defined(XP_WIN)
   mozilla::ipc::IPCResult RecvGetUntrustedModulesData(
       GetUntrustedModulesDataResolver&& aResolver);
-  mozilla::ipc::IPCResult RecvUnblockUntrustedModulesThread();
 #endif  // defined(XP_WIN)
 
   mozilla::ipc::IPCResult RecvSetXPCOMProcessAttributes(
       XPCOMInitData&& aXPCOMInit, const StructuredCloneData& aInitialData,
       FullLookAndFeel&& aLookAndFeelData, SystemFontList&& aFontList,
       Maybe<base::SharedMemoryHandle>&& aSharedUASheetHandle,
       const uintptr_t& aSharedUASheetAddress,
-      nsTArray<base::SharedMemoryHandle>&& aSharedFontListBlocks,
-      const bool& aIsReadyForBackgroundProcessing);
+      nsTArray<base::SharedMemoryHandle>&& aSharedFontListBlocks);
 
   mozilla::ipc::IPCResult RecvProvideAnonymousTemporaryFile(
       const uint64_t& aID, const FileDescOrError& aFD);

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -2990,16 +2990,9 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) {
     sharedUASheetAddress = 0;
   }
 
-  bool isReadyForBackgroundProcessing = false;
-#if defined(XP_WIN)
-  RefPtr<DllServices> dllSvc(DllServices::Get());
-  isReadyForBackgroundProcessing = dllSvc->IsReadyForBackgroundProcessing();
-#endif
-
   Unused << SendSetXPCOMProcessAttributes(
       xpcomInit, initialData, lnf, fontList, std::move(sharedUASheetHandle),
-      sharedUASheetAddress, std::move(sharedFontListBlocks),
-      isReadyForBackgroundProcessing);
+      sharedUASheetAddress, std::move(sharedFontListBlocks));
 
   ipc::WritableSharedMap* sharedData =
       nsFrameMessageManager::sParentProcessManager->SharedData();

diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
@@ -580,13 +580,6 @@ child:
      * to pull data from content processes.
      */
     async GetUntrustedModulesData() returns (UntrustedModulesData? data);
-
-    /**
-    * This method is used to notifty a child process to start
-    * processing module loading events in UntrustedModulesProcessor.
-    * This should be called when the parent process has gone idle.
-    */
-    async UnblockUntrustedModulesThread();
 #endif  // defined(XP_WIN)
 
     /**
@@ -757,8 +750,7 @@ child:
                                     SystemFontList systemFontList,
                                     SharedMemoryHandle? sharedUASheetHandle,
                                     uintptr_t sharedUASheetAddress,
-                                    SharedMemoryHandle[] sharedFontListBlocks,
-                                    bool aIsStartingUp);
+                                    SharedMemoryHandle[] sharedFontListBlocks);
 
     // Notify child that last-pb-context-exited notification was observed
     async LastPrivateDocShellDestroyed();

diff --git a/dom/media/ipc/PRDD.ipdl b/dom/media/ipc/PRDD.ipdl
@@ -38,8 +38,7 @@ protocol PRDD
 parent:
 
   async Init(GfxVarUpdate[] vars, FileDescriptor? sandboxBroker,
-             bool canRecordReleaseTelemetry,
-             bool aIsReadyForBackgroundProcessing);
+             bool canRecordReleaseTelemetry);
 
   async InitProfiler(Endpoint<PProfilerChild> endpoint);
 
@@ -62,13 +61,6 @@ parent:
 
 #if defined(XP_WIN)
   async GetUntrustedModulesData() returns (UntrustedModulesData? data);
-
-  /**
-  * This method is used to notifty a child process to start
-  * processing module loading events in UntrustedModulesProcessor.
-  * This should be called when the parent process has gone idle.
-  */
-  async UnblockUntrustedModulesThread();
 #endif  // defined(XP_WIN)
 
 #if defined(MOZ_SANDBOX) && defined(MOZ_DEBUG) && defined(ENABLE_TESTS)

diff --git a/dom/media/ipc/RDDChild.cpp b/dom/media/ipc/RDDChild.cpp
@@ -59,14 +59,7 @@ bool RDDChild::Init() {
 
   nsTArray<GfxVarUpdate> updates = gfxVars::FetchNonDefaultVars();
 
-  bool isReadyForBackgroundProcessing = false;
-#if defined(XP_WIN)
-  RefPtr<DllServices> dllSvc(DllServices::Get());
-  isReadyForBackgroundProcessing = dllSvc->IsReadyForBackgroundProcessing();
-#endif
-
-  SendInit(updates, brokerFd, Telemetry::CanRecordReleaseData(),
-           isReadyForBackgroundProcessing);
+  SendInit(updates, brokerFd, Telemetry::CanRecordReleaseData());
 
   Unused << SendInitProfiler(ProfilerParent::CreateForProcess(OtherPid()));
 

diff --git a/dom/media/ipc/RDDParent.cpp b/dom/media/ipc/RDDParent.cpp
@@ -124,8 +124,7 @@ void CGSShutdownServerConnections();
 
 mozilla::ipc::IPCResult RDDParent::RecvInit(
     nsTArray<GfxVarUpdate>&& vars, const Maybe<FileDescriptor>& aBrokerFd,
-    const bool& aCanRecordReleaseTelemetry,
-    const bool& aIsReadyForBackgroundProcessing) {
+    const bool& aCanRecordReleaseTelemetry) {
   for (const auto& var : vars) {
     gfxVars::ApplyUpdate(var);
   }
@@ -152,7 +151,7 @@ mozilla::ipc::IPCResult RDDParent::RecvInit(
 #if defined(XP_WIN)
   if (aCanRecordReleaseTelemetry) {
     RefPtr<DllServices> dllSvc(DllServices::Get());
-    dllSvc->StartUntrustedModulesProcessor(aIsReadyForBackgroundProcessing);
+    dllSvc->StartUntrustedModulesProcessor();
   }
 #endif  // defined(XP_WIN)
   return IPC_OK();
@@ -248,14 +247,6 @@ mozilla::ipc::IPCResult RDDParent::RecvGetUntrustedModulesData(
       [aResolver](nsresult aReason) { aResolver(Nothing()); });
   return IPC_OK();
 }
-
-mozilla::ipc::IPCResult RDDParent::RecvUnblockUntrustedModulesThread() {
-  if (nsCOMPtr<nsIObserverService> obs =
-          mozilla::services::GetObserverService()) {
-    obs->NotifyObservers(nullptr, "unblock-untrusted-modules-thread", nullptr);
-  }
-  return IPC_OK();
-}
 #endif  // defined(XP_WIN)
 
 mozilla::ipc::IPCResult RDDParent::RecvPreferenceUpdate(const Pref& aPref) {

diff --git a/dom/media/ipc/RDDParent.h b/dom/media/ipc/RDDParent.h
@@ -29,8 +29,7 @@ class RDDParent final : public PRDDParent {
 
   mozilla::ipc::IPCResult RecvInit(nsTArray<GfxVarUpdate>&& vars,
                                    const Maybe<ipc::FileDescriptor>& aBrokerFd,
-                                   const bool& aCanRecordReleaseTelemetry,
-                                   const bool& aIsReadyForBackgroundProcessing);
+                                   const bool& aCanRecordReleaseTelemetry);
   mozilla::ipc::IPCResult RecvInitProfiler(
       Endpoint<PProfilerChild>&& aEndpoint);
 
@@ -48,7 +47,6 @@ class RDDParent final : public PRDDParent {
 #if defined(XP_WIN)
   mozilla::ipc::IPCResult RecvGetUntrustedModulesData(
       GetUntrustedModulesDataResolver&& aResolver);
-  mozilla::ipc::IPCResult RecvUnblockUntrustedModulesThread();
 #endif  // defined(XP_WIN)
   mozilla::ipc::IPCResult RecvPreferenceUpdate(const Pref& pref);
   mozilla::ipc::IPCResult RecvUpdateVar(const GfxVarUpdate& pref);

diff --git a/ipc/glue/UtilityProcessChild.cpp b/ipc/glue/UtilityProcessChild.cpp
@@ -138,7 +138,7 @@ mozilla::ipc::IPCResult UtilityProcessChild::RecvInit(
 #if defined(XP_WIN)
   if (aCanRecordReleaseTelemetry) {
     RefPtr<DllServices> dllSvc(DllServices::Get());
-    dllSvc->StartUntrustedModulesProcessor(false);
+    dllSvc->StartUntrustedModulesProcessor();
   }
 #endif  // defined(XP_WIN)
   return IPC_OK();

diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp
@@ -1318,7 +1318,7 @@ int XRE_XPCShellMain(int argc, char** argv, char** envp,
 
     // Ensure that DLL Services are running
     RefPtr<DllServices> dllSvc(DllServices::Get());
-    dllSvc->StartUntrustedModulesProcessor(true);
+    dllSvc->StartUntrustedModulesProcessor();
     auto dllServicesDisable =
         MakeScopeExit([&dllSvc]() { dllSvc->DisableFull(); });
 

diff --git a/netwerk/ipc/PSocketProcess.ipdl b/netwerk/ipc/PSocketProcess.ipdl
@@ -85,9 +85,6 @@ struct SocketPorcessInitAttributes {
   bool mOffline;
   bool mConnectivity;
   bool mInitSandbox;
-#if defined(XP_WIN)
-  bool mIsReadyForBackgroundProcessing;
-#endif
   FileDescriptor? mSandboxBroker;
 };
 
@@ -225,13 +222,6 @@ child:
 
 #if defined(XP_WIN)
   async GetUntrustedModulesData() returns (UntrustedModulesData? data);
-
-  /**
-  * This method is used to notifty a child process to start
-  * processing module loading events in UntrustedModulesProcessor.
-  * This should be called when the parent process has gone idle.
-  */
-  async UnblockUntrustedModulesThread();
 #endif  // defined(XP_WIN)
 
 both:

diff --git a/netwerk/ipc/SocketProcessChild.cpp b/netwerk/ipc/SocketProcessChild.cpp
@@ -169,6 +169,11 @@ bool SocketProcessChild::Init(base::ProcessId aParentPid,
     return false;
   }
 
+#if defined(XP_WIN)
+  RefPtr<DllServices> dllSvc(DllServices::Get());
+  dllSvc->StartUntrustedModulesProcessor();
+#endif  // defined(XP_WIN)
+
   return true;
 }
 
@@ -223,12 +228,6 @@ mozilla::ipc::IPCResult SocketProcessChild::RecvInit(
     Unused << RecvInitLinuxSandbox(aAttributes.mSandboxBroker());
   }
 
-#if defined(XP_WIN)
-  RefPtr<DllServices> dllSvc(DllServices::Get());
-  dllSvc->StartUntrustedModulesProcessor(
-      aAttributes.mIsReadyForBackgroundProcessing());
-#endif  // defined(XP_WIN)
-
   return IPC_OK();
 }
 
@@ -741,15 +740,6 @@ mozilla::ipc::IPCResult SocketProcessChild::RecvGetUntrustedModulesData(
       [aResolver](nsresult aReason) { aResolver(Nothing()); });
   return IPC_OK();
 }
-
-mozilla::ipc::IPCResult
-SocketProcessChild::RecvUnblockUntrustedModulesThread() {
-  if (nsCOMPtr<nsIObserverService> obs =
-          mozilla::services::GetObserverService()) {
-    obs->NotifyObservers(nullptr, "unblock-untrusted-modules-thread", nullptr);
-  }
-  return IPC_OK();
-}
 #endif  // defined(XP_WIN)
 
 }  // namespace net

diff --git a/netwerk/ipc/SocketProcessChild.h b/netwerk/ipc/SocketProcessChild.h
@@ -160,7 +160,6 @@ class SocketProcessChild final
 #if defined(XP_WIN)
   mozilla::ipc::IPCResult RecvGetUntrustedModulesData(
       GetUntrustedModulesDataResolver&& aResolver);
-  mozilla::ipc::IPCResult RecvUnblockUntrustedModulesThread();
 #endif  // defined(XP_WIN)
 
  protected:

diff --git a/netwerk/ipc/SocketProcessHost.cpp b/netwerk/ipc/SocketProcessHost.cpp
@@ -176,12 +176,6 @@ void SocketProcessHost::InitAfterConnect(bool aSucceeded) {
 
   attributes.mInitSandbox() = false;
 
-#if defined(XP_WIN)
-  RefPtr<DllServices> dllSvc(DllServices::Get());
-  attributes.mIsReadyForBackgroundProcessing() =
-      dllSvc->IsReadyForBackgroundProcessing();
-#endif
-
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
   if (GetEffectiveSocketProcessSandboxLevel() > 0) {
     auto policy = SandboxBrokerPolicyFactory::GetSocketProcessPolicy(

diff --git a/toolkit/xre/dllservices/UntrustedModulesData.cpp b/toolkit/xre/dllservices/UntrustedModulesData.cpp
@@ -82,8 +82,6 @@ ModuleRecord::ModuleRecord(const nsAString& aResolvedNtPath)
   }
 
   MOZ_ASSERT(XRE_IsParentProcess());
-  AUTO_PROFILER_MARKER_TEXT("ModuleRecord", OTHER, {},
-                            NS_ConvertUTF16toUTF8(aResolvedNtPath));
 
   nsAutoString resolvedDosPath;
   if (!NtPathToDosPath(aResolvedNtPath, resolvedDosPath)) {