diff --git a/mozilla/intl/chardet/src/nsObserverBase.cpp b/mozilla/intl/chardet/src/nsObserverBase.cpp index 1e49df5e454..0199c8f2e1a 100644 --- a/mozilla/intl/chardet/src/nsObserverBase.cpp +++ b/mozilla/intl/chardet/src/nsObserverBase.cpp @@ -51,8 +51,7 @@ NS_IMETHODIMP nsObserverBase::NotifyWebShell( (nsISupports**)&docLoader))) goto done; - // temp change to (PRUint32) cast untill we change the GetContentViewerContainer interface - if(NS_FAILED(rv =docLoader->GetContentViewerContainer((PRUint32)aDocumentID, &cvc))) + if(NS_FAILED(rv =docLoader->GetContentViewerContainer(aDocumentID, &cvc))) goto done; /* sspitzer: this was necessary to get printing of mail to work (sort of) diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index c7f7263ad23..64cbba28fa3 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -314,10 +314,10 @@ nsDocLoaderImpl::GetLoadGroup(nsILoadGroup** aResult) } NS_IMETHODIMP -nsDocLoaderImpl::GetContentViewerContainer(PRUint32 aDocumentID, +nsDocLoaderImpl::GetContentViewerContainer(nsISupports* aDocumentID, nsIContentViewerContainer** aResult) { - nsISupports* base = (nsISupports*) aDocumentID; + nsISupports* base = aDocumentID; nsIDocument* doc; nsresult rv; diff --git a/mozilla/uriloader/base/nsIDocumentLoader.idl b/mozilla/uriloader/base/nsIDocumentLoader.idl index c206f56ff8a..673d33629a5 100644 --- a/mozilla/uriloader/base/nsIDocumentLoader.idl +++ b/mozilla/uriloader/base/nsIDocumentLoader.idl @@ -42,7 +42,7 @@ interface nsIDocumentLoader : nsISupports void removeObserver(in nsIDocumentLoaderObserver aObserver); attribute nsISupports container; - [noscript] void getContentViewerContainer(in unsigned long aDocumentID, out nsIContentViewerContainer aResult); + [noscript] void getContentViewerContainer(in nsISupports aDocumentID, out nsIContentViewerContainer aResult); nsILoadGroup getLoadGroup(); void destroy();