Removing redundant NPNVDOMDocument added earlier in bug 169513, r=av sr=rpotts a=roc+moz
git-svn-id: svn://10.0.0.236/trunk@132653 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
55bdd5ad07
commit
addf218c82
@ -38,7 +38,7 @@
|
||||
|
||||
|
||||
/*
|
||||
* npapi.h $Revision: 3.24 $
|
||||
* npapi.h $Revision: 3.25 $
|
||||
* Netscape client plug-in API spec
|
||||
*/
|
||||
|
||||
@ -355,8 +355,7 @@ typedef enum {
|
||||
/* 10 and over are available on Mozilla builds starting with 0.9.4 */
|
||||
NPNVserviceManager = 10,
|
||||
NPNVDOMElement = 11, /* available in Mozilla 1.2 */
|
||||
NPNVDOMDocument = 12,
|
||||
NPNVDOMWindow = 13
|
||||
NPNVDOMWindow = 12
|
||||
} NPNVariable;
|
||||
|
||||
/*
|
||||
|
||||
@ -1236,29 +1236,6 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
|
||||
return NPERR_GENERIC_ERROR;
|
||||
}
|
||||
|
||||
case NPNVDOMDocument: {
|
||||
ns4xPluginInstance *inst = (ns4xPluginInstance *) npp->ndata;
|
||||
NS_ENSURE_TRUE(inst, NPERR_GENERIC_ERROR);
|
||||
|
||||
nsCOMPtr<nsIPluginInstancePeer> pip;
|
||||
inst->GetPeer(getter_AddRefs(pip));
|
||||
nsCOMPtr<nsPIPluginInstancePeer> pp (do_QueryInterface(pip));
|
||||
if (pp) {
|
||||
nsCOMPtr<nsIPluginInstanceOwner> owner;
|
||||
pp->GetOwner(getter_AddRefs(owner));
|
||||
if (owner) {
|
||||
nsCOMPtr<nsIDocument> doc;
|
||||
owner->GetDocument(getter_AddRefs(doc));
|
||||
nsCOMPtr<nsIDOMDocument> domDoc (do_QueryInterface(doc));
|
||||
if (domDoc) {
|
||||
NS_ADDREF(*(nsIDOMDocument**)result = domDoc.get());
|
||||
return NPERR_NO_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
return NPERR_GENERIC_ERROR;
|
||||
}
|
||||
|
||||
case NPNVDOMWindow: {
|
||||
ns4xPluginInstance *inst = (ns4xPluginInstance *) npp->ndata;
|
||||
NS_ENSURE_TRUE(inst, NPERR_GENERIC_ERROR);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user