From 325432ff7c7f1701a27ed76b124b5a94cb8cf3f8 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 8 Jul 2014 17:23:17 -0400
Subject: [PATCH] Bug 1035394 - Fix dangerous public destructors in
 content/media/eme - r=cpearce

---
 content/media/eme/MediaKeyMessageEvent.h | 2 +-
 content/media/eme/MediaKeyNeededEvent.h  | 2 +-
 content/media/eme/MediaKeySession.h      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/media/eme/MediaKeyMessageEvent.h b/content/media/eme/MediaKeyMessageEvent.h
index 4536a0d94c3..26ad9c3f841 100644
--- a/content/media/eme/MediaKeyMessageEvent.h
+++ b/content/media/eme/MediaKeyMessageEvent.h
@@ -27,8 +27,8 @@ class MediaKeyMessageEvent MOZ_FINAL : public Event
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(MediaKeyMessageEvent, Event)
-  virtual ~MediaKeyMessageEvent();
 protected:
+  virtual ~MediaKeyMessageEvent();
   MediaKeyMessageEvent(EventTarget* aOwner);
 
   JS::Heap<JSObject*> mMessage;
diff --git a/content/media/eme/MediaKeyNeededEvent.h b/content/media/eme/MediaKeyNeededEvent.h
index aac7689aa6e..f8d3b524403 100644
--- a/content/media/eme/MediaKeyNeededEvent.h
+++ b/content/media/eme/MediaKeyNeededEvent.h
@@ -27,8 +27,8 @@ class MediaKeyNeededEvent MOZ_FINAL : public Event
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(MediaKeyNeededEvent, Event)
-  virtual ~MediaKeyNeededEvent();
 protected:
+  virtual ~MediaKeyNeededEvent();
   MediaKeyNeededEvent(EventTarget* aOwner);
 
   nsString mInitDataType;
diff --git a/content/media/eme/MediaKeySession.h b/content/media/eme/MediaKeySession.h
index 8e616c0c1a8..84da306a322 100644
--- a/content/media/eme/MediaKeySession.h
+++ b/content/media/eme/MediaKeySession.h
@@ -43,8 +43,6 @@ public:
 
   void Init(const nsAString& aSessionId);
 
-  ~MediaKeySession();
-
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
   // Mark this as resultNotAddRefed to return raw pointers
@@ -77,6 +75,8 @@ public:
   bool IsClosed() const;
 
 private:
+  ~MediaKeySession();
+
   nsRefPtr<Promise> mClosed;
 
   nsRefPtr<MediaKeyError> mMediaKeyError;