From 06bc493115288654176eb26211579b8400803915 Mon Sep 17 00:00:00 2001
From: Jeremy Chen <jeremychen@mozilla.com>
Date: Wed, 20 May 2015 01:43:00 -0400
Subject: [PATCH] Bug 1155495 - Part 2: Remove unnecessary class inheritance
 and casting. r=nical, r=sotaro

---
 gfx/layers/composite/TextureHost.h               |  5 -----
 gfx/layers/ipc/CompositableTransactionParent.cpp |  5 +----
 gfx/layers/opengl/GrallocTextureHost.h           |  8 --------
 widget/gonk/HwcComposer2D.cpp                    | 12 ++----------
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/gfx/layers/composite/TextureHost.h b/gfx/layers/composite/TextureHost.h
index a0ade02a2a6c..e3caa06d488e 100644
--- a/gfx/layers/composite/TextureHost.h
+++ b/gfx/layers/composite/TextureHost.h
@@ -498,11 +498,6 @@ class TextureHost
    */
   virtual bool HasInternalBuffer() const { return false; }
 
-  /**
-   * Cast to a TextureHost for each backend.
-   */
-  virtual TextureHostOGL* AsHostOGL() { return nullptr; }
-
   void AddCompositableRef() { ++mCompositableCount; }
 
   void ReleaseCompositableRef()
diff --git a/gfx/layers/ipc/CompositableTransactionParent.cpp b/gfx/layers/ipc/CompositableTransactionParent.cpp
index 72514c31b745..9c3526c0d857 100644
--- a/gfx/layers/ipc/CompositableTransactionParent.cpp
+++ b/gfx/layers/ipc/CompositableTransactionParent.cpp
@@ -179,10 +179,7 @@ CompositableParentManager::ReceiveCompositableUpdate(const CompositableOperation
       if (maybeFence.type() == MaybeFence::TFenceHandle) {
         FenceHandle fence = maybeFence.get_FenceHandle();
         if (fence.IsValid() && tex) {
-          TextureHostOGL* hostOGL = tex->AsHostOGL();
-          if (hostOGL) {
-            hostOGL->SetAcquireFence(fence);
-          }
+          tex->SetAcquireFenceHandle(fence);
         }
       }
 
diff --git a/gfx/layers/opengl/GrallocTextureHost.h b/gfx/layers/opengl/GrallocTextureHost.h
index c2ce3d3f9830..00ee62e14fcb 100644
--- a/gfx/layers/opengl/GrallocTextureHost.h
+++ b/gfx/layers/opengl/GrallocTextureHost.h
@@ -16,7 +16,6 @@ namespace mozilla {
 namespace layers {
 
 class GrallocTextureHostOGL : public TextureHost
-                            , public TextureHostOGL
 {
   friend class GrallocBufferActor;
 public:
@@ -51,13 +50,6 @@ class GrallocTextureHostOGL : public TextureHost
 
   virtual void UnbindTextureSource() override;
 
-#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
-  virtual TextureHostOGL* AsHostOGL() override
-  {
-    return this;
-  }
-#endif
-
   virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() override;
 
   virtual void WaitAcquireFenceHandleSyncComplete() override;
diff --git a/widget/gonk/HwcComposer2D.cpp b/widget/gonk/HwcComposer2D.cpp
index 1f42dcc41f56..692eb6958f10 100644
--- a/widget/gonk/HwcComposer2D.cpp
+++ b/widget/gonk/HwcComposer2D.cpp
@@ -858,11 +858,7 @@ HwcComposer2D::Commit()
         if (!state.mTexture) {
             continue;
         }
-        TextureHostOGL* texture = state.mTexture->AsHostOGL();
-        if (!texture) {
-            continue;
-        }
-        FenceHandle fence = texture->GetAndResetAcquireFence();
+        FenceHandle fence = state.mTexture->GetAndResetAcquireFenceHandle();
         if (fence.IsValid()) {
             nsRefPtr<FenceHandle::FdObj> fdObj = fence.GetAndResetFdObj();
             mList->hwLayers[j].acquireFenceFd = fdObj->GetAndResetFd();
@@ -884,11 +880,7 @@ HwcComposer2D::Commit()
             if (!state.mTexture) {
                 continue;
             }
-            TextureHostOGL* texture = state.mTexture->AsHostOGL();
-            if (!texture) {
-                continue;
-            }
-            texture->SetReleaseFence(fence);
+            state.mTexture->SetReleaseFenceHandle(fence);
         }
     }