Bug 1729476 - Remove unused CompositorBridgeChild::SendMakeSnapshot(). r=gfx-reviewers,ipc-reviewers,nika,nical

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

build/win32/orderfile.txt

@@ -11830,7 +11830,6 @@ ARGBSetRow_X86
 ?SendPTextureConstructor@PCompositorBridgeChild@layers@mozilla@@QAEPAVPTextureChild@23@PAV423@ABVSurfaceDescriptor@23@ABVReadLockDescriptor@23@ABW4LayersBackend@23@ABW4TextureFlags@23@ABULayersId@23@AB_KABV?$Maybe@UExternalImageId@wr@mozilla@@@3@@Z
 ?Read@?$IPDLParamTraits@VReadLockDescriptor@layers@mozilla@@@ipc@mozilla@@SA_NPBVMessage@IPC@@PAVPickleIterator@@PAVIProtocol@23@PAVReadLockDescriptor@layers@3@@Z
 ?Write@?$IPDLParamTraits@PAVPTextureChild@layers@mozilla@@@ipc@mozilla@@SAXPAVMessage@IPC@@PAVIProtocol@23@ABQAVPTextureChild@layers@3@@Z
-?SendMakeSnapshot@PCompositorBridgeChild@layers@mozilla@@QAE_NABVSurfaceDescriptor@23@ABU?$IntRectTyped@UUnknownUnits@gfx@mozilla@@@gfx@3@@Z
 ?Write@?$IPDLParamTraits@VSurfaceDescriptor@layers@mozilla@@@ipc@mozilla@@SAXPAVMessage@IPC@@PAVIProtocol@23@ABVSurfaceDescriptor@layers@3@@Z
 ??4IPCDataTransferData@dom@mozilla@@QAEAAV012@ABVIPCBlob@12@@Z
 ?Write@?$IPDLParamTraits@VReadLockDescriptor@layers@mozilla@@@ipc@mozilla@@SAXPAVMessage@IPC@@PAVIProtocol@23@ABVReadLockDescriptor@layers@3@@Z

build/win64/orderfile.txt

@@ -11762,7 +11762,6 @@ ARGBSetRow_X86
 ?SendPTextureConstructor@PCompositorBridgeChild@layers@mozilla@@QEAAPEAVPTextureChild@23@PEAV423@AEBVSurfaceDescriptor@23@AEBVReadLockDescriptor@23@AEBW4LayersBackend@23@AEBW4TextureFlags@23@AEBULayersId@23@AEB_KAEBV?$Maybe@UExternalImageId@wr@mozilla@@@3@@Z
 ?Read@?$IPDLParamTraits@VReadLockDescriptor@layers@mozilla@@@ipc@mozilla@@SA_NPEBVMessage@IPC@@PEAVPickleIterator@@PEAVIProtocol@23@PEAVReadLockDescriptor@layers@3@@Z
 ?Write@?$IPDLParamTraits@PEAVPTextureChild@layers@mozilla@@@ipc@mozilla@@SAXPEAVMessage@IPC@@PEAVIProtocol@23@AEBQEAVPTextureChild@layers@3@@Z
-?SendMakeSnapshot@PCompositorBridgeChild@layers@mozilla@@QEAA_NAEBVSurfaceDescriptor@23@AEBU?$IntRectTyped@UUnknownUnits@gfx@mozilla@@@gfx@3@@Z
 ?Write@?$IPDLParamTraits@VSurfaceDescriptor@layers@mozilla@@@ipc@mozilla@@SAXPEAVMessage@IPC@@PEAVIProtocol@23@AEBVSurfaceDescriptor@layers@3@@Z
 ??4IPCDataTransferData@dom@mozilla@@QEAAAEAV012@AEBVIPCBlob@12@@Z
 ?Write@?$IPDLParamTraits@VReadLockDescriptor@layers@mozilla@@@ipc@mozilla@@SAXPEAVMessage@IPC@@PEAVIProtocol@23@AEBVReadLockDescriptor@layers@3@@Z

gfx/layers/ipc/CompositorBridgeChild.cpp

@@ -400,14 +400,6 @@ bool CompositorBridgeChild::SendAdoptChild(const LayersId& id) {
   return PCompositorBridgeChild::SendAdoptChild(id);
 }
 
-bool CompositorBridgeChild::SendMakeSnapshot(
-    const SurfaceDescriptor& inSnapshot, const gfx::IntRect& dirtyRect) {
-  if (!mCanSend) {
-    return false;
-  }
-  return PCompositorBridgeChild::SendMakeSnapshot(inSnapshot, dirtyRect);
-}
-
 bool CompositorBridgeChild::SendFlushRendering() {
   if (!mCanSend) {
     return false;

gfx/layers/ipc/CompositorBridgeChild.h

@@ -128,8 +128,6 @@ class CompositorBridgeChild final : public PCompositorBridgeChild,
   bool SendResume();
   bool SendResumeAsync();
   bool SendAdoptChild(const LayersId& id);
-  bool SendMakeSnapshot(const SurfaceDescriptor& inSnapshot,
-                        const gfx::IntRect& dirtyRect);
   bool SendFlushRendering();
   bool SendStartFrameTimeRecording(const int32_t& bufferSize,
                                    uint32_t* startIndex);

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -500,20 +500,6 @@ mozilla::ipc::IPCResult CompositorBridgeParent::RecvResumeAsync() {
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult CompositorBridgeParent::RecvMakeSnapshot(
-    const SurfaceDescriptor& aInSnapshot, const gfx::IntRect& aRect) {
-  RefPtr<DrawTarget> target = GetDrawTargetForDescriptor(aInSnapshot);
-  MOZ_ASSERT(target);
-  if (!target) {
-    // We kill the content process rather than have it continue with an invalid
-    // snapshot, that may be too harsh and we could decide to return some sort
-    // of error to the child process and let it deal with it...
-    return IPC_FAIL_NO_REASON(this);
-  }
-  ForceComposeToTarget(target, &aRect);
-  return IPC_OK();
-}
-
 mozilla::ipc::IPCResult
 CompositorBridgeParent::RecvWaitOnTransactionProcessed() {
   return IPC_OK();

gfx/layers/ipc/CompositorBridgeParent.h

@@ -244,8 +244,6 @@ class CompositorBridgeParentBase : public PCompositorBridgeParent,
       CompositorOptions* compositorOptions) = 0;
   virtual mozilla::ipc::IPCResult RecvNotifyChildRecreated(
       const LayersId& id, CompositorOptions* compositorOptions) = 0;
-  virtual mozilla::ipc::IPCResult RecvMakeSnapshot(
-      const SurfaceDescriptor& inSnapshot, const IntRect& dirtyRect) = 0;
   virtual mozilla::ipc::IPCResult RecvFlushRendering() = 0;
   virtual mozilla::ipc::IPCResult RecvWaitOnTransactionProcessed() = 0;
   virtual mozilla::ipc::IPCResult RecvStartFrameTimeRecording(
@@ -313,8 +311,6 @@ class CompositorBridgeParent final : public CompositorBridgeParentBase,
   mozilla::ipc::IPCResult RecvNotifyChildRecreated(
       const LayersId& child, CompositorOptions* aOptions) override;
   mozilla::ipc::IPCResult RecvAdoptChild(const LayersId& child) override;
-  mozilla::ipc::IPCResult RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
-                                           const gfx::IntRect& aRect) override;
   mozilla::ipc::IPCResult RecvFlushRendering() override;
   mozilla::ipc::IPCResult RecvFlushRenderingAsync() override;
   mozilla::ipc::IPCResult RecvWaitOnTransactionProcessed() override;

gfx/layers/ipc/ContentCompositorBridgeParent.h

@@ -61,10 +61,6 @@ class ContentCompositorBridgeParent final : public CompositorBridgeParentBase {
   mozilla::ipc::IPCResult RecvAdoptChild(const LayersId& child) override {
     return IPC_FAIL_NO_REASON(this);
   }
-  mozilla::ipc::IPCResult RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
-                                           const gfx::IntRect& aRect) override {
-    return IPC_OK();
-  }
   mozilla::ipc::IPCResult RecvFlushRendering() override { return IPC_OK(); }
   mozilla::ipc::IPCResult RecvFlushRenderingAsync() override {
     return IPC_OK();

gfx/layers/ipc/ISurfaceAllocator.h

@@ -187,9 +187,6 @@ class LegacySurfaceDescriptorAllocator {
 
 bool IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface);
 
-already_AddRefed<gfx::DrawTarget> GetDrawTargetForDescriptor(
-    const SurfaceDescriptor& aDescriptor);
-
 already_AddRefed<gfx::DataSourceSurface> GetSurfaceForDescriptor(
     const SurfaceDescriptor& aDescriptor);
 

gfx/layers/ipc/KnowsCompositor.cpp

@@ -87,16 +87,6 @@ already_AddRefed<gfx::DataSourceSurface> GetSurfaceForDescriptor(
                                                        rgb.format());
 }
 
-already_AddRefed<gfx::DrawTarget> GetDrawTargetForDescriptor(
-    const SurfaceDescriptor& aDescriptor) {
-  uint8_t* data = GetAddressFromDescriptor(aDescriptor);
-  auto rgb =
-      aDescriptor.get_SurfaceDescriptorBuffer().desc().get_RGBDescriptor();
-  uint32_t stride = ImageDataSerializer::GetRGBStride(rgb);
-  return gfx::Factory::CreateDrawTargetForData(
-      gfx::BackendType::SKIA, data, rgb.size(), stride, rgb.format());
-}
-
 void DestroySurfaceDescriptor(ipc::IShmemAllocator* aAllocator,
                               SurfaceDescriptor* aSurface) {
   MOZ_ASSERT(aSurface);

gfx/layers/ipc/PCompositorBridge.ipdl

@@ -175,15 +175,6 @@ parent:
   sync NotifyChildRecreated(LayersId id)
     returns (CompositorOptions compositorOptions);
 
-  // Make a snapshot of the content that would have been drawn to our
-  // render target at the time this message is received.  If the size
-  // or format of |inSnapshot| doesn't match our render target,
-  // results are undefined.
-  //
-  // NB: this message will result in animations, transforms, effects,
-  // and so forth being interpolated.  That's what we want to happen.
-  sync MakeSnapshot(SurfaceDescriptor inSnapshot, IntRect dirtyRect);
-
   // Make sure any pending composites are started immediately and
   // block until they are completed.
   sync FlushRendering();

ipc/ipdl/sync-messages.ini

@@ -902,8 +902,6 @@ description = legacy sync IPC - please add detailed description
 description = bug 1350660
 [PCompositorBridge::NotifyChildRecreated]
 description = legacy sync IPC - please add detailed description
-[PCompositorBridge::MakeSnapshot]
-description = legacy sync IPC - please add detailed description
 [PCompositorBridge::FlushRendering]
 description = legacy sync IPC - please add detailed description
 [PCompositorBridge::WaitOnTransactionProcessed]