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

Resurrect --disable-oji

Browse Source 
Bug #197924 r=peterl sr=alecf


git-svn-id: svn://10.0.0.236/trunk@140220 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com
2003-03-25 06:54:52 +00:00
parent 5ce9a0b484
commit 4da846686f
29 changed files with 758 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/modules/plugin/tools/sdk/samples/common/np_entry.cpp
View File

@@ -90,7 +90,9 @@ static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
aNPPFuncs->getvalue = NPP_GetValue;
aNPPFuncs->setvalue = NPP_SetValue;
#endif
#ifdef OJI
aNPPFuncs->javaClass = NULL;
#endif
return NPERR_NO_ERROR;
}
@@ -122,8 +124,10 @@ static NPError fillNetscapeFunctionTable(NPNetscapeFuncs* aNPNFuncs)
NPNFuncs.memfree = aNPNFuncs->memfree;
NPNFuncs.memflush = aNPNFuncs->memflush;
NPNFuncs.reloadplugins = aNPNFuncs->reloadplugins;
#ifdef OJI
NPNFuncs.getJavaEnv = aNPNFuncs->getJavaEnv;
NPNFuncs.getJavaPeer = aNPNFuncs->getJavaPeer;
#endif
NPNFuncs.getvalue = aNPNFuncs->getvalue;
NPNFuncs.setvalue = aNPNFuncs->setvalue;
NPNFuncs.invalidaterect = aNPNFuncs->invalidaterect;

2
mozilla/modules/plugin/tools/sdk/samples/common/npn_gate.cpp
View File

@@ -171,6 +171,7 @@ void NPN_ReloadPlugins(NPBool reloadPages)
CallNPN_ReloadPluginsProc(NPNFuncs.reloadplugins, reloadPages);
}
#ifdef OJI
JRIEnv* NPN_GetJavaEnv(void)
{
JRIEnv * rv = NULL;
@@ -184,6 +185,7 @@ jref NPN_GetJavaPeer(NPP instance)
rv = CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance);
return rv;
}
#endif
NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value)
{

2
mozilla/modules/plugin/tools/sdk/samples/common/npp_gate.cpp
View File

@@ -257,10 +257,12 @@ int16 NPP_HandleEvent(NPP instance, void* event)
return rv;
}
#ifdef OJI
jref NPP_GetJavaClass (void)
{
return NULL;
}
#endif
/**************************************************/
/* */