Revert "Bug 1982053 - Don't remove pipelines in offscreen transactions. r=emilio" for causing mochitest crashes @ mozilla::ipc::FatalError

This reverts commit 41d77dd.

Author: Alexandru Marc

gfx/layers/wr/WebRenderBridgeChild.cpp

@@ -76,16 +76,6 @@ void WebRenderBridgeChild::AddWebRenderParentCommand(
   mParentCommands.AppendElement(aCmd);
 }
 
-void WebRenderBridgeChild::AddWebRenderParentDestroyCommand(
-    const WebRenderParentCommand& aCmd) {
-  mParentDestroyCommands.AppendElement(aCmd);
-}
-
-void WebRenderBridgeChild::MergeWebRenderParentCommands() {
-  mParentCommands.AppendElements(std::move(mParentDestroyCommands));
-  mParentDestroyCommands.Clear();
-}
-
 void WebRenderBridgeChild::BeginTransaction() {
   MOZ_ASSERT(!mDestroyed);
 
@@ -124,9 +114,6 @@ bool WebRenderBridgeChild::EndTransaction(
 
   TimeStamp fwdTime = TimeStamp::Now();
 
-  if (!aRenderOffscreen) {
-    MergeWebRenderParentCommands();
-  }
   aDisplayListData.mCommands = std::move(mParentCommands);
   aDisplayListData.mIdNamespace = mIdNamespace;
 
@@ -164,7 +151,6 @@ void WebRenderBridgeChild::EndEmptyTransaction(
   TimeStamp fwdTime = TimeStamp::Now();
 
   if (aTransactionData) {
-    MergeWebRenderParentCommands();
     aTransactionData->mCommands = std::move(mParentCommands);
   }
 
@@ -189,8 +175,7 @@ void WebRenderBridgeChild::EndEmptyTransaction(
 void WebRenderBridgeChild::ProcessWebRenderParentCommands() {
   MOZ_ASSERT(!mDestroyed);
 
-  if (HasWebRenderParentCommands()) {
-    MergeWebRenderParentCommands();
+  if (!mParentCommands.IsEmpty()) {
     this->SendParentCommands(mIdNamespace, mParentCommands);
     mParentCommands.Clear();
   }
@@ -205,8 +190,7 @@ void WebRenderBridgeChild::AddPipelineIdForCompositable(
 
 void WebRenderBridgeChild::RemovePipelineIdForCompositable(
     const wr::PipelineId& aPipelineId) {
-  AddWebRenderParentDestroyCommand(
-      OpRemovePipelineIdForCompositable(aPipelineId));
+  AddWebRenderParentCommand(OpRemovePipelineIdForCompositable(aPipelineId));
 }
 
 wr::ExternalImageId WebRenderBridgeChild::GetNextExternalImageId() {
@@ -217,7 +201,7 @@ wr::ExternalImageId WebRenderBridgeChild::GetNextExternalImageId() {
 }
 
 void WebRenderBridgeChild::ReleaseTextureOfImage(const wr::ImageKey& aKey) {
-  AddWebRenderParentDestroyCommand(OpReleaseTextureOfImage(aKey));
+  AddWebRenderParentCommand(OpReleaseTextureOfImage(aKey));
 }
 
 struct FontFileDataSink {
@@ -428,7 +412,7 @@ void WebRenderBridgeChild::RemoveTextureFromCompositable(
     return;
   }
 
-  AddWebRenderParentDestroyCommand(CompositableOperation(
+  AddWebRenderParentCommand(CompositableOperation(
       aCompositable->GetIPCHandle(),
       OpRemoveTexture(WrapNotNull(aTexture->GetIPDLActor()))));
 }

gfx/layers/wr/WebRenderBridgeChild.h

@@ -65,14 +65,7 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild,
   explicit WebRenderBridgeChild(const wr::PipelineId& aPipelineId);
 
   void AddWebRenderParentCommand(const WebRenderParentCommand& aCmd);
-  /// Similar to AddWebRenderParentCommand, with the exception that ops are not
-  /// picked up by off-screen transactions. Typically useful for operations that
-  /// remove resources and should not be applied before we have un-referenced
-  /// the resources from the main display list.
-  void AddWebRenderParentDestroyCommand(const WebRenderParentCommand& aCmd);
-  bool HasWebRenderParentCommands() {
-    return !mParentCommands.IsEmpty() && !mParentDestroyCommands.IsEmpty();
-  }
+  bool HasWebRenderParentCommands() { return !mParentCommands.IsEmpty(); }
 
   void UpdateResources(wr::IpcResourceUpdateQueue& aResources);
   void BeginTransaction();
@@ -197,8 +190,6 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild,
 
   ~WebRenderBridgeChild();
 
-  void MergeWebRenderParentCommands();
-
   wr::ExternalImageId GetNextExternalImageId();
 
   // CompositableForwarder
@@ -245,7 +236,6 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild,
 
   nsTArray<OpDestroy> mDestroyedActors;
   nsTArray<WebRenderParentCommand> mParentCommands;
-  nsTArray<WebRenderParentCommand> mParentDestroyCommands;
   nsTHashMap<nsUint64HashKey, CompositableClient*> mCompositables;
   bool mIsInTransaction;
   bool mIsInClearCachedResources;