From bffd04bbcc2771736ce25debb698b7a08f400cfc Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Wed, 11 Dec 2013 20:45:05 -0500 Subject: [PATCH] Bug 897452 - Part 12 - remove CompositableClient::OnActorDestroy - r=nrc --- gfx/layers/client/CanvasClient.cpp | 15 --------------- gfx/layers/client/CanvasClient.h | 6 ------ gfx/layers/client/CompositableClient.cpp | 8 -------- gfx/layers/client/CompositableClient.h | 5 ----- gfx/layers/client/ContentClient.cpp | 21 --------------------- gfx/layers/client/ContentClient.h | 12 ------------ gfx/layers/client/ImageClient.cpp | 15 --------------- gfx/layers/client/ImageClient.h | 8 -------- gfx/layers/client/TiledContentClient.h | 10 ---------- 9 files changed, 100 deletions(-) diff --git a/gfx/layers/client/CanvasClient.cpp b/gfx/layers/client/CanvasClient.cpp index 5accec6ad6fd..26553b3e5b94 100644 --- a/gfx/layers/client/CanvasClient.cpp +++ b/gfx/layers/client/CanvasClient.cpp @@ -106,11 +106,6 @@ CanvasClient2D::CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFla mTextureInfo.mTextureFlags | aFlags); } -void -CanvasClient2D::OnActorDestroy() -{ -} - void DeprecatedCanvasClient2D::Updated() { @@ -162,11 +157,6 @@ DeprecatedCanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer) mDeprecatedTextureClient->Unlock(); } -void -DeprecatedCanvasClient2D::OnActorDestroy() -{ -} - void DeprecatedCanvasClientSurfaceStream::Updated() { @@ -235,10 +225,5 @@ DeprecatedCanvasClientSurfaceStream::Update(gfx::IntSize aSize, ClientCanvasLaye aLayer->Painted(); } -void -DeprecatedCanvasClientSurfaceStream::OnActorDestroy() -{ -} - } } diff --git a/gfx/layers/client/CanvasClient.h b/gfx/layers/client/CanvasClient.h index 195ce3b562ff..e0d534b00d34 100644 --- a/gfx/layers/client/CanvasClient.h +++ b/gfx/layers/client/CanvasClient.h @@ -91,8 +91,6 @@ public: mBuffer = nullptr; } - virtual void OnActorDestroy() MOZ_OVERRIDE; - private: RefPtr mBuffer; }; @@ -117,8 +115,6 @@ public: mDeprecatedTextureClient->SetDescriptorFromReply(aDescriptor); } - virtual void OnActorDestroy() MOZ_OVERRIDE; - private: RefPtr mDeprecatedTextureClient; }; @@ -145,8 +141,6 @@ public: mDeprecatedTextureClient->SetDescriptorFromReply(aDescriptor); } - virtual void OnActorDestroy() MOZ_OVERRIDE; - private: RefPtr mDeprecatedTextureClient; }; diff --git a/gfx/layers/client/CompositableClient.cpp b/gfx/layers/client/CompositableClient.cpp index f02535f40a06..630068967b07 100644 --- a/gfx/layers/client/CompositableClient.cpp +++ b/gfx/layers/client/CompositableClient.cpp @@ -244,13 +244,5 @@ CompositableClient::OnTransaction() { } - -void -CompositableChild::ActorDestroy(ActorDestroyReason why) -{ - if (mCompositableClient && why == AbnormalShutdown) { - mCompositableClient->OnActorDestroy(); - } -} } // namespace layers } // namespace mozilla diff --git a/gfx/layers/client/CompositableClient.h b/gfx/layers/client/CompositableClient.h index bcccbe1802ce..902cd4ff875c 100644 --- a/gfx/layers/client/CompositableClient.h +++ b/gfx/layers/client/CompositableClient.h @@ -142,11 +142,6 @@ public: */ virtual void OnDetach() {} - /** - * Our IPDL actor is being destroyed, get rid of any shmem resources now. - */ - virtual void OnActorDestroy() = 0; - protected: CompositableChild* mCompositableChild; CompositableForwarder* mForwarder; diff --git a/gfx/layers/client/ContentClient.cpp b/gfx/layers/client/ContentClient.cpp index 3cc1f848717f..544784812d91 100644 --- a/gfx/layers/client/ContentClient.cpp +++ b/gfx/layers/client/ContentClient.cpp @@ -295,11 +295,6 @@ ContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion) mFrontAndBackBufferDiffer = true; } -void -ContentClientRemoteBuffer::OnActorDestroy() -{ -} - void DeprecatedContentClientRemoteBuffer::DestroyBuffers() { @@ -485,12 +480,6 @@ DeprecatedContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdate } } - -void -DeprecatedContentClientRemoteBuffer::OnActorDestroy() -{ -} - void ContentClientDoubleBuffered::CreateFrontBuffer(const nsIntRect& aBufferRect) { @@ -645,11 +634,6 @@ ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource, } } -void -ContentClientDoubleBuffered::OnActorDestroy() -{ -} - DeprecatedContentClientDoubleBuffered::~DeprecatedContentClientDoubleBuffered() { if (mDeprecatedTextureClient) { @@ -750,11 +734,6 @@ DeprecatedContentClientDoubleBuffered::SwapBuffers(const nsIntRegion& aFrontUpda DeprecatedContentClientRemoteBuffer::SwapBuffers(aFrontUpdatedRegion); } -void -DeprecatedContentClientDoubleBuffered::OnActorDestroy() -{ -} - struct AutoDeprecatedTextureClient { AutoDeprecatedTextureClient() : mTexture(nullptr) diff --git a/gfx/layers/client/ContentClient.h b/gfx/layers/client/ContentClient.h index 0a43b59cdff9..bea91629112e 100644 --- a/gfx/layers/client/ContentClient.h +++ b/gfx/layers/client/ContentClient.h @@ -159,8 +159,6 @@ public: { MOZ_CRASH("Should not be called on non-remote ContentClient"); } - - virtual void OnActorDestroy() MOZ_OVERRIDE {} }; /** @@ -238,8 +236,6 @@ public: return mTextureInfo; } - virtual void OnActorDestroy() MOZ_OVERRIDE; - protected: void DestroyBuffers(); @@ -340,8 +336,6 @@ public: return mTextureInfo; } - virtual void OnActorDestroy() MOZ_OVERRIDE; - protected: void DestroyBuffers(); @@ -402,8 +396,6 @@ public: virtual void SyncFrontBufferToBackBuffer() MOZ_OVERRIDE; - virtual void OnActorDestroy() MOZ_OVERRIDE; - protected: virtual void CreateFrontBuffer(const nsIntRect& aBufferRect) MOZ_OVERRIDE; virtual void DestroyFrontBuffer() MOZ_OVERRIDE; @@ -441,8 +433,6 @@ public: virtual void SyncFrontBufferToBackBuffer() MOZ_OVERRIDE; - virtual void OnActorDestroy() MOZ_OVERRIDE; - protected: virtual void CreateFrontBufferAndNotify(const nsIntRect& aBufferRect) MOZ_OVERRIDE; virtual void DestroyFrontBuffer() MOZ_OVERRIDE; @@ -549,8 +539,6 @@ public: } } - virtual void OnActorDestroy() MOZ_OVERRIDE {} - private: enum BufferType{ diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp index 2c13e08a90c2..90476e3d5e38 100644 --- a/gfx/layers/client/ImageClient.cpp +++ b/gfx/layers/client/ImageClient.cpp @@ -280,16 +280,6 @@ ImageClientBuffered::UpdateImage(ImageContainer* aContainer, return ImageClientSingle::UpdateImage(aContainer, aContentFlags); } -void -ImageClientSingle::OnActorDestroy() -{ -} - -void -ImageClientBuffered::OnActorDestroy() -{ -} - bool ImageClientSingle::AddTextureClient(TextureClient* aTexture) { @@ -475,11 +465,6 @@ ImageClientBridge::ImageClientBridge(CompositableForwarder* aFwd, { } -void -DeprecatedImageClientSingle::OnActorDestroy() -{ -} - bool ImageClientBridge::UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags) { diff --git a/gfx/layers/client/ImageClient.h b/gfx/layers/client/ImageClient.h index 940696ec222f..127d08e7c313 100644 --- a/gfx/layers/client/ImageClient.h +++ b/gfx/layers/client/ImageClient.h @@ -102,8 +102,6 @@ public: virtual void FlushAllImages(bool aExceptFront) MOZ_OVERRIDE; - virtual void OnActorDestroy() MOZ_OVERRIDE; - protected: RefPtr mFrontBuffer; // Some layers may want to enforce some flags to all their textures @@ -127,8 +125,6 @@ public: virtual void FlushAllImages(bool aExceptFront) MOZ_OVERRIDE; - virtual void OnActorDestroy() MOZ_OVERRIDE; - protected: RefPtr mBackBuffer; }; @@ -173,8 +169,6 @@ public: virtual already_AddRefed CreateImage(const uint32_t *aFormats, uint32_t aNumFormats) MOZ_OVERRIDE; - virtual void OnActorDestroy() MOZ_OVERRIDE; - private: RefPtr mDeprecatedTextureClient; TextureInfo mTextureInfo; @@ -216,8 +210,6 @@ public: return nullptr; } - virtual void OnActorDestroy() MOZ_OVERRIDE {} - protected: uint64_t mAsyncContainerID; ShadowableLayer* mLayer; diff --git a/gfx/layers/client/TiledContentClient.h b/gfx/layers/client/TiledContentClient.h index 8fec602d40f9..37637efe195c 100644 --- a/gfx/layers/client/TiledContentClient.h +++ b/gfx/layers/client/TiledContentClient.h @@ -252,10 +252,6 @@ public: static BasicTiledLayerBuffer OpenDescriptor(ISurfaceAllocator* aAllocator, const SurfaceDescriptorTiles& aDescriptor); - void OnActorDestroy() - { - } - protected: BasicTiledLayerTile ValidateTile(BasicTiledLayerTile aTile, const nsIntPoint& aTileRect, @@ -345,12 +341,6 @@ public: }; void LockCopyAndWrite(TiledBufferType aType); - virtual void OnActorDestroy() MOZ_OVERRIDE - { - mTiledBuffer.OnActorDestroy(); - mLowPrecisionTiledBuffer.OnActorDestroy(); - } - private: BasicTiledLayerBuffer mTiledBuffer; BasicTiledLayerBuffer mLowPrecisionTiledBuffer;