Bug 1017862 - Remove virtual destructor from BaseProxyHandler. (r=jorendorff)

js/ipc/WrapperOwner.cpp

@@ -50,7 +50,6 @@ class CPOWProxyHandler : public BaseProxyHandler
   public:
     CPOWProxyHandler()
       : BaseProxyHandler(&family) {}
-    virtual ~CPOWProxyHandler() {}
 
     virtual bool finalizeInBackground(Value priv) const MOZ_OVERRIDE {
         return false;

js/src/jsproxy.cpp

@@ -90,10 +90,6 @@ BaseProxyHandler::BaseProxyHandler(const void *family, bool hasPrototype, bool h
 {
 }
 
-BaseProxyHandler::~BaseProxyHandler()
-{
-}
-
 bool
 BaseProxyHandler::enter(JSContext *cx, HandleObject wrapper, HandleId id, Action act,
                         bool *bp) const
@@ -762,7 +758,6 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
 {
   public:
     ScriptedIndirectProxyHandler();
-    virtual ~ScriptedIndirectProxyHandler();
 
     /* ES5 Harmony fundamental proxy traps. */
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
@@ -826,10 +821,6 @@ ScriptedIndirectProxyHandler::ScriptedIndirectProxyHandler()
 {
 }
 
-ScriptedIndirectProxyHandler::~ScriptedIndirectProxyHandler()
-{
-}
-
 bool
 ScriptedIndirectProxyHandler::isExtensible(JSContext *cx, HandleObject proxy,
                                            bool *extensible) const
@@ -1079,7 +1070,6 @@ const ScriptedIndirectProxyHandler ScriptedIndirectProxyHandler::singleton;
 class ScriptedDirectProxyHandler : public DirectProxyHandler {
   public:
     ScriptedDirectProxyHandler();
-    virtual ~ScriptedDirectProxyHandler();
 
     /* ES5 Harmony fundamental proxy traps. */
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
@@ -1392,10 +1382,6 @@ ScriptedDirectProxyHandler::ScriptedDirectProxyHandler()
 {
 }
 
-ScriptedDirectProxyHandler::~ScriptedDirectProxyHandler()
-{
-}
-
 // ES6 (22 May, 2014) 9.5.4 Proxy.[[PreventExtensions]]()
 bool
 ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy) const

js/src/jsproxy.h

@@ -127,7 +127,6 @@ class JS_FRIEND_API(BaseProxyHandler)
   public:
     explicit BaseProxyHandler(const void *family, bool hasPrototype = false,
                               bool hasSecurityPolicy = false);
-    virtual ~BaseProxyHandler();
 
     bool hasPrototype() const {
         return mHasPrototype;

js/src/jswrapper.cpp

@@ -134,10 +134,6 @@ Wrapper::Wrapper(unsigned flags, bool hasPrototype, bool hasSecurityPolicy)
 {
 }
 
-Wrapper::~Wrapper()
-{
-}
-
 const char Wrapper::family = 0;
 const Wrapper Wrapper::singleton((unsigned)0);
 const Wrapper Wrapper::singletonWithPrototype((unsigned)0, true);
@@ -178,10 +174,6 @@ CrossCompartmentWrapper::CrossCompartmentWrapper(unsigned flags, bool hasPrototy
 {
 }
 
-CrossCompartmentWrapper::~CrossCompartmentWrapper()
-{
-}
-
 bool Wrapper::finalizeInBackground(Value priv) const
 {
     if (!priv.isObject())

js/src/jswrapper.h

@@ -83,8 +83,6 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
 
     explicit Wrapper(unsigned flags, bool hasPrototype = false, bool hasSecurityPolicy = false);
 
-    virtual ~Wrapper();
-
     virtual bool finalizeInBackground(Value priv) const MOZ_OVERRIDE;
 
     static const char family;
@@ -107,8 +105,6 @@ class JS_FRIEND_API(CrossCompartmentWrapper) : public Wrapper
     explicit CrossCompartmentWrapper(unsigned flags, bool hasPrototype = false,
                                      bool hasSecurityPolicy = false);
 
-    virtual ~CrossCompartmentWrapper();
-
     /* ES5 Harmony fundamental wrapper traps. */
     virtual bool preventExtensions(JSContext *cx, HandleObject wrapper) const MOZ_OVERRIDE;
     virtual bool getPropertyDescriptor(JSContext *cx, HandleObject wrapper, HandleId id,

js/xpconnect/wrappers/AddonWrapper.cpp

@@ -71,11 +71,6 @@ AddonWrapper<Base>::AddonWrapper(unsigned flags) : Base(flags)
 {
 }
 
-template<typename Base>
-AddonWrapper<Base>::~AddonWrapper()
-{
-}
-
 template<typename Base>
 bool
 AddonWrapper<Base>::getPropertyDescriptor(JSContext *cx, HandleObject wrapper,

js/xpconnect/wrappers/AddonWrapper.h

@@ -23,7 +23,6 @@ template<typename Base>
 class AddonWrapper : public Base {
   public:
     AddonWrapper(unsigned flags);
-    virtual ~AddonWrapper();
 
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                        JS::Handle<jsid> id,

js/xpconnect/wrappers/FilteringWrapper.cpp

@@ -21,11 +21,6 @@ FilteringWrapper<Base, Policy>::FilteringWrapper(unsigned flags) : Base(flags)
 {
 }
 
-template <typename Base, typename Policy>
-FilteringWrapper<Base, Policy>::~FilteringWrapper()
-{
-}
-
 template <typename Policy>
 static bool
 Filter(JSContext *cx, HandleObject wrapper, AutoIdVector &props)
@@ -194,10 +189,6 @@ CrossOriginXrayWrapper::CrossOriginXrayWrapper(unsigned flags) : SecurityXrayDOM
 {
 }
 
-CrossOriginXrayWrapper::~CrossOriginXrayWrapper()
-{
-}
-
 bool
 CrossOriginXrayWrapper::getPropertyDescriptor(JSContext *cx,
                                               JS::Handle<JSObject*> wrapper,

js/xpconnect/wrappers/FilteringWrapper.h

@@ -24,7 +24,6 @@ template <typename Base, typename Policy>
 class FilteringWrapper : public Base {
   public:
     FilteringWrapper(unsigned flags);
-    virtual ~FilteringWrapper();
 
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                        JS::Handle<jsid> id,
@@ -60,7 +59,6 @@ class FilteringWrapper : public Base {
 class CrossOriginXrayWrapper : public SecurityXrayDOM {
   public:
     CrossOriginXrayWrapper(unsigned flags);
-    virtual ~CrossOriginXrayWrapper();
 
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                        JS::Handle<jsid> id,

js/xpconnect/wrappers/WaiveXrayWrapper.cpp

@@ -35,10 +35,6 @@ WaiveXrayWrapper::WaiveXrayWrapper(unsigned flags) : js::CrossCompartmentWrapper
 {
 }
 
-WaiveXrayWrapper::~WaiveXrayWrapper()
-{
-}
-
 bool
 WaiveXrayWrapper::getPropertyDescriptor(JSContext *cx, HandleObject wrapper,
                                         HandleId id, JS::MutableHandle<JSPropertyDescriptor> desc)

js/xpconnect/wrappers/WaiveXrayWrapper.h

@@ -16,7 +16,6 @@ namespace xpc {
 class WaiveXrayWrapper : public js::CrossCompartmentWrapper {
   public:
     WaiveXrayWrapper(unsigned flags);
-    virtual ~WaiveXrayWrapper();
 
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                        JS::Handle<jsid> id,

js/xpconnect/wrappers/XrayWrapper.cpp

@@ -2250,11 +2250,6 @@ XrayWrapper<Base, Traits>::XrayWrapper(unsigned flags)
 {
 }
 
-template <typename Base, typename Traits>
-XrayWrapper<Base, Traits>::~XrayWrapper()
-{
-}
-
 namespace XrayUtils {
 
 JSObject *

js/xpconnect/wrappers/XrayWrapper.h

@@ -68,7 +68,6 @@ template <typename Base, typename Traits = XPCWrappedNativeXrayTraits >
 class XrayWrapper : public Base {
   public:
     XrayWrapper(unsigned flags);
-    virtual ~XrayWrapper();
 
     /* Fundamental proxy traps. */
     virtual bool isExtensible(JSContext *cx, JS::Handle<JSObject*> wrapper, bool *extensible) const MOZ_OVERRIDE;