wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug 433880. Stop the flash player from crashing when entering full-screen mode. Patch by mats.palmgren@bredband.net, r+sr=jst@mozilla.org

Browse Source
This commit is contained in:
Johnny Stenback 2008-06-18 16:55:38 -07:00
parent ad2cd52e5c
commit 7311e73894
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/plugin/base/src/ns4xPlugin.cpp
View File

@ -181,18 +181,12 @@ PR_BEGIN_EXTERN_C
static void* NP_CALLBACK
_memalloc (uint32 size);
#ifdef OJI
static JRIEnv* NP_CALLBACK
static void* /* OJI type: JRIEnv* */ NP_CALLBACK
_getJavaEnv(void);
#if 1
static jref NP_CALLBACK
static void* /* OJI type: jref */ NP_CALLBACK
_getJavaPeer(NPP npp);
#endif
#endif /* OJI */
PR_END_EXTERN_C
#if defined(XP_MACOSX) && defined(__POWERPC__)
@ -312,13 +306,11 @@ ns4xPlugin::CheckClassInitialized(void)
CALLBACKS.reloadplugins =
NewNPN_ReloadPluginsProc(FP2TV(_reloadplugins));
#ifdef OJI
CALLBACKS.getJavaEnv =
NewNPN_GetJavaEnvProc(FP2TV(_getJavaEnv));
CALLBACKS.getJavaPeer =
NewNPN_GetJavaPeerProc(FP2TV(_getJavaPeer));
#endif
CALLBACKS.geturlnotify =
NewNPN_GetURLNotifyProc(FP2TV(_geturlnotify));
@ -2520,14 +2512,12 @@ _requestread(NPStream *pstream, NPByteRange *rangeList)
}
////////////////////////////////////////////////////////////////////////
#ifdef OJI
JRIEnv* NP_CALLBACK
void* /* OJI type: JRIEnv* */ NP_CALLBACK
_getJavaEnv(void)
{
NPN_PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("NPN_GetJavaEnv\n"));
return NULL;
}
#endif
////////////////////////////////////////////////////////////////////////
const char * NP_CALLBACK
@ -2563,17 +2553,14 @@ _memalloc (uint32 size)
return nsMemory::Alloc(size);
}
#ifdef OJI
////////////////////////////////////////////////////////////////////////
jref NP_CALLBACK
void* /* OJI type: jref */ NP_CALLBACK
_getJavaPeer(NPP npp)
{
NPN_PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("NPN_GetJavaPeer: npp=%p\n", (void*)npp));
return NULL;
}
#endif /* OJI */
void NP_CALLBACK
_pushpopupsenabledstate(NPP npp, NPBool enabled)
{