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

Fixing bug 250666. Implementing the NPAPI extensions for npruntime plugin scriptability. r+sr=brendan@mozilla.org, a=asa@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@159061 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com
2004-07-12 15:53:22 +00:00
parent 17b20a4c15
commit 58ccff4abd
17 changed files with 2974 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
View File

@@ -48,6 +48,8 @@
#include "nsPluginSafety.h"
#include "nsPluginLogging.h"
#include "nsJSNPRuntime.h"
#ifdef XP_OS2
#include "nsILegacyPluginWrapperOS2.h"
#endif
@@ -760,7 +762,8 @@ nsInstanceStream::~nsInstanceStream()
///////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS2(ns4xPluginInstance, nsIPluginInstance, nsIScriptablePlugin)
NS_IMPL_ISUPPORTS3(ns4xPluginInstance, nsIPluginInstance, nsIScriptablePlugin,
nsINPRuntimePlugin)
///////////////////////////////////////////////////////////////////////////////
@@ -915,6 +918,8 @@ NS_IMETHODIMP ns4xPluginInstance::Stop(void)
mStarted = PR_FALSE;
nsJSNPRuntime::OnPluginDestroy(&fNPP);
if(error != NPERR_NO_ERROR)
return NS_ERROR_FAILURE;
else
@@ -1512,6 +1517,9 @@ NS_IMETHODIMP ns4xPluginInstance::GetScriptablePeer(void * *aScriptablePeer)
return GetValueInternal(NPPVpluginScriptableInstance, aScriptablePeer);
}
PR_BEGIN_EXTERN_C
void _releaseobject(NPObject *obj);
PR_END_EXTERN_C
////////////////////////////////////////////////////////////////////////
/* readonly attribute nsIIDPtr scriptableInterface; */
@@ -1523,3 +1531,20 @@ NS_IMETHODIMP ns4xPluginInstance::GetScriptableInterface(nsIID * *aScriptableInt
*aScriptableInterface = nsnull;
return GetValueInternal(NPPVpluginScriptableIID, (void*)aScriptableInterface);
}
JSObject *
ns4xPluginInstance::GetJSObject(JSContext *cx)
{
JSObject *obj = nsnull;
NPObject *npobj = nsnull;
nsresult rv = GetValueInternal(NPPVpluginScriptableNPObject, &npobj);
if (NS_SUCCEEDED(rv) && npobj) {
obj = nsNPObjWrapper::GetNewOrUsed(&fNPP, cx, npobj);
_releaseobject(npobj);
}
return obj;
}