Bug 897452 - Part 13 - Host-side cleanup: remove OnActorDestroy and DestroyTextureHost* - r=nrc

gfx/layers/composite/CompositableHost.h

@@ -108,12 +108,6 @@ public:
     mBackendData = aBackendData;
   }
 
-  /**
-   * Our IPDL actor is being destroyed, get rid of any shmem resources now and
-   * don't worry about compositing anymore.
-   */
-  virtual void OnActorDestroy() {};
-
   // If base class overrides, it should still call the parent implementation
   virtual void SetCompositor(Compositor* aCompositor);
 

gfx/layers/composite/ContentHost.cpp

@@ -32,8 +32,6 @@ ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo)
 
 ContentHostBase::~ContentHostBase()
 {
-  DestroyTextureHost();
-  DestroyTextureHostOnWhite();
 }
 
 TextureHost*
@@ -42,18 +40,6 @@ ContentHostBase::GetAsTextureHost()
   return mTextureHost;
 }
 
-void
-ContentHostBase::DestroyTextureHost()
-{
-  mTextureHost = nullptr;
-}
-
-void
-ContentHostBase::DestroyTextureHostOnWhite()
-{
-  mTextureHostOnWhite = nullptr;
-}
-
 class MOZ_STACK_CLASS AutoLockTextureHost
 {
 public:
@@ -254,10 +240,10 @@ void
 ContentHostBase::UseTextureHost(TextureHost* aTexture)
 {
   if (aTexture->GetFlags() & TEXTURE_ON_WHITE) {
-    DestroyTextureHost();
+    mTextureHost = nullptr;
     mTextureHostOnWhite = aTexture;
   } else {
-    DestroyTextureHostOnWhite();
+    mTextureHostOnWhite = nullptr;
     mTextureHost = aTexture;
   }
 }
@@ -303,12 +289,6 @@ ContentHostBase::Dump(FILE* aFile,
 }
 #endif
 
-void
-ContentHostBase::OnActorDestroy()
-{
-  CompositableHost::OnActorDestroy();
-}
-
 DeprecatedContentHostBase::DeprecatedContentHostBase(const TextureInfo& aTextureInfo)
   : ContentHost(aTextureInfo)
   , mPaintWillResample(false)
@@ -335,11 +315,6 @@ DeprecatedContentHostBase::DestroyFrontHost()
   mDeprecatedTextureHostOnWhite = nullptr;
 }
 
-void
-DeprecatedContentHostBase::OnActorDestroy()
-{
-}
-
 void
 DeprecatedContentHostBase::Composite(EffectChain& aEffectChain,
                            float aOpacity,
@@ -798,11 +773,6 @@ DeprecatedContentHostDoubleBuffered::DestroyTextures()
   // don't touch mDeprecatedTextureHost, we might need it for compositing
 }
 
-void
-DeprecatedContentHostDoubleBuffered::OnActorDestroy()
-{
-}
-
 void
 DeprecatedContentHostDoubleBuffered::UpdateThebes(const ThebesBufferData& aData,
                                         const nsIntRegion& aUpdated,

gfx/layers/composite/ContentHost.h

@@ -119,8 +119,6 @@ public:
 
   virtual void SetPaintWillResample(bool aResample) { mPaintWillResample = aResample; }
 
-  virtual void OnActorDestroy() MOZ_OVERRIDE;
-
 protected:
   virtual nsIntPoint GetOriginOffset()
   {
@@ -129,10 +127,6 @@ protected:
 
   bool PaintWillResample() { return mPaintWillResample; }
 
-  // These must be called before forgetting mTextureHost or mTextureHostOnWhite
-  void DestroyTextureHost();
-  void DestroyTextureHostOnWhite();
-
   nsIntRect mBufferRect;
   nsIntPoint mBufferRotation;
   RefPtr<TextureHost> mTextureHost;
@@ -183,8 +177,6 @@ public:
   // destroy our front buffer so that we can continue to composite.
   virtual void DestroyTextures() = 0;
 
-  virtual void OnActorDestroy() MOZ_OVERRIDE;
-
 protected:
   virtual nsIntPoint GetOriginOffset()
   {
@@ -257,8 +249,6 @@ public:
                                  const TextureInfo& aTextureInfo) MOZ_OVERRIDE;
   virtual void DestroyTextures() MOZ_OVERRIDE;
 
-  virtual void OnActorDestroy() MOZ_OVERRIDE;
-
 #ifdef MOZ_DUMP_PAINTING
   virtual void Dump(FILE* aFile=nullptr,
                     const char* aPrefix="",

gfx/layers/composite/ImageHost.h

@@ -127,8 +127,6 @@ public:
 
   virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
 
-  virtual void OnActorDestroy() MOZ_OVERRIDE {}
-
   virtual void PrintInfo(nsACString& aTo, const char* aPrefix);
 
 #ifdef MOZ_DUMP_PAINTING

gfx/layers/composite/TextureHost.cpp

@@ -45,7 +45,7 @@ public:
 
   TextureHost* GetTextureHost() { return mTextureHost; }
 
-  void ActorDestroy(ActorDestroyReason why);
+  void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
   ISurfaceAllocator* mAllocator;
   RefPtr<TextureHost> mTextureHost;

gfx/layers/composite/TiledContentHost.h

@@ -119,8 +119,6 @@ public:
     mCompositor = aCompositor;
   }
 
-  void OnActorDestroy() {}
-
 protected:
   TiledTexture ValidateTile(TiledTexture aTile,
                             const nsIntPoint& aTileRect,
@@ -241,12 +239,6 @@ public:
                       Compositor* aCompositor,
                       AttachFlags aFlags = NO_FLAGS) MOZ_OVERRIDE;
 
-  virtual void OnActorDestroy() MOZ_OVERRIDE
-  {
-    mVideoMemoryTiledBuffer.OnActorDestroy();
-    mLowPrecisionVideoMemoryTiledBuffer.OnActorDestroy();
-  }
-
 #ifdef MOZ_DUMP_PAINTING
   virtual void Dump(FILE* aFile=nullptr,
                     const char* aPrefix="",