Bug 897452 - Part 11 - remove TextureClient::OnActorDestroy - r=nrc

gfx/layers/client/CanvasClient.cpp

@@ -109,9 +109,6 @@ CanvasClient2D::CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFla
 void
 CanvasClient2D::OnActorDestroy()
 {
-  if (mBuffer) {
-    mBuffer->OnActorDestroy();
-  }
 }
 
 void
@@ -168,9 +165,6 @@ DeprecatedCanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
 void
 DeprecatedCanvasClient2D::OnActorDestroy()
 {
-  if (mDeprecatedTextureClient) {
-    mDeprecatedTextureClient->OnActorDestroy();
-  }
 }
 
 void
@@ -244,9 +238,6 @@ DeprecatedCanvasClientSurfaceStream::Update(gfx::IntSize aSize, ClientCanvasLaye
 void
 DeprecatedCanvasClientSurfaceStream::OnActorDestroy()
 {
-  if (mDeprecatedTextureClient) {
-    mDeprecatedTextureClient->OnActorDestroy();
-  }
 }
 
 }

gfx/layers/client/ContentClient.cpp

@@ -298,12 +298,6 @@ ContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
 void
 ContentClientRemoteBuffer::OnActorDestroy()
 {
-  if (mTextureClient) {
-    mTextureClient->OnActorDestroy();
-  }
-  if (mTextureClientOnWhite) {
-    mTextureClientOnWhite->OnActorDestroy();
-  }
 }
 
 void
@@ -495,12 +489,6 @@ DeprecatedContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdate
 void
 DeprecatedContentClientRemoteBuffer::OnActorDestroy()
 {
-  if (mDeprecatedTextureClient) {
-    mDeprecatedTextureClient->OnActorDestroy();
-  }
-  if (mDeprecatedTextureClientOnWhite) {
-    mDeprecatedTextureClientOnWhite->OnActorDestroy();
-  }
 }
  
 void
@@ -660,18 +648,6 @@ ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
 void
 ContentClientDoubleBuffered::OnActorDestroy()
 {
-  if (mTextureClient) {
-    mTextureClient->OnActorDestroy();
-  }
-  if (mTextureClientOnWhite) {
-    mTextureClientOnWhite->OnActorDestroy();
-  }
-  if (mFrontClient) {
-    mFrontClient->OnActorDestroy();
-  }
-  if (mFrontClientOnWhite) {
-    mFrontClientOnWhite->OnActorDestroy();
-  }
 }
 
 DeprecatedContentClientDoubleBuffered::~DeprecatedContentClientDoubleBuffered()
@@ -777,18 +753,6 @@ DeprecatedContentClientDoubleBuffered::SwapBuffers(const nsIntRegion& aFrontUpda
 void
 DeprecatedContentClientDoubleBuffered::OnActorDestroy()
 {
-  if (mDeprecatedTextureClient) {
-    mDeprecatedTextureClient->OnActorDestroy();
-  }
-  if (mDeprecatedTextureClientOnWhite) {
-    mDeprecatedTextureClientOnWhite->OnActorDestroy();
-  }
-  if (mFrontClient) {
-    mFrontClient->OnActorDestroy();
-  }
-  if (mFrontClientOnWhite) {
-    mFrontClientOnWhite->OnActorDestroy();
-  }
 }
 
 struct AutoDeprecatedTextureClient {

gfx/layers/client/ImageClient.cpp

@@ -283,20 +283,11 @@ ImageClientBuffered::UpdateImage(ImageContainer* aContainer,
 void
 ImageClientSingle::OnActorDestroy()
 {
-  if (mFrontBuffer) {
-    mFrontBuffer->OnActorDestroy();
-  }
 }
 
 void
 ImageClientBuffered::OnActorDestroy()
 {
-  if (mFrontBuffer) {
-    mFrontBuffer->OnActorDestroy();
-  }
-  if (mBackBuffer) {
-    mBackBuffer->OnActorDestroy();
-  }
 }
 
 bool
@@ -487,9 +478,6 @@ ImageClientBridge::ImageClientBridge(CompositableForwarder* aFwd,
 void
 DeprecatedImageClientSingle::OnActorDestroy()
 {
-  if (mDeprecatedTextureClient) {
-    mDeprecatedTextureClient->OnActorDestroy();
-  }
 }
 
 bool

gfx/layers/client/TextureClient.cpp

@@ -565,15 +565,6 @@ DeprecatedTextureClient::~DeprecatedTextureClient()
   MOZ_ASSERT(mDescriptor.type() == SurfaceDescriptor::T__None, "Need to release surface!");
 }
 
-void
-DeprecatedTextureClient::OnActorDestroy()
-{
-  if (ISurfaceAllocator::IsShmem(&mDescriptor)) {
-    mDescriptor = SurfaceDescriptor();
-  }
-}
-
-
 DeprecatedTextureClientShmem::DeprecatedTextureClientShmem(CompositableForwarder* aForwarder,
                                        const TextureInfo& aTextureInfo)
   : DeprecatedTextureClient(aForwarder, aTextureInfo)

gfx/layers/client/TextureClient.h

@@ -253,10 +253,6 @@ public:
    */
   void MarkInvalid() { mValid = false; }
 
-  // If a texture client holds a reference to shmem, it should override this
-  // method to forget about the shmem _without_ releasing it.
-  virtual void OnActorDestroy() {}
-
   /**
    * Create and init the TextureChild/Parent IPDL actor pair.
    *
@@ -398,11 +394,6 @@ public:
 
   ipc::Shmem& GetShmem() { return mShmem; }
 
-  virtual void OnActorDestroy() MOZ_OVERRIDE
-  {
-    mShmem = ipc::Shmem();
-  }
-
 protected:
   ipc::Shmem mShmem;
   RefPtr<ISurfaceAllocator> mAllocator;
@@ -579,8 +570,6 @@ public:
 
   virtual gfxContentType GetContentType() = 0;
 
-  void OnActorDestroy();
-
 protected:
   DeprecatedTextureClient(CompositableForwarder* aForwarder,
                 const TextureInfo& aTextureInfo);

gfx/layers/client/TiledContentClient.h

@@ -254,10 +254,6 @@ public:
 
   void OnActorDestroy()
   {
-    for (size_t i = 0; i < mRetainedTiles.Length(); i++) {
-      if (mRetainedTiles[i].IsPlaceholderTile()) continue;
-      mRetainedTiles[i].mDeprecatedTextureClient->OnActorDestroy();
-    }
   }
 
 protected: