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

just recovering --disable-oji

Browse Source 
(only affects  --disable-oji builds)


git-svn-id: svn://10.0.0.236/trunk@140655 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2003-04-03 21:19:41 +00:00
parent 57fca16e25
commit 60d5b5df22
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2893,6 +2893,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetURLWithHeaders(nsISupports* pluginInst,
nsCOMPtr<nsIPluginInstance> instance = do_QueryInterface(pluginInst, &rv);
#ifdef OJI
if (NS_SUCCEEDED(rv))
{
// if this is a Java plugin calling, we need to do a security check
@@ -2901,6 +2902,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetURLWithHeaders(nsISupports* pluginInst,
if (javaInstance)
rv = DoURLLoadSecurityCheck(instance, url);
}
#endif
if (NS_SUCCEEDED(rv))
{
@@ -2960,6 +2962,7 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
nsCOMPtr<nsIPluginInstance> instance = do_QueryInterface(pluginInst, &rv);
#ifdef OJI
if (NS_SUCCEEDED(rv))
{
// if this is a Java plugin calling, we need to do a security check
@@ -2968,6 +2971,7 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
if (javaInstance)
rv = DoURLLoadSecurityCheck(instance, url);
}
#endif
if (NS_SUCCEEDED(rv))
{
@@ -5865,7 +5869,7 @@ nsPluginHostImpl::StopPluginInstance(nsIPluginInstance* aInstance)
// try to get the max cached plugins from a pref or use default
PRUint32 max_num;
nsresult rv;
nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID, &rv);
if (prefs) rv = prefs->GetIntPref(NS_PREF_MAX_NUM_CACHED_PLUGINS,(int *)&max_num);
if (NS_FAILED(rv)) max_num = DEFAULT_NUMBER_OF_STOPPED_PLUGINS;