Backed out changeset 7b550d45454b (bug 1048104) for build bustage on a CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Mon, 04 Aug 2014 16:06:59 -0700
changeset 197754 f9d5b35e4b5bf517c4d10aede2a6bf8a1b1c3851
parent 197753 7b2c2cc747db6ed46557325efc9d34b685bd558a
child 197755 77c7c4690031ab5956888f72a97ddccf780119f6
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1048104
milestone34.0a1
backs out7b550d45454b4af99db5187528d1d6d18089f0a2
Backed out changeset 7b550d45454b (bug 1048104) for build bustage on a CLOSED TREE
content/media/gmp/GMPPlatform.cpp
content/media/gmp/GMPPlatform.h
content/media/gmp/gmp-api/gmp-platform.h
--- a/content/media/gmp/GMPPlatform.cpp
+++ b/content/media/gmp/GMPPlatform.cpp
@@ -198,28 +198,20 @@ GMPThreadImpl::Join()
     }
   }
   delete this;
 }
 
 GMPMutexImpl::GMPMutexImpl()
 : mMutex("gmp-mutex")
 {
-  MOZ_COUNT_CTOR(GMPMutexImpl);
 }
 
 GMPMutexImpl::~GMPMutexImpl()
 {
-  MOZ_COUNT_DTOR(GMPMutexImpl);
-}
-
-void
-GMPMutexImpl::Destroy()
-{
-  delete this;
 }
 
 void
 GMPMutexImpl::Acquire()
 {
   mMutex.Lock();
 }
 
--- a/content/media/gmp/GMPPlatform.h
+++ b/content/media/gmp/GMPPlatform.h
@@ -36,17 +36,16 @@ class GMPMutexImpl : public GMPMutex
 {
 public:
   GMPMutexImpl();
   virtual ~GMPMutexImpl();
 
   // GMPMutex
   virtual void Acquire() MOZ_OVERRIDE;
   virtual void Release() MOZ_OVERRIDE;
-  virtual void Destroy() MOZ_OVERRIDE;
 
 private:
   Mutex mMutex;
 };
 
 } // namespace gmp
 } // namespace mozilla
 
--- a/content/media/gmp/gmp-api/gmp-platform.h
+++ b/content/media/gmp/gmp-api/gmp-platform.h
@@ -36,34 +36,33 @@
 #include "gmp-errors.h"
 #include "gmp-storage.h"
 #include <stdint.h>
 
 /* Platform helper API. */
 
 class GMPTask {
 public:
-  virtual void Destroy() = 0; // Deletes object.
+  virtual void Destroy() = 0;
   virtual ~GMPTask() {}
   virtual void Run() = 0;
 };
 
 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 {
 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
 // Epoch (00:00:00 UTC, January 1, 1970).
 typedef int64_t GMPTimestamp;
 
 typedef GMPErr (*GMPCreateThreadPtr)(GMPThread** aThread);
 typedef GMPErr (*GMPRunOnMainThreadPtr)(GMPTask* aTask);