Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to eliminate nsINetworkManager

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@10380 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
1998-09-18 10:48:12 +00:00
parent 7e1d05c8e7
commit 78de9ecbcc
8 changed files with 24 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/modules/plugin/base/src/ns4xPlugin.cpp
View File

@@ -28,7 +28,6 @@
NPNetscapeFuncs ns4xPlugin::CALLBACKS;
nsIPluginManager * ns4xPlugin::mPluginManager;
nsINetworkManager * ns4xPlugin::mNetworkManager;
nsIMalloc * ns4xPlugin::mMalloc;
void
@@ -40,7 +39,6 @@ ns4xPlugin::CheckClassInitialized(void)
return;
mPluginManager = nsnull;
mNetworkManager = nsnull;
mMalloc = nsnull;
// XXX It'd be nice to make this const and initialize it
@@ -235,7 +233,6 @@ nsresult ns4xPlugin :: LockFactory(PRBool aLock)
}
static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID);
static NS_DEFINE_IID(kINetworkManagerIID, NS_INETWORKMANAGER_IID);
static NS_DEFINE_IID(kIMallocIID, NS_IMALLOC_IID);
nsresult
@@ -246,9 +243,6 @@ ns4xPlugin::Initialize(nsISupports* browserInterfaces)
if (nsnull == mPluginManager)
rv = browserInterfaces->QueryInterface(kIPluginManagerIID, (void **)&mPluginManager);
if (nsnull == mNetworkManager)
rv = browserInterfaces->QueryInterface(kINetworkManagerIID, (void **)&mNetworkManager);
if (nsnull == mMalloc)
rv = browserInterfaces->QueryInterface(kIMallocIID, (void **)&mMalloc);
@@ -268,7 +262,6 @@ printf("shutting down plugin %08x\n", this);
}
NS_IF_RELEASE(mPluginManager);
NS_IF_RELEASE(mNetworkManager);
NS_IF_RELEASE(mMalloc);
return NS_OK;
@@ -307,12 +300,12 @@ ns4xPlugin::_geturl(NPP npp, const char* relativeURL, const char* target)
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
NS_ASSERTION(inst != NULL, "null instance");
NS_ASSERTION(mNetworkManager != NULL, "null manager");
NS_ASSERTION(mPluginManager != NULL, "null manager");
if (inst == NULL)
return NS_ERROR_UNEXPECTED; // XXX
return mNetworkManager->GetURL(inst, relativeURL, target);
return mPluginManager->GetURL(inst, relativeURL, target);
}
nsresult NP_EXPORT
@@ -322,13 +315,13 @@ ns4xPlugin::_geturlnotify(NPP npp, const char* relativeURL, const char* target,
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
NS_ASSERTION(inst != NULL, "null instance");
NS_ASSERTION(mNetworkManager != NULL, "null manager");
NS_ASSERTION(mPluginManager != NULL, "null manager");
if (inst == NULL)
return NS_ERROR_UNEXPECTED; // XXX
return mNetworkManager->GetURL(inst, relativeURL, target,
notifyData);
return mPluginManager->GetURL(inst, relativeURL, target,
notifyData);
}
@@ -340,13 +333,13 @@ ns4xPlugin::_posturlnotify(NPP npp, const char* relativeURL, const char *target,
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
NS_ASSERTION(inst != NULL, "null instance");
NS_ASSERTION(mNetworkManager != NULL, "null manager");
NS_ASSERTION(mPluginManager != NULL, "null manager");
if (inst == NULL)
return NS_ERROR_UNEXPECTED; // XXX
return mNetworkManager->PostURL(inst, relativeURL, target,
len, buf, file, notifyData);
return mPluginManager->PostURL(inst, relativeURL, target,
len, buf, file, notifyData);
}
@@ -357,13 +350,13 @@ ns4xPlugin::_posturl(NPP npp, const char* relativeURL, const char *target, uint3
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
NS_ASSERTION(inst != NULL, "null instance");
NS_ASSERTION(mNetworkManager != NULL, "null manager");
NS_ASSERTION(mPluginManager != NULL, "null manager");
if (inst == NULL)
return NS_ERROR_UNEXPECTED; // XXX
return mNetworkManager->PostURL(inst, relativeURL, target,
len, buf, file);
return mPluginManager->PostURL(inst, relativeURL, target,
len, buf, file);
}
////////////////////////////////////////////////////////////////////////

1
mozilla/modules/plugin/base/src/ns4xPlugin.h
View File

@@ -227,7 +227,6 @@ protected:
static NPNetscapeFuncs CALLBACKS;
static nsIPluginManager *mPluginManager;
static nsINetworkManager *mNetworkManager;
static nsIMalloc *mMalloc;
};

8
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -38,7 +38,6 @@
static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID);
static NS_DEFINE_IID(kIPluginInstancePeerIID, NS_IPLUGININSTANCEPEER_IID);
static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID);
static NS_DEFINE_IID(kINetworkManagerIID, NS_INETWORKMANAGER_IID);
static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID);
static NS_DEFINE_IID(kIPluginStreamPeerIID, NS_IPLUGINSTREAMPEER_IID);
static NS_DEFINE_IID(kIMallocIID, NS_IMALLOC_IID);
@@ -511,13 +510,6 @@ nsresult nsPluginHostImpl :: QueryInterface(const nsIID& aIID,
return NS_OK;
}
if (aIID.Equals(kINetworkManagerIID))
{
*aInstancePtrResult = (void *)((nsINetworkManager *)this);
AddRef();
return NS_OK;
}
if (aIID.Equals(kIFactoryIID))
{
*aInstancePtrResult = (void *)((nsIFactory *)this);

6
mozilla/modules/plugin/base/src/nsPluginHostImpl.h
View File

@@ -22,7 +22,6 @@
#include "xp_core.h"
#include "nsIPluginManager.h"
#include "nsIPluginHost.h"
#include "nsINetworkManager.h"
#include "nsCRT.h"
#include "prlink.h"
#include "nsIMalloc.h"
@@ -53,8 +52,7 @@ public:
#define NS_PLUGIN_FLAG_ENABLED 0x0001 //is this plugin enabled?
#define NS_PLUGIN_FLAG_OLDSCHOOL 0x0002 //is this a pre-xpcom plugin?
class nsPluginHostImpl : public nsIPluginManager, public nsIPluginHost,
public nsINetworkManager
class nsPluginHostImpl : public nsIPluginManager, public nsIPluginHost
{
public:
nsPluginHostImpl();
@@ -79,8 +77,6 @@ public:
NS_IMETHOD
UserAgent(const char* *resultingAgentString);
//nsINetworkManager interface
NS_IMETHOD
GetURL(nsISupports* inst, const char* url, const char* target,
void* notifyData = NULL, const char* altHost = NULL,