From 67a365111cc1dd10b1d792bb3228d4970885acd5 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Mon, 15 Nov 1999 22:17:54 +0000 Subject: [PATCH] Changed places where containers were set to use nsISupports instead of nsIContentViewerContainer. r=dp git-svn-id: svn://10.0.0.236/trunk@53553 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/public/nsIDocument.h | 3 +-- mozilla/content/base/src/nsDocument.cpp | 2 +- mozilla/content/base/src/nsDocument.h | 2 +- mozilla/content/base/src/nsDocumentViewer.cpp | 1 - mozilla/content/html/document/src/nsHTMLDocument.cpp | 3 +-- mozilla/content/html/document/src/nsHTMLDocument.h | 3 +-- mozilla/content/html/document/src/nsImageDocument.cpp | 4 ++-- mozilla/content/xml/document/src/nsXMLDocument.cpp | 3 +-- mozilla/content/xml/document/src/nsXMLDocument.h | 2 +- mozilla/content/xul/document/src/nsXULContentSink.cpp | 1 - mozilla/layout/base/nsDocumentViewer.cpp | 1 - mozilla/layout/base/public/nsIDocument.h | 3 +-- mozilla/layout/base/src/nsDocument.cpp | 2 +- mozilla/layout/base/src/nsDocument.h | 2 +- mozilla/layout/base/src/nsDocumentViewer.cpp | 1 - mozilla/layout/base/src/nsPluginViewer.cpp | 1 - mozilla/layout/build/nsLayoutDLF.cpp | 10 +++------- mozilla/layout/html/document/src/nsHTMLDocument.cpp | 3 +-- mozilla/layout/html/document/src/nsHTMLDocument.h | 3 +-- mozilla/layout/html/document/src/nsImageDocument.cpp | 4 ++-- mozilla/layout/html/tests/TestAttributes.cpp | 2 +- mozilla/layout/html/tests/TestInlineFrame.cpp | 2 +- mozilla/layout/xml/document/src/nsXMLDocument.cpp | 3 +-- mozilla/layout/xml/document/src/nsXMLDocument.h | 2 +- mozilla/modules/plugin/base/src/nsPluginViewer.cpp | 1 - mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp | 1 - mozilla/rdf/content/public/nsIStreamLoadableDocument.h | 3 +-- mozilla/rdf/content/src/nsIXULDocument.h | 3 +-- mozilla/rdf/content/src/nsXULContentSink.cpp | 1 - 29 files changed, 25 insertions(+), 47 deletions(-) diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 19ff1da65fb..b2140133ca8 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -45,7 +45,6 @@ class nsILoadGroup; class nsIViewManager; class nsString; class nsIScriptContextOwner; -class nsIContentViewerContainer; class nsIDOMEvent; class nsIDeviceContext; class nsIParser; @@ -96,7 +95,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) = 0; /** diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 2e54df99841..7e26212931d 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -845,7 +845,7 @@ nsresult nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { return Reset(aChannel, aLoadGroup); diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 9c1e3d4a392..09f21ed62ae 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -123,7 +123,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); /** diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index e7aa8ed4662..3fc6e2f19fe 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -24,7 +24,6 @@ #include "nsCRT.h" #include "nsString.h" #include "nsISupports.h" -#include "nsIContentViewerContainer.h" #include "nsIDocumentViewer.h" #include "nsIImageGroup.h" diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 6bc3d35ce11..ac6f63d9fe8 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -49,7 +49,6 @@ #include "nsIIOService.h" #include "nsIURL.h" #include "nsNeckoUtil.h" -#include "nsIContentViewerContainer.h" #include "nsIWebShell.h" #include "nsIWebShellServices.h" #include "nsIDocumentLoader.h" @@ -382,7 +381,7 @@ NS_IMETHODIMP nsHTMLDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { nsresult rv = nsDocument::StartDocumentLoad(aCommand, diff --git a/mozilla/content/html/document/src/nsHTMLDocument.h b/mozilla/content/html/document/src/nsHTMLDocument.h index aa94fab3e29..896861b7f91 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.h +++ b/mozilla/content/html/document/src/nsHTMLDocument.h @@ -34,7 +34,6 @@ #include "jsapi.h" class nsContentList; -class nsIContentViewerContainer; class nsIHTMLStyleSheet; class nsIHTMLCSSStyleSheet; class nsIParser; @@ -66,7 +65,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); NS_IMETHOD EndLoad(); diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 23567b13af4..633aa86e9a8 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -61,7 +61,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); nsresult CreateSyntheticDocument(); @@ -173,7 +173,7 @@ NS_IMETHODIMP nsImageDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { nsresult rv = nsDocument::StartDocumentLoad(aCommand, diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 58c71a3dacb..c633af515bb 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -29,7 +29,6 @@ #include "nsIXMLContentSink.h" #include "nsIPresShell.h" #include "nsIPresContext.h" -#include "nsIContentViewerContainer.h" #include "nsIWebShell.h" #include "nsIDocumentLoader.h" #include "nsIHTMLContent.h" @@ -194,7 +193,7 @@ NS_IMETHODIMP nsXMLDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { nsresult rv = nsDocument::StartDocumentLoad(aCommand, diff --git a/mozilla/content/xml/document/src/nsXMLDocument.h b/mozilla/content/xml/document/src/nsXMLDocument.h index f714c7931ac..28cf5448b7b 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.h +++ b/mozilla/content/xml/document/src/nsXMLDocument.h @@ -53,7 +53,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); NS_IMETHOD EndLoad(); diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp index 9a69cad52c2..071e9558a5c 100644 --- a/mozilla/content/xul/document/src/nsXULContentSink.cpp +++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp @@ -41,7 +41,6 @@ #include "nsICSSParser.h" #include "nsICSSStyleSheet.h" #include "nsIContentSink.h" -#include "nsIContentViewerContainer.h" #include "nsIDOMDocument.h" #include "nsIDOMEventListener.h" #include "nsIDOMHTMLFormElement.h" diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index e7aa8ed4662..3fc6e2f19fe 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -24,7 +24,6 @@ #include "nsCRT.h" #include "nsString.h" #include "nsISupports.h" -#include "nsIContentViewerContainer.h" #include "nsIDocumentViewer.h" #include "nsIImageGroup.h" diff --git a/mozilla/layout/base/public/nsIDocument.h b/mozilla/layout/base/public/nsIDocument.h index 19ff1da65fb..b2140133ca8 100644 --- a/mozilla/layout/base/public/nsIDocument.h +++ b/mozilla/layout/base/public/nsIDocument.h @@ -45,7 +45,6 @@ class nsILoadGroup; class nsIViewManager; class nsString; class nsIScriptContextOwner; -class nsIContentViewerContainer; class nsIDOMEvent; class nsIDeviceContext; class nsIParser; @@ -96,7 +95,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) = 0; /** diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index 2e54df99841..7e26212931d 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -845,7 +845,7 @@ nsresult nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { return Reset(aChannel, aLoadGroup); diff --git a/mozilla/layout/base/src/nsDocument.h b/mozilla/layout/base/src/nsDocument.h index 9c1e3d4a392..09f21ed62ae 100644 --- a/mozilla/layout/base/src/nsDocument.h +++ b/mozilla/layout/base/src/nsDocument.h @@ -123,7 +123,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); /** diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp index e7aa8ed4662..3fc6e2f19fe 100644 --- a/mozilla/layout/base/src/nsDocumentViewer.cpp +++ b/mozilla/layout/base/src/nsDocumentViewer.cpp @@ -24,7 +24,6 @@ #include "nsCRT.h" #include "nsString.h" #include "nsISupports.h" -#include "nsIContentViewerContainer.h" #include "nsIDocumentViewer.h" #include "nsIImageGroup.h" diff --git a/mozilla/layout/base/src/nsPluginViewer.cpp b/mozilla/layout/base/src/nsPluginViewer.cpp index 284b81d6f35..2238533c8e6 100644 --- a/mozilla/layout/base/src/nsPluginViewer.cpp +++ b/mozilla/layout/base/src/nsPluginViewer.cpp @@ -23,7 +23,6 @@ #include "nscore.h" #include "nsCRT.h" #include "nsIContentViewer.h" -#include "nsIContentViewerContainer.h" #include "nsIPluginHost.h" #include "nsIPluginInstance.h" #include "nsIStreamListener.h" diff --git a/mozilla/layout/build/nsLayoutDLF.cpp b/mozilla/layout/build/nsLayoutDLF.cpp index 36c9b838906..f2b1ed79d46 100644 --- a/mozilla/layout/build/nsLayoutDLF.cpp +++ b/mozilla/layout/build/nsLayoutDLF.cpp @@ -36,7 +36,6 @@ #include "nsIXULContentSink.h" #include "nsIStreamLoadableDocument.h" #include "nsIDocStreamLoaderFactory.h" -#include "nsIContentViewerContainer.h" // Factory code for creating variations on html documents @@ -361,8 +360,7 @@ nsLayoutDLF::CreateDocument(const char* aCommand, // Initialize the document to begin loading the data. An // nsIStreamListener connected to the parser is returned in // aDocListener. - nsCOMPtr container(do_QueryInterface(aContainer)); - rv = doc->StartDocumentLoad(aCommand, aChannel, aLoadGroup, container, aDocListener); + rv = doc->StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer, aDocListener); if (NS_FAILED(rv)) break; @@ -453,8 +451,7 @@ nsLayoutDLF::CreateRDFDocument(const char* aCommand, * An nsIStreamListener connected to the parser is returned in * aDocListener. */ - nsCOMPtr container(do_QueryInterface(aContainer)); - rv = doc->StartDocumentLoad(aCommand, aChannel, aLoadGroup, container, aDocListener); + rv = doc->StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer, aDocListener); if (NS_SUCCEEDED(rv)) { /* * Bind the document to the Content Viewer... @@ -493,8 +490,7 @@ nsLayoutDLF::CreateXULDocumentFromStream(nsIInputStream& aXULStream, if ( NS_FAILED(status) ) break; - nsCOMPtr container(do_QueryInterface(aContainer)); - status = loader->LoadFromStream(aXULStream, container, aCommand); + status = loader->LoadFromStream(aXULStream, aContainer, aCommand); } while (0); diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 6bc3d35ce11..ac6f63d9fe8 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -49,7 +49,6 @@ #include "nsIIOService.h" #include "nsIURL.h" #include "nsNeckoUtil.h" -#include "nsIContentViewerContainer.h" #include "nsIWebShell.h" #include "nsIWebShellServices.h" #include "nsIDocumentLoader.h" @@ -382,7 +381,7 @@ NS_IMETHODIMP nsHTMLDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { nsresult rv = nsDocument::StartDocumentLoad(aCommand, diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.h b/mozilla/layout/html/document/src/nsHTMLDocument.h index aa94fab3e29..896861b7f91 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.h +++ b/mozilla/layout/html/document/src/nsHTMLDocument.h @@ -34,7 +34,6 @@ #include "jsapi.h" class nsContentList; -class nsIContentViewerContainer; class nsIHTMLStyleSheet; class nsIHTMLCSSStyleSheet; class nsIParser; @@ -66,7 +65,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); NS_IMETHOD EndLoad(); diff --git a/mozilla/layout/html/document/src/nsImageDocument.cpp b/mozilla/layout/html/document/src/nsImageDocument.cpp index 23567b13af4..633aa86e9a8 100644 --- a/mozilla/layout/html/document/src/nsImageDocument.cpp +++ b/mozilla/layout/html/document/src/nsImageDocument.cpp @@ -61,7 +61,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); nsresult CreateSyntheticDocument(); @@ -173,7 +173,7 @@ NS_IMETHODIMP nsImageDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { nsresult rv = nsDocument::StartDocumentLoad(aCommand, diff --git a/mozilla/layout/html/tests/TestAttributes.cpp b/mozilla/layout/html/tests/TestAttributes.cpp index 122f63462c3..01552e267b5 100644 --- a/mozilla/layout/html/tests/TestAttributes.cpp +++ b/mozilla/layout/html/tests/TestAttributes.cpp @@ -178,7 +178,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { return NS_OK; diff --git a/mozilla/layout/html/tests/TestInlineFrame.cpp b/mozilla/layout/html/tests/TestInlineFrame.cpp index 0b514951872..7d3783d1d91 100644 --- a/mozilla/layout/html/tests/TestInlineFrame.cpp +++ b/mozilla/layout/html/tests/TestInlineFrame.cpp @@ -46,7 +46,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { return NS_OK; diff --git a/mozilla/layout/xml/document/src/nsXMLDocument.cpp b/mozilla/layout/xml/document/src/nsXMLDocument.cpp index 58c71a3dacb..c633af515bb 100644 --- a/mozilla/layout/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/layout/xml/document/src/nsXMLDocument.cpp @@ -29,7 +29,6 @@ #include "nsIXMLContentSink.h" #include "nsIPresShell.h" #include "nsIPresContext.h" -#include "nsIContentViewerContainer.h" #include "nsIWebShell.h" #include "nsIDocumentLoader.h" #include "nsIHTMLContent.h" @@ -194,7 +193,7 @@ NS_IMETHODIMP nsXMLDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener) { nsresult rv = nsDocument::StartDocumentLoad(aCommand, diff --git a/mozilla/layout/xml/document/src/nsXMLDocument.h b/mozilla/layout/xml/document/src/nsXMLDocument.h index f714c7931ac..28cf5448b7b 100644 --- a/mozilla/layout/xml/document/src/nsXMLDocument.h +++ b/mozilla/layout/xml/document/src/nsXMLDocument.h @@ -53,7 +53,7 @@ public: NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, nsIStreamListener **aDocListener); NS_IMETHOD EndLoad(); diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index 284b81d6f35..2238533c8e6 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -23,7 +23,6 @@ #include "nscore.h" #include "nsCRT.h" #include "nsIContentViewer.h" -#include "nsIContentViewerContainer.h" #include "nsIPluginHost.h" #include "nsIPluginInstance.h" #include "nsIStreamListener.h" diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp index 284b81d6f35..2238533c8e6 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -23,7 +23,6 @@ #include "nscore.h" #include "nsCRT.h" #include "nsIContentViewer.h" -#include "nsIContentViewerContainer.h" #include "nsIPluginHost.h" #include "nsIPluginInstance.h" #include "nsIStreamListener.h" diff --git a/mozilla/rdf/content/public/nsIStreamLoadableDocument.h b/mozilla/rdf/content/public/nsIStreamLoadableDocument.h index f7f4dc494c9..0dc6257c55c 100644 --- a/mozilla/rdf/content/public/nsIStreamLoadableDocument.h +++ b/mozilla/rdf/content/public/nsIStreamLoadableDocument.h @@ -29,7 +29,6 @@ #endif class nsIInputStream; -class nsIContentViewerContainer; #define NS_ISTREAMLOADABLEDOCUMENT_IID \ { 0x7dae0360, 0xf907, 0x11d2,{0x81, 0xee, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf}} @@ -40,7 +39,7 @@ class nsIStreamLoadableDocument : public nsISupports static const nsIID& GetIID() { static nsIID iid = NS_ISTREAMLOADABLEDOCUMENT_IID; return iid; } NS_IMETHOD LoadFromStream( nsIInputStream& xulStream, - nsIContentViewerContainer* aContainer, + nsISupports* aContainer, const char* aCommand ) = 0; }; diff --git a/mozilla/rdf/content/src/nsIXULDocument.h b/mozilla/rdf/content/src/nsIXULDocument.h index 5f5dafb8844..212e986df9a 100644 --- a/mozilla/rdf/content/src/nsIXULDocument.h +++ b/mozilla/rdf/content/src/nsIXULDocument.h @@ -39,7 +39,6 @@ class nsIContent; // XXX nsIXMLDocument.h is bad and doesn't declare this class. class nsForwardReference; class nsIAtom; -class nsIContentViewerContainer; class nsIDOMElement; class nsIDOMHTMLFormElement; class nsIPrincipal; @@ -110,7 +109,7 @@ public: NS_IMETHOD CreateFromPrototype(const char* aCommand, nsIXULPrototypeDocument* aPrototype, nsIPrincipal* aPrincipal, - nsIContentViewerContainer* aContainer) = 0; + nsISupports* aContainer) = 0; }; // factory functions diff --git a/mozilla/rdf/content/src/nsXULContentSink.cpp b/mozilla/rdf/content/src/nsXULContentSink.cpp index 9a69cad52c2..071e9558a5c 100644 --- a/mozilla/rdf/content/src/nsXULContentSink.cpp +++ b/mozilla/rdf/content/src/nsXULContentSink.cpp @@ -41,7 +41,6 @@ #include "nsICSSParser.h" #include "nsICSSStyleSheet.h" #include "nsIContentSink.h" -#include "nsIContentViewerContainer.h" #include "nsIDOMDocument.h" #include "nsIDOMEventListener.h" #include "nsIDOMHTMLFormElement.h"