Bug 1622360 - Drop some other render root parameters in WebRenderBridgeParent. r=jrmuizel

Depends on D74947

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

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -1106,8 +1106,7 @@ void WebRenderBridgeParent::UpdateAPZFocusState(const FocusTarget& aFocus) {
 }
 
 void WebRenderBridgeParent::UpdateAPZScrollData(const wr::Epoch& aEpoch,
-                                                WebRenderScrollData&& aData,
+                                                WebRenderScrollData&& aData) {
-                                                wr::RenderRoot aRenderRoot) {
   CompositorBridgeParent* cbp = GetRootCompositorBridgeParent();
   if (!cbp) {
     return;
@@ -1120,8 +1119,7 @@ void WebRenderBridgeParent::UpdateAPZScrollData(const wr::Epoch& aEpoch,
 }
 
 void WebRenderBridgeParent::UpdateAPZScrollOffsets(
-    ScrollUpdatesMap&& aUpdates, uint32_t aPaintSequenceNumber,
+    ScrollUpdatesMap&& aUpdates, uint32_t aPaintSequenceNumber) {
-    wr::RenderRoot aRenderRoot) {
   CompositorBridgeParent* cbp = GetRootCompositorBridgeParent();
   if (!cbp) {
     return;
@@ -1152,9 +1150,8 @@ void WebRenderBridgeParent::SetAPZSampleTime() {
 }
 
 bool WebRenderBridgeParent::SetDisplayList(
-    wr::RenderRoot aRenderRoot, const LayoutDeviceRect& aRect,
+    const LayoutDeviceRect& aRect, const wr::LayoutSize& aContentSize,
-    const wr::LayoutSize& aContentSize, ipc::ByteBuf&& aDL,
+    ipc::ByteBuf&& aDL, const wr::BuiltDisplayListDescriptor& aDLDesc,
-    const wr::BuiltDisplayListDescriptor& aDLDesc,
     const nsTArray<OpUpdateResource>& aResourceUpdates,
     const nsTArray<RefCountedShmem>& aSmallShmems,
     const nsTArray<ipc::Shmem>& aLargeShmems, const TimeStamp& aTxnStartTime,
@@ -1212,13 +1209,11 @@ bool WebRenderBridgeParent::ProcessRenderRootDisplayListData(
   // sent to WebRender, so that the UpdateHitTestingTree call is guaranteed to
   // be in the updater queue at the time that the scene swap completes.
   if (aDisplayList.mScrollData) {
-    UpdateAPZScrollData(aWrEpoch, std::move(aDisplayList.mScrollData.ref()),
+    UpdateAPZScrollData(aWrEpoch, std::move(aDisplayList.mScrollData.ref()));
-                        aDisplayList.mRenderRoot);
   }
 
   MOZ_ASSERT(aDisplayList.mRenderRoot == wr::RenderRoot::Default ||
              IsRootWebRenderBridgeParent());
-  auto renderRoot = aDisplayList.mRenderRoot;
 
   txn.SetLowPriority(!IsRootWebRenderBridgeParent());
   if (aValidTransaction) {
@@ -1232,7 +1227,7 @@ bool WebRenderBridgeParent::ProcessRenderRootDisplayListData(
   }
 
   if (aDisplayList.mDL &&
-      !SetDisplayList(renderRoot, aDisplayList.mRect, aDisplayList.mContentSize,
+      !SetDisplayList(aDisplayList.mRect, aDisplayList.mContentSize,
                       std::move(aDisplayList.mDL.ref()), aDisplayList.mDLDesc,
                       aDisplayList.mResourceUpdates, aDisplayList.mSmallShmems,
                       aDisplayList.mLargeShmems, aTxnStartTime, txn, aWrEpoch,
@@ -1392,7 +1387,7 @@ bool WebRenderBridgeParent::ProcessEmptyTransactionUpdates(
 
   if (!aUpdates.mScrollUpdates.IsEmpty()) {
     UpdateAPZScrollOffsets(std::move(aUpdates.mScrollUpdates),
-                           aUpdates.mPaintSequenceNumber, aUpdates.mRenderRoot);
+                           aUpdates.mPaintSequenceNumber);
   }
 
   // Update WrEpoch for UpdateResources() and ProcessWebRenderParentCommands().

gfx/layers/wr/WebRenderBridgeParent.h

@@ -367,7 +367,7 @@ class WebRenderBridgeParent final
                                         bool aValidTransaction,
                                         bool aObserveLayersUpdate);
 
-  bool SetDisplayList(wr::RenderRoot aRenderRoot, const LayoutDeviceRect& aRect,
+  bool SetDisplayList(const LayoutDeviceRect& aRect,
                       const wr::LayoutSize& aContentSize, ipc::ByteBuf&& aDL,
                       const wr::BuiltDisplayListDescriptor& aDLDesc,
                       const nsTArray<OpUpdateResource>& aResourceUpdates,
@@ -378,11 +378,10 @@ class WebRenderBridgeParent final
                       bool aValidTransaction, bool aObserveLayersUpdate);
 
   void UpdateAPZFocusState(const FocusTarget& aFocus);
-  void UpdateAPZScrollData(const wr::Epoch& aEpoch, WebRenderScrollData&& aData,
+  void UpdateAPZScrollData(const wr::Epoch& aEpoch,
-                           wr::RenderRoot aRenderRoot);
+                           WebRenderScrollData&& aData);
   void UpdateAPZScrollOffsets(ScrollUpdatesMap&& aUpdates,
-                              uint32_t aPaintSequenceNumber,
+                              uint32_t aPaintSequenceNumber);
-                              wr::RenderRoot aRenderRoot);
 
   bool UpdateResources(const nsTArray<OpUpdateResource>& aResourceUpdates,
                        const nsTArray<RefCountedShmem>& aSmallShmems,