diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp index 1aa3296e826..34d61f3f7a0 100644 --- a/gfx/layers/ipc/CompositorParent.cpp +++ b/gfx/layers/ipc/CompositorParent.cpp @@ -979,19 +979,11 @@ CompositorParent::AllocateLayerTreeId() } static void -EraseLayerState(uint64_t aId) +RemoveIndirectTree(uint64_t aId) { sIndirectLayerTrees.erase(aId); } -/*static*/ void -CompositorParent::DeallocateLayerTreeId(uint64_t aId) -{ - MOZ_ASSERT(NS_IsMainThread()); - CompositorLoop()->PostTask(FROM_HERE, - NewRunnableFunction(&EraseLayerState, aId)); -} - static void UpdateControllerForLayersId(uint64_t aLayersId, GeckoContentController* aController) @@ -1185,12 +1177,6 @@ CompositorParent::GetIndirectShadowTree(uint64_t aId) return &cit->second; } -static void -RemoveIndirectTree(uint64_t aId) -{ - sIndirectLayerTrees.erase(aId); -} - void CrossProcessCompositorParent::ActorDestroy(ActorDestroyReason aWhy) { diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h index b0cc866524b..c49fb8e4599 100644 --- a/gfx/layers/ipc/CompositorParent.h +++ b/gfx/layers/ipc/CompositorParent.h @@ -164,12 +164,6 @@ public: * Must run on the content main thread. */ static uint64_t AllocateLayerTreeId(); - /** - * Release compositor-thread resources referred to by |aID|. - * - * Must run on the content main thread. - */ - static void DeallocateLayerTreeId(uint64_t aId); /** * Set aController as the pan/zoom callback for the subtree referred diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp index c5a841ef106..02902fd3d09 100644 --- a/layout/ipc/RenderFrameParent.cpp +++ b/layout/ipc/RenderFrameParent.cpp @@ -942,7 +942,6 @@ void RenderFrameParent::ActorDestroy(ActorDestroyReason why) { if (mLayersId != 0) { - CompositorParent::DeallocateLayerTreeId(mLayersId); if (mContentController) { // Stop our content controller from requesting repaints of our // content.