diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index c4922d0f57a..0d521fa8e55 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -2576,14 +2576,6 @@ nsHTMLDocument::GetLayers(nsIDOMHTMLCollection** aLayers)
}
#endif
-NS_IMETHODIMP
-nsHTMLDocument::GetPlugins(nsIDOMHTMLCollection** aPlugins)
-{
- //XXX TBImplemented
- *aPlugins = nsnull;
- return NS_OK;
-}
-
NS_IMETHODIMP
nsHTMLDocument::GetSelection(nsString& aReturn)
{
diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h
index e4239c17211..1d2b9d5a9c4 100644
--- a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h
+++ b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h
@@ -59,8 +59,6 @@ public:
NS_IMETHOD GetEmbeds(nsIDOMHTMLCollection** aEmbeds)=0;
- NS_IMETHOD GetPlugins(nsIDOMHTMLCollection** aPlugins)=0;
-
NS_IMETHOD GetSelection(nsString& aReturn)=0;
NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn)=0;
@@ -94,7 +92,6 @@ public:
NS_IMETHOD SetFgColor(const nsString& aFgColor); \
NS_IMETHOD GetLastModified(nsString& aLastModified); \
NS_IMETHOD GetEmbeds(nsIDOMHTMLCollection** aEmbeds); \
- NS_IMETHOD GetPlugins(nsIDOMHTMLCollection** aPlugins); \
NS_IMETHOD GetSelection(nsString& aReturn); \
NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn); \
NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc); \
@@ -120,7 +117,6 @@ public:
NS_IMETHOD SetFgColor(const nsString& aFgColor) { return _to SetFgColor(aFgColor); } \
NS_IMETHOD GetLastModified(nsString& aLastModified) { return _to GetLastModified(aLastModified); } \
NS_IMETHOD GetEmbeds(nsIDOMHTMLCollection** aEmbeds) { return _to GetEmbeds(aEmbeds); } \
- NS_IMETHOD GetPlugins(nsIDOMHTMLCollection** aPlugins) { return _to GetPlugins(aPlugins); } \
NS_IMETHOD GetSelection(nsString& aReturn) { return _to GetSelection(aReturn); } \
NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn) { return _to NamedItem(cx, argv, argc, aReturn); } \
NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Open(cx, argv, argc); } \
diff --git a/mozilla/dom/public/idl/html/HTMLDocument.idl b/mozilla/dom/public/idl/html/HTMLDocument.idl
index 3da133d32a7..9647903e262 100644
--- a/mozilla/dom/public/idl/html/HTMLDocument.idl
+++ b/mozilla/dom/public/idl/html/HTMLDocument.idl
@@ -33,7 +33,6 @@
readonly attribute wstring lastModified;
readonly attribute HTMLCollection embeds;
- readonly attribute HTMLCollection plugins;
wstring getSelection();
jsval namedItem(/* ... */);
diff --git a/mozilla/dom/src/html/nsJSHTMLDocument.cpp b/mozilla/dom/src/html/nsJSHTMLDocument.cpp
index a9ec51be3cf..e1e2a0b27ea 100644
--- a/mozilla/dom/src/html/nsJSHTMLDocument.cpp
+++ b/mozilla/dom/src/html/nsJSHTMLDocument.cpp
@@ -73,8 +73,7 @@ enum HTMLDocument_slots {
NSHTMLDOCUMENT_BGCOLOR = -15,
NSHTMLDOCUMENT_FGCOLOR = -16,
NSHTMLDOCUMENT_LASTMODIFIED = -17,
- NSHTMLDOCUMENT_EMBEDS = -18,
- NSHTMLDOCUMENT_PLUGINS = -19
+ NSHTMLDOCUMENT_EMBEDS = -18
};
/***********************************************************************/
@@ -371,26 +370,6 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
}
break;
}
- case NSHTMLDOCUMENT_PLUGINS:
- {
- rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_PLUGINS, PR_FALSE);
- if (NS_SUCCEEDED(rv)) {
- nsIDOMHTMLCollection* prop;
- nsIDOMNSHTMLDocument* b;
- if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) {
- rv = b->GetPlugins(&prop);
- if(NS_SUCCEEDED(rv)) {
- // get the js object
- nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, obj, vp);
- }
- NS_RELEASE(b);
- }
- else {
- rv = NS_ERROR_DOM_WRONG_TYPE_ERR;
- }
- }
- break;
- }
default:
checkNamedItem = PR_TRUE;
}
@@ -1148,7 +1127,6 @@ static JSPropertySpec HTMLDocumentProperties[] =
{"fgColor", NSHTMLDOCUMENT_FGCOLOR, JSPROP_ENUMERATE},
{"lastModified", NSHTMLDOCUMENT_LASTMODIFIED, JSPROP_ENUMERATE | JSPROP_READONLY},
{"embeds", NSHTMLDOCUMENT_EMBEDS, JSPROP_ENUMERATE | JSPROP_READONLY},
- {"plugins", NSHTMLDOCUMENT_PLUGINS, JSPROP_ENUMERATE | JSPROP_READONLY},
{0}
};
diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
index c4922d0f57a..0d521fa8e55 100644
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@@ -2576,14 +2576,6 @@ nsHTMLDocument::GetLayers(nsIDOMHTMLCollection** aLayers)
}
#endif
-NS_IMETHODIMP
-nsHTMLDocument::GetPlugins(nsIDOMHTMLCollection** aPlugins)
-{
- //XXX TBImplemented
- *aPlugins = nsnull;
- return NS_OK;
-}
-
NS_IMETHODIMP
nsHTMLDocument::GetSelection(nsString& aReturn)
{