From addf218c822703a59444773f47ee004de683cfc6 Mon Sep 17 00:00:00 2001 From: "peterlubczynski%netscape.com" Date: Tue, 29 Oct 2002 22:54:10 +0000 Subject: [PATCH] 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 --- mozilla/modules/plugin/base/public/npapi.h | 5 ++-- .../modules/plugin/base/src/ns4xPlugin.cpp | 23 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h index 4c97aa4ae5b..ef2f1f60ad7 100644 --- a/mozilla/modules/plugin/base/public/npapi.h +++ b/mozilla/modules/plugin/base/public/npapi.h @@ -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; /* diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index 3a2dc4d904d..fb2bfebc97a 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -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 pip; - inst->GetPeer(getter_AddRefs(pip)); - nsCOMPtr pp (do_QueryInterface(pip)); - if (pp) { - nsCOMPtr owner; - pp->GetOwner(getter_AddRefs(owner)); - if (owner) { - nsCOMPtr doc; - owner->GetDocument(getter_AddRefs(doc)); - nsCOMPtr 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);