diff --git a/content/media/gmp/GMPPlatform.cpp b/content/media/gmp/GMPPlatform.cpp index 82ee879d4601..1261db3a8a7f 100644 --- a/content/media/gmp/GMPPlatform.cpp +++ b/content/media/gmp/GMPPlatform.cpp @@ -203,18 +203,10 @@ GMPThreadImpl::Join() GMPMutexImpl::GMPMutexImpl() : mMutex("gmp-mutex") { - MOZ_COUNT_CTOR(GMPMutexImpl); } GMPMutexImpl::~GMPMutexImpl() { - MOZ_COUNT_DTOR(GMPMutexImpl); -} - -void -GMPMutexImpl::Destroy() -{ - delete this; } void diff --git a/content/media/gmp/GMPPlatform.h b/content/media/gmp/GMPPlatform.h index 5d0051f6fce2..af901d6d848c 100644 --- a/content/media/gmp/GMPPlatform.h +++ b/content/media/gmp/GMPPlatform.h @@ -41,7 +41,6 @@ public: // GMPMutex virtual void Acquire() MOZ_OVERRIDE; virtual void Release() MOZ_OVERRIDE; - virtual void Destroy() MOZ_OVERRIDE; private: Mutex mMutex; diff --git a/content/media/gmp/gmp-api/gmp-platform.h b/content/media/gmp/gmp-api/gmp-platform.h index d35cf888fd6b..e84d6906f614 100644 --- a/content/media/gmp/gmp-api/gmp-platform.h +++ b/content/media/gmp/gmp-api/gmp-platform.h @@ -41,7 +41,7 @@ class GMPTask { public: - virtual void Destroy() = 0; // Deletes object. + virtual void Destroy() = 0; virtual ~GMPTask() {} virtual void Run() = 0; }; @@ -50,7 +50,7 @@ class GMPThread { public: virtual ~GMPThread() {} virtual void Post(GMPTask* aTask) = 0; - virtual void Join() = 0; // Deletes object after join completes. + virtual void Join() = 0; // Deletes GMPThread! }; class GMPMutex { @@ -58,7 +58,6 @@ public: virtual ~GMPMutex() {} virtual void Acquire() = 0; virtual void Release() = 0; - virtual void Destroy() = 0; // Deletes object. }; // Time is defined as the number of milliseconds since the