diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index d63747521d7e..a0d8b54475b2 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -2732,11 +2732,7 @@ TabChild::MakeHidden() return; } - CompositorBridgeChild* compositor = CompositorBridgeChild::Get(); - - // Clear cached resources directly. This avoids one extra IPC - // round-trip from CompositorBridgeChild to CompositorBridgeParent. - compositor->RecvClearCachedResources(mLayersId); + ClearCachedResources(); // Hide all plugins in this tab. if (nsCOMPtr shell = GetPresShell()) { diff --git a/gfx/layers/ipc/CompositorBridgeChild.cpp b/gfx/layers/ipc/CompositorBridgeChild.cpp index dd1bbdf50c64..d379938f527f 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.cpp +++ b/gfx/layers/ipc/CompositorBridgeChild.cpp @@ -585,16 +585,6 @@ CompositorBridgeChild::RecvDidComposite(const uint64_t& aId, const uint64_t& aTr return IPC_OK(); } -mozilla::ipc::IPCResult -CompositorBridgeChild::RecvClearCachedResources(const uint64_t& aId) -{ - dom::TabChild* child = dom::TabChild::GetFrom(aId); - if (child) { - child->ClearCachedResources(); - } - return IPC_OK(); -} - void CompositorBridgeChild::ActorDestroy(ActorDestroyReason aWhy) { diff --git a/gfx/layers/ipc/CompositorBridgeChild.h b/gfx/layers/ipc/CompositorBridgeChild.h index f5b2562bdda4..09763449f9b1 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.h +++ b/gfx/layers/ipc/CompositorBridgeChild.h @@ -93,9 +93,6 @@ public: // process). This may only be called on the main thread. static bool CompositorIsInGPUProcess(); - virtual mozilla::ipc::IPCResult - RecvClearCachedResources(const uint64_t& id) override; - virtual mozilla::ipc::IPCResult RecvDidComposite(const uint64_t& aId, const uint64_t& aTransactionId, const TimeStamp& aCompositeStart, diff --git a/gfx/layers/ipc/PCompositorBridge.ipdl b/gfx/layers/ipc/PCompositorBridge.ipdl index a1008ea35933..2ae2d770adf8 100644 --- a/gfx/layers/ipc/PCompositorBridge.ipdl +++ b/gfx/layers/ipc/PCompositorBridge.ipdl @@ -126,12 +126,6 @@ child: */ async HideAllPlugins(uintptr_t aParentWidget); - /** - * Drop any buffers that might be retained on the child compositor - * side. - */ - async ClearCachedResources(uint64_t id); - async ParentAsyncMessages(AsyncParentMessageData[] aMessages); async ObserveLayerUpdate(uint64_t aLayersId, uint64_t aEpoch, bool aActive);