Resolving interface name conflict in plugin sample code, not part of the build
git-svn-id: svn://10.0.0.236/trunk@128994 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -165,14 +165,14 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
|
||||
|
||||
if (aVariable == NPPVpluginScriptableInstance) {
|
||||
// addref happens in getter, so we don't addref here
|
||||
nsIScriptablePlugin * scriptablePeer = getScriptablePeer();
|
||||
nsIScriptablePluginSample * scriptablePeer = getScriptablePeer();
|
||||
if (scriptablePeer) {
|
||||
*(nsISupports **)aValue = scriptablePeer;
|
||||
} else
|
||||
rv = NPERR_OUT_OF_MEMORY_ERROR;
|
||||
}
|
||||
else if (aVariable == NPPVpluginScriptableIID) {
|
||||
static nsIID scriptableIID = NS_ISCRIPTABLEPLUGIN_IID;
|
||||
static nsIID scriptableIID = NS_ISCRIPTABLEPLUGINSAMPLE_IID;
|
||||
nsIID* ptr = (nsIID *)NPN_MemAlloc(sizeof(nsIID));
|
||||
if (ptr) {
|
||||
*ptr = scriptableIID;
|
||||
|
||||
Reference in New Issue
Block a user