diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp index 86a1436b7f0..f94d4c07f51 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp @@ -147,6 +147,12 @@ CWebShellContainer::IsIntrinsicallySized(PRBool& aResult) return NS_OK; } +NS_IMETHODIMP +CWebShellContainer::ShowAfterCreation() +{ + return NS_OK; +} + NS_IMETHODIMP CWebShellContainer::Show() { @@ -485,15 +491,7 @@ CWebShellContainer::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext, n NS_IMETHODIMP -CWebShellContainer::OnStartDocumentLoad(const char* aCommand, -#ifdef NECKO - nsIChannel* aChannel, - nsILoadGroup* aLoadGroup, -#else - nsIURI *aUrl, -#endif - nsIContentViewerContainer* aContainer, - nsIStreamListener **aDocListener) +CWebShellContainer::OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand) { return NS_OK; } @@ -528,7 +526,7 @@ CWebShellContainer::OnEndDocumentLoad(nsIDocumentLoader* loader, nsIChannel *aCh } NS_IMETHODIMP -CWebShellContainer::OnStartURLLoad(nsIDocumentLoader* loader, nsIChannel* aChannel, const char* aContentType, nsIContentViewer* aViewer) +CWebShellContainer::OnStartURLLoad(nsIDocumentLoader* loader, nsIChannel* aChannel, nsIContentViewer* aViewer) { return NS_OK; } diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.h b/mozilla/webshell/embed/ActiveX/WebShellContainer.h index 2ed40504846..99db15b0bf5 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.h +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.h @@ -55,6 +55,8 @@ public: NS_IMETHOD GetContentBounds(nsRect& aResult); NS_IMETHOD GetWindowBounds(nsRect& aResult); NS_IMETHOD IsIntrinsicallySized(PRBool& aResult); + NS_IMETHOD ShowAfterCreation(); + NS_IMETHOD Show(); NS_IMETHOD Hide(); @@ -94,11 +96,9 @@ public: NS_IMETHOD OnStopRequest(nsIChannel* aChannel, nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg); // nsIDocumentLoaderObserver - NS_IMETHOD OnStartDocumentLoad(const char* aCommand, nsIChannel* aChannel, - nsIContentViewerContainer* aContainer, - nsIStreamListener **aDocListener); + NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand); NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, nsIChannel* channel, PRInt32 aStatus, nsIDocumentLoaderObserver* aObserver); - NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, const char* aContentType, nsIContentViewer* aViewer); + NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, nsIContentViewer* aViewer); NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, PRUint32 aProgress, PRUint32 aProgressMax); NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, nsString& aMsg); NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, PRInt32 aStatus); @@ -110,9 +110,7 @@ public: NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); - NS_IMETHOD OnStartDocumentLoad(const char* aCommand, nsIURI *aUrl, - nsIContentViewerContainer* aContainer, - nsIStreamListener **aDocListener); + NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand); NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, nsIURI *aUrl, PRInt32 aStatus, nsIDocumentLoaderObserver* aObserver); NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aContentType, nsIContentViewer* aViewer); NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader, nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);