From a0cb9d0fde6fef1d6cb1ef89e41cbc5073a94bf3 Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Thu, 6 May 1999 01:58:48 +0000 Subject: [PATCH] - adding stubs for the methods in nsIWebShellServices implemented by the nsWebShell object. - adding a stub implementation of the GetContentViewerContainer() method to nsDocLoaderImpl. git-svn-id: svn://10.0.0.236/trunk@30497 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 37 ++++++++++++++++++++++++++ mozilla/uriloader/base/nsDocLoader.cpp | 10 +++++++ mozilla/webshell/src/nsDocLoader.cpp | 10 +++++++ mozilla/webshell/src/nsWebShell.cpp | 37 ++++++++++++++++++++++++++ 4 files changed, 94 insertions(+) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 711571baf01..092d58f84c2 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -56,6 +56,7 @@ #include "nsCOMPtr.h" #include "nsIPresShell.h" #include "nsIStreamObserver.h" +#include "nsIWebShellServices.h" #ifdef XP_PC #include @@ -116,6 +117,7 @@ void nsWebShell_SetUnixEventQueue(PLEventQueue* aEventQueue) class nsWebShell : public nsIWebShell, public nsIWebShellContainer, + public nsIWebShellServices, public nsILinkHandler, public nsIScriptContextOwner, public nsIDocumentLoaderObserver, @@ -242,6 +244,11 @@ public: NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken); + // nsIWebShellServices + NS_IMETHOD LoadDocument(const char* aURL); + NS_IMETHOD StopDocumentLoad(void); + NS_IMETHOD SetRendering(PRBool aRender); + // nsILinkHandler NS_IMETHOD OnLinkClick(nsIContent* aContent, nsLinkVerb aVerb, @@ -424,6 +431,7 @@ static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID); static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); +static NS_DEFINE_IID(kIWebShellServicesIID, NS_IWEB_SHELL_SERVICES_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID); static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID); @@ -616,6 +624,11 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } + if (aIID.Equals(kIWebShellServicesIID)) { + *aInstancePtr = (void*)(nsIWebShellServices*)this; + NS_ADDREF_THIS(); + return NS_OK; + } if (aIID.Equals(kIWebShellIID)) { *aInstancePtr = (void*)(nsIWebShell*)this; NS_ADDREF_THIS(); @@ -1919,6 +1932,30 @@ nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken) return NS_OK; } + + +//---------------------------------------------------------------------- +// Web Shell Services API + +NS_IMETHODIMP +nsWebShell::LoadDocument(const char* aURL) +{ + return NS_OK; +} + +NS_IMETHODIMP +nsWebShell::StopDocumentLoad(void) +{ + return NS_OK; +} + +NS_IMETHODIMP +nsWebShell::SetRendering(PRBool aRender) +{ + return NS_OK; +} + + //---------------------------------------------------------------------- // WebShell link handling diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 3b58fc05d96..8890b55effd 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -828,6 +828,8 @@ public: NS_IMETHOD SetContainer(nsIContentViewerContainer* aContainer); NS_IMETHOD GetContainer(nsIContentViewerContainer** aResult); + NS_IMETHOD GetContentViewerContainer(PRUint32 aDocumentID, + nsIContentViewerContainer** aResult); // nsIURLGroup interface... NS_IMETHOD CreateURL(nsIURL** aInstancePtrResult, @@ -1248,6 +1250,14 @@ nsDocLoaderImpl::GetContainer(nsIContentViewerContainer** aResult) return rv; } +NS_IMETHODIMP +nsDocLoaderImpl::GetContentViewerContainer(PRUint32 aDocumentID, + nsIContentViewerContainer** aResult) +{ + *aResult = nsnull; + return NS_OK; +} + NS_IMETHODIMP nsDocLoaderImpl::CreateURL(nsIURL** aInstancePtrResult, nsIURL* aBaseURL, diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 3b58fc05d96..8890b55effd 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -828,6 +828,8 @@ public: NS_IMETHOD SetContainer(nsIContentViewerContainer* aContainer); NS_IMETHOD GetContainer(nsIContentViewerContainer** aResult); + NS_IMETHOD GetContentViewerContainer(PRUint32 aDocumentID, + nsIContentViewerContainer** aResult); // nsIURLGroup interface... NS_IMETHOD CreateURL(nsIURL** aInstancePtrResult, @@ -1248,6 +1250,14 @@ nsDocLoaderImpl::GetContainer(nsIContentViewerContainer** aResult) return rv; } +NS_IMETHODIMP +nsDocLoaderImpl::GetContentViewerContainer(PRUint32 aDocumentID, + nsIContentViewerContainer** aResult) +{ + *aResult = nsnull; + return NS_OK; +} + NS_IMETHODIMP nsDocLoaderImpl::CreateURL(nsIURL** aInstancePtrResult, nsIURL* aBaseURL, diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 711571baf01..092d58f84c2 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -56,6 +56,7 @@ #include "nsCOMPtr.h" #include "nsIPresShell.h" #include "nsIStreamObserver.h" +#include "nsIWebShellServices.h" #ifdef XP_PC #include @@ -116,6 +117,7 @@ void nsWebShell_SetUnixEventQueue(PLEventQueue* aEventQueue) class nsWebShell : public nsIWebShell, public nsIWebShellContainer, + public nsIWebShellServices, public nsILinkHandler, public nsIScriptContextOwner, public nsIDocumentLoaderObserver, @@ -242,6 +244,11 @@ public: NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken); + // nsIWebShellServices + NS_IMETHOD LoadDocument(const char* aURL); + NS_IMETHOD StopDocumentLoad(void); + NS_IMETHOD SetRendering(PRBool aRender); + // nsILinkHandler NS_IMETHOD OnLinkClick(nsIContent* aContent, nsLinkVerb aVerb, @@ -424,6 +431,7 @@ static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID); static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); +static NS_DEFINE_IID(kIWebShellServicesIID, NS_IWEB_SHELL_SERVICES_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID); static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID); @@ -616,6 +624,11 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } + if (aIID.Equals(kIWebShellServicesIID)) { + *aInstancePtr = (void*)(nsIWebShellServices*)this; + NS_ADDREF_THIS(); + return NS_OK; + } if (aIID.Equals(kIWebShellIID)) { *aInstancePtr = (void*)(nsIWebShell*)this; NS_ADDREF_THIS(); @@ -1919,6 +1932,30 @@ nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken) return NS_OK; } + + +//---------------------------------------------------------------------- +// Web Shell Services API + +NS_IMETHODIMP +nsWebShell::LoadDocument(const char* aURL) +{ + return NS_OK; +} + +NS_IMETHODIMP +nsWebShell::StopDocumentLoad(void) +{ + return NS_OK; +} + +NS_IMETHODIMP +nsWebShell::SetRendering(PRBool aRender) +{ + return NS_OK; +} + + //---------------------------------------------------------------------- // WebShell link handling