mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Changed places where containers were set to use nsISupports instead of nsIContentViewerContainer. r=dp

This commit is contained in:
tbogard%aol.net 1999-11-15 22:17:54 +00:00
Родитель 8369137469
Коммит 8c8bbce9a7
29 изменённых файлов: 25 добавлений и 47 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
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;
/**

2
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);

2
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);
/**

1
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"

3
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,

3
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();

4
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,

3
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,

2
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();

1
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"

1
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"

3
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;
/**

2
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);

2
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);
/**

1
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"

1
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"

10
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<nsIContentViewerContainer> 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<nsIContentViewerContainer> 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<nsIContentViewerContainer> container(do_QueryInterface(aContainer));
status = loader->LoadFromStream(aXULStream, container, aCommand);
status = loader->LoadFromStream(aXULStream, aContainer, aCommand);
}
while (0);

3
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,

3
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();

4
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,

2
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;

2
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;

3
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,

2
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();

1
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"

1
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"

3
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;
};

3
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

1
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"