Bug 1032417: Move nsPluginElement's destructor to the implementation file. r=khuey
authorJon Morton <jonanin@gmail.com>
Mon, 30 Jun 2014 16:00:30 -0700
changeset 191608 231c5bbd4a75faecdbcc893a5fa36b1c10baea64
parent 191607 5428ca1aeeb619112e1c4acb64b631f2ecd2946b
child 191609 498be46fad67af8d6b4f47054f7b4addbfda67fe
push id27055
push usercbook@mozilla.com
push dateTue, 01 Jul 2014 12:01:46 +0000
treeherdermozilla-central@4a9353b5762d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs1032417
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1032417: Move nsPluginElement's destructor to the implementation file. r=khuey
dom/base/nsPluginArray.cpp
dom/base/nsPluginArray.h
--- a/dom/base/nsPluginArray.cpp
+++ b/dom/base/nsPluginArray.cpp
@@ -361,16 +361,20 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ns
 nsPluginElement::nsPluginElement(nsPIDOMWindow* aWindow,
                                  nsPluginTag* aPluginTag)
   : mWindow(aWindow),
     mPluginTag(aPluginTag)
 {
   SetIsDOMBinding();
 }
 
+nsPluginElement::~nsPluginElement()
+{
+}
+
 nsPIDOMWindow*
 nsPluginElement::GetParentObject() const
 {
   MOZ_ASSERT(mWindow);
   return mWindow;
 }
 
 JSObject*
--- a/dom/base/nsPluginArray.h
+++ b/dom/base/nsPluginArray.h
@@ -6,17 +6,16 @@
 
 #ifndef nsPluginArray_h___
 #define nsPluginArray_h___
 
 #include "nsTArray.h"
 #include "nsWeakReference.h"
 #include "nsIObserver.h"
 #include "nsWrapperCache.h"
-#include "nsMimeTypeArray.h"
 #include "nsPluginTags.h"
 #include "nsPIDOMWindow.h"
 
 class nsPluginElement;
 class nsMimeType;
 
 class nsPluginArray MOZ_FINAL : public nsIObserver,
                                 public nsSupportsWeakReference,
@@ -105,17 +104,17 @@ public:
   nsMimeType* NamedGetter(const nsAString& name, bool &found);
   bool NameIsEnumerable(const nsAString& aName);
   uint32_t Length();
   void GetSupportedNames(unsigned, nsTArray<nsString>& retval);
 
   nsTArray<nsRefPtr<nsMimeType> >& MimeTypes();
 
 protected:
-  ~nsPluginElement() {}
+  ~nsPluginElement();
 
   void EnsurePluginMimeTypes();
 
   nsCOMPtr<nsPIDOMWindow> mWindow;
   nsRefPtr<nsPluginTag> mPluginTag;
   nsTArray<nsRefPtr<nsMimeType> > mMimeTypes;
 };