From 7434c7c6acd99a6720d73060561dcc14a221a319 Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Thu, 12 Mar 2015 11:07:20 +1100
Subject: [PATCH] Bug 1128381: Part6. Remove unused member functions. r=cpearce

--HG--
extra : rebase_source : f310f0f143662154332963e6f7678a4f87057ad8
---
 dom/media/fmp4/AVCCDecoderModule.cpp       | 7 -------
 dom/media/fmp4/PlatformDecoderModule.h     | 1 -
 dom/media/fmp4/SharedDecoderManager.cpp    | 8 --------
 dom/media/fmp4/SharedDecoderManager.h      | 1 -
 dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp | 6 ------
 dom/media/fmp4/wmf/WMFMediaDataDecoder.h   | 1 -
 6 files changed, 24 deletions(-)

diff --git a/dom/media/fmp4/AVCCDecoderModule.cpp b/dom/media/fmp4/AVCCDecoderModule.cpp
index ee6865094552..d97d3cd40307 100644
--- a/dom/media/fmp4/AVCCDecoderModule.cpp
+++ b/dom/media/fmp4/AVCCDecoderModule.cpp
@@ -35,7 +35,6 @@ public:
   virtual bool IsDormantNeeded() MOZ_OVERRIDE;
   virtual void AllocateMediaResources() MOZ_OVERRIDE;
   virtual void ReleaseMediaResources() MOZ_OVERRIDE;
-  virtual void ReleaseDecoder() MOZ_OVERRIDE;
   virtual bool IsHardwareAccelerated() const MOZ_OVERRIDE;
 
 private:
@@ -171,12 +170,6 @@ AVCCMediaDataDecoder::ReleaseMediaResources()
   }
 }
 
-void
-AVCCMediaDataDecoder::ReleaseDecoder()
-{
-  ReleaseMediaResources();
-}
-
 nsresult
 AVCCMediaDataDecoder::CreateDecoder()
 {
diff --git a/dom/media/fmp4/PlatformDecoderModule.h b/dom/media/fmp4/PlatformDecoderModule.h
index 09af0d78589a..5bed380f16bf 100644
--- a/dom/media/fmp4/PlatformDecoderModule.h
+++ b/dom/media/fmp4/PlatformDecoderModule.h
@@ -244,7 +244,6 @@ public:
   };
   virtual void AllocateMediaResources() {}
   virtual void ReleaseMediaResources() {}
-  virtual void ReleaseDecoder() {}
   virtual bool IsHardwareAccelerated() const { return false; }
 };
 
diff --git a/dom/media/fmp4/SharedDecoderManager.cpp b/dom/media/fmp4/SharedDecoderManager.cpp
index 27e9aa92212f..844eb2cebf09 100644
--- a/dom/media/fmp4/SharedDecoderManager.cpp
+++ b/dom/media/fmp4/SharedDecoderManager.cpp
@@ -232,14 +232,6 @@ SharedDecoderProxy::ReleaseMediaResources()
   }
 }
 
-void
-SharedDecoderProxy::ReleaseDecoder()
-{
-  if (mManager->mActiveProxy == this) {
-    mManager->mDecoder->ReleaseMediaResources();
-  }
-}
-
 bool
 SharedDecoderProxy::IsHardwareAccelerated() const
 {
diff --git a/dom/media/fmp4/SharedDecoderManager.h b/dom/media/fmp4/SharedDecoderManager.h
index 4836ef8b7f3d..ad8247cac7b5 100644
--- a/dom/media/fmp4/SharedDecoderManager.h
+++ b/dom/media/fmp4/SharedDecoderManager.h
@@ -69,7 +69,6 @@ public:
   virtual bool IsWaitingMediaResources() MOZ_OVERRIDE;
   virtual bool IsDormantNeeded() MOZ_OVERRIDE;
   virtual void ReleaseMediaResources() MOZ_OVERRIDE;
-  virtual void ReleaseDecoder() MOZ_OVERRIDE;
   virtual bool IsHardwareAccelerated() const MOZ_OVERRIDE;
 
   friend class SharedDecoderManager;
diff --git a/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp b/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
index 2d5dd9223c18..e18ed87ce303 100644
--- a/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
+++ b/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
@@ -175,12 +175,6 @@ WMFMediaDataDecoder::ReleaseMediaResources()
 #endif
 }
 
-void
-WMFMediaDataDecoder::ReleaseDecoder()
-{
-  ReleaseMediaResources();
-}
-
 bool
 WMFMediaDataDecoder::IsHardwareAccelerated() const {
   return mMFTManager && mMFTManager->IsHardwareAccelerated();
diff --git a/dom/media/fmp4/wmf/WMFMediaDataDecoder.h b/dom/media/fmp4/wmf/WMFMediaDataDecoder.h
index 300cf3d99d31..dbaa0ff2f644 100644
--- a/dom/media/fmp4/wmf/WMFMediaDataDecoder.h
+++ b/dom/media/fmp4/wmf/WMFMediaDataDecoder.h
@@ -77,7 +77,6 @@ public:
   virtual bool IsDormantNeeded() { return true; };
   virtual void AllocateMediaResources() MOZ_OVERRIDE;
   virtual void ReleaseMediaResources() MOZ_OVERRIDE;
-  virtual void ReleaseDecoder() MOZ_OVERRIDE;
   virtual bool IsHardwareAccelerated() const MOZ_OVERRIDE;
 
 private: