Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed all vestiges of nsIMalloc.

Browse Source
This commit is contained in:
beard%netscape.com 1999-03-02 22:33:32 +00:00
parent 15654d5717
commit 93e80dbefd
4 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -21,7 +21,6 @@
#include "prio.h"
#include "prmem.h"
#include "ns4xPlugin.h"
#include "nsMalloc.h"
#include "nsPluginInstancePeer.h"
#ifdef NEW_PLUGIN_STREAM_API
@ -73,7 +72,6 @@ static NS_DEFINE_IID(kIPluginStreamInfoIID, NS_IPLUGINSTREAMINFO_IID);
static NS_DEFINE_IID(kIPluginStreamPeerIID, NS_IPLUGINSTREAMPEER_IID);
#endif
static NS_DEFINE_IID(kIPluginIID, NS_IPLUGIN_IID);
static NS_DEFINE_IID(kIMallocIID, NS_IMALLOC_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
@ -1096,8 +1094,6 @@ printf("killing plugin host\n");
delete mPlugins;
mPlugins = temp;
}
NS_IF_RELEASE(mMalloc);
}
NS_IMPL_ADDREF(nsPluginHostImpl)
@ -1139,13 +1135,6 @@ nsresult nsPluginHostImpl :: QueryInterface(const nsIID& aIID,
return NS_OK;
}
if (aIID.Equals(kIMallocIID))
{
*aInstancePtrResult = mMalloc;
NS_IF_ADDREF(mMalloc);
return NS_OK;
}
if (aIID.Equals(kIFileUtilitiesIID))
{
*aInstancePtrResult = (void*)(nsIFileUtilities*)this;
@ -1504,20 +1493,7 @@ printf("plugin manager2 processnextevent called\n");
NS_IMETHODIMP nsPluginHostImpl :: Init(void)
{
nsresult rv = NS_OK;
nsISupports *object;
rv = nsMalloc::Create(nsnull, kIMallocIID, (void **)&object);
//it should be possible to kill this now... MMP
if (NS_OK == rv)
{
rv = object->QueryInterface(kIMallocIID, (void **)&mMalloc);
NS_RELEASE(object);
}
return rv;
return NS_OK;
}
NS_IMETHODIMP nsPluginHostImpl :: Destroy(void)

2
modules/plugin/base/src/nsPluginHostImpl.h
View File

@ -25,7 +25,6 @@
#include "nsIPluginHost.h"
#include "nsCRT.h"
#include "prlink.h"
#include "nsIMalloc.h"
#include "nsIFileUtilities.h"
#include "nsPluginsDir.h"
@ -222,7 +221,6 @@ private:
char *mPluginPath;
nsPluginTag *mPlugins;
nsIMalloc *mMalloc;
PRBool mPluginsLoaded;
nsIServiceManager *mServiceMgr;
};

26
modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@ -21,7 +21,6 @@
#include "prio.h"
#include "prmem.h"
#include "ns4xPlugin.h"
#include "nsMalloc.h"
#include "nsPluginInstancePeer.h"
#ifdef NEW_PLUGIN_STREAM_API
@ -73,7 +72,6 @@ static NS_DEFINE_IID(kIPluginStreamInfoIID, NS_IPLUGINSTREAMINFO_IID);
static NS_DEFINE_IID(kIPluginStreamPeerIID, NS_IPLUGINSTREAMPEER_IID);
#endif
static NS_DEFINE_IID(kIPluginIID, NS_IPLUGIN_IID);
static NS_DEFINE_IID(kIMallocIID, NS_IMALLOC_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
@ -1096,8 +1094,6 @@ printf("killing plugin host\n");
delete mPlugins;
mPlugins = temp;
}
NS_IF_RELEASE(mMalloc);
}
NS_IMPL_ADDREF(nsPluginHostImpl)
@ -1139,13 +1135,6 @@ nsresult nsPluginHostImpl :: QueryInterface(const nsIID& aIID,
return NS_OK;
}
if (aIID.Equals(kIMallocIID))
{
*aInstancePtrResult = mMalloc;
NS_IF_ADDREF(mMalloc);
return NS_OK;
}
if (aIID.Equals(kIFileUtilitiesIID))
{
*aInstancePtrResult = (void*)(nsIFileUtilities*)this;
@ -1504,20 +1493,7 @@ printf("plugin manager2 processnextevent called\n");
NS_IMETHODIMP nsPluginHostImpl :: Init(void)
{
nsresult rv = NS_OK;
nsISupports *object;
rv = nsMalloc::Create(nsnull, kIMallocIID, (void **)&object);
//it should be possible to kill this now... MMP
if (NS_OK == rv)
{
rv = object->QueryInterface(kIMallocIID, (void **)&mMalloc);
NS_RELEASE(object);
}
return rv;
return NS_OK;
}
NS_IMETHODIMP nsPluginHostImpl :: Destroy(void)

2
modules/plugin/nglsrc/nsPluginHostImpl.h
View File

@ -25,7 +25,6 @@
#include "nsIPluginHost.h"
#include "nsCRT.h"
#include "prlink.h"
#include "nsIMalloc.h"
#include "nsIFileUtilities.h"
#include "nsPluginsDir.h"
@ -222,7 +221,6 @@ private:
char *mPluginPath;
nsPluginTag *mPlugins;
nsIMalloc *mMalloc;
PRBool mPluginsLoaded;
nsIServiceManager *mServiceMgr;
};