Bug 1017862 - Remove virtual destructor from BaseProxyHandler. (r=jorendorff)
This commit is contained in:
@@ -88,6 +88,7 @@ BaseProxyHandler::BaseProxyHandler(const void *family)
|
||||
|
||||
BaseProxyHandler::~BaseProxyHandler()
|
||||
{
|
||||
MOZ_RELEASE_ASSERT(jsIsShutDown(), "Proxy handler destructor called with engine running?");
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -737,7 +738,6 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
|
||||
{
|
||||
public:
|
||||
ScriptedIndirectProxyHandler();
|
||||
virtual ~ScriptedIndirectProxyHandler();
|
||||
|
||||
/* ES5 Harmony fundamental proxy traps. */
|
||||
virtual bool preventExtensions(JSContext *cx, HandleObject proxy) MOZ_OVERRIDE;
|
||||
@@ -799,10 +799,6 @@ ScriptedIndirectProxyHandler::ScriptedIndirectProxyHandler()
|
||||
{
|
||||
}
|
||||
|
||||
ScriptedIndirectProxyHandler::~ScriptedIndirectProxyHandler()
|
||||
{
|
||||
}
|
||||
|
||||
bool
|
||||
ScriptedIndirectProxyHandler::isExtensible(JSContext *cx, HandleObject proxy, bool *extensible)
|
||||
{
|
||||
@@ -1055,7 +1051,6 @@ ScriptedIndirectProxyHandler ScriptedIndirectProxyHandler::singleton;
|
||||
class ScriptedDirectProxyHandler : public DirectProxyHandler {
|
||||
public:
|
||||
ScriptedDirectProxyHandler();
|
||||
virtual ~ScriptedDirectProxyHandler();
|
||||
|
||||
/* ES5 Harmony fundamental proxy traps. */
|
||||
virtual bool preventExtensions(JSContext *cx, HandleObject proxy) MOZ_OVERRIDE;
|
||||
@@ -1386,10 +1381,6 @@ ScriptedDirectProxyHandler::ScriptedDirectProxyHandler()
|
||||
{
|
||||
}
|
||||
|
||||
ScriptedDirectProxyHandler::~ScriptedDirectProxyHandler()
|
||||
{
|
||||
}
|
||||
|
||||
bool
|
||||
ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user