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

we no longer consider failures from GetAttributes() or even expect the

Browse Source 
plugin host to implement it.


git-svn-id: svn://10.0.0.236/trunk@11183 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
michaelp%netscape.com
1998-09-27 22:16:00 +00:00
parent ff63394ad3
commit 2a0fe8f7ae
2 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,9 +91,9 @@ NS_IMETHODIMP ns4xPluginInstance :: QueryInterface(const nsIID& iid, void** inst
NS_IMETHODIMP ns4xPluginInstance :: Initialize(nsIPluginInstancePeer* peer)
{
PRUint16 count;
const char* const* names;
const char* const* values;
PRUint16 count = 0;
const char* const* names = nsnull;
const char* const* values = nsnull;
NS_ASSERTION(peer != NULL, "null peer");
@@ -102,40 +102,38 @@ NS_IMETHODIMP ns4xPluginInstance :: Initialize(nsIPluginInstancePeer* peer)
NS_ADDREF(fPeer);
nsresult error;
nsIPluginTagInfo *taginfo;
nsIPluginTagInfo *taginfo = nsnull;
error = fPeer->QueryInterface(kIPluginTagInfoIID, (void **)&taginfo);
if (NS_OK == error)
{
if ((error = taginfo->GetAttributes(count, names, values)) != NS_OK)
return error;
if (fCallbacks->newp == NULL)
return NS_ERROR_FAILURE; // XXX right error?
// XXX Note that the NPPluginType_* enums were crafted to be
// backward compatible...
nsPluginMode mode;
nsMIMEType mimetype;
fPeer->GetMode(&mode);
fPeer->GetMIMEType(&mimetype);
error = (nsresult)
CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
(PRUint16)mode,
count,
(char**)names,
(char**)values,
NULL); // saved data
NS_RELEASE(taginfo);
taginfo->GetAttributes(count, names, values);
NS_IF_RELEASE(taginfo);
}
if (fCallbacks->newp == NULL)
return NS_ERROR_FAILURE; // XXX right error?
// XXX Note that the NPPluginType_* enums were crafted to be
// backward compatible...
nsPluginMode mode;
nsMIMEType mimetype;
fPeer->GetMode(&mode);
fPeer->GetMIMEType(&mimetype);
error = (nsresult)
CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
(PRUint16)mode,
count,
(char**)names,
(char**)values,
NULL); // saved data
return error;
}