Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed nsIProgress::addListener and nsIWebBrowser::addListener to be addProgressListener and addWebBrowserListener respectively. This is to avoid confusing name conflicts. Implemented nsIWebBrowser::GetDocument() and nsIWebBrowser::GetDocShell().

Browse Source
This commit is contained in:
tbogard%aol.net 1999-10-26 02:37:14 +00:00
parent 8475fb1b78
commit d12a104ab3
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embedding/browser/webBrowser/nsIProgress.idl
View File

@ -69,7 +69,7 @@ interface nsIProgress : nsISupports
NS_INVALID_ARG - The listener passed in was either nsnull,
or was already registered with this progress interface.
*/
void addListener(in nsIProgressListener listener, out long cookie);
void addProgressListener(in nsIProgressListener listener, out long cookie);
/*
Removes a previously registered listener of Progress Events
@ -85,7 +85,7 @@ interface nsIProgress : nsISupports
NS_ERROR_INVALID_ARG - Neither the cookie nor the listener point
to a previously registered listener.
*/
void removeListener(in nsIProgressListener listener, in long cookie);
void removeProgressListener(in nsIProgressListener listener, in long cookie);
/*
Current connection Status of the browser. This will be one of the enumerated

4
embedding/browser/webBrowser/nsIWebBrowser.idl
View File

@ -65,7 +65,7 @@ interface nsIWebBrowser : nsISupports
NS_ERROR_INVALID_ARG - The listener passed in was either nsnull,
or was already registered with this listener interface.
*/
void addListener(in nsIInterfaceRequestor listener, out long cookie);
void addWebBrowserListener(in nsIInterfaceRequestor listener, out long cookie);
/*
Removes a previously registered webBrowserListener.
@ -81,7 +81,7 @@ interface nsIWebBrowser : nsISupports
NS_ERROR_INVALID_ARG - Neither the cookie nor the listener point
to a previously registered listener.
*/
void removeListener(in nsIInterfaceRequestor listener, in long cookie);
void removeWebBrowserListener(in nsIInterfaceRequestor listener, in long cookie);
/*
The current docShell that is loaded at the root. This will change as

28
embedding/browser/webBrowser/nsWebBrowser.cpp
View File

@ -63,7 +63,7 @@ NS_IMPL_ISUPPORTS6(nsWebBrowser, nsIWebBrowser, nsIWebBrowserNav, nsIProgress,
// nsWebBrowser::nsIWebBrowser
//*****************************************************************************
NS_IMETHODIMP nsWebBrowser::AddListener(nsIInterfaceRequestor* listener,
NS_IMETHODIMP nsWebBrowser::AddWebBrowserListener(nsIInterfaceRequestor* listener,
PRInt32* cookie)
{
if(!m_ListenerList)
@ -84,7 +84,7 @@ NS_IMETHODIMP nsWebBrowser::AddListener(nsIInterfaceRequestor* listener,
return NS_OK;
}
NS_IMETHODIMP nsWebBrowser::RemoveListener(nsIInterfaceRequestor* listener,
NS_IMETHODIMP nsWebBrowser::RemoveWebBrowserListener(nsIInterfaceRequestor* listener,
PRInt32 cookie)
{
NS_ENSURE_STATE(m_ListenerList);
@ -101,8 +101,12 @@ NS_IMETHODIMP nsWebBrowser::RemoveListener(nsIInterfaceRequestor* listener,
NS_IMETHODIMP nsWebBrowser::GetDocShell(nsIDocShell** docShell)
{
//XXX Implement
return NS_ERROR_FAILURE;
NS_ENSURE_ARG_POINTER(docShell);
*docShell = m_DocShell;
NS_IF_ADDREF(*docShell);
return NS_OK;
}
//*****************************************************************************
@ -205,19 +209,19 @@ NS_IMETHODIMP nsWebBrowser::SetDocument(nsIDOMDocument* document)
NS_IMETHODIMP nsWebBrowser::GetDocument(nsIDOMDocument** document)
{
//XXX First Check
/*
Retrieves or sets the current Document for the WebBrowser. When setting
this will simulate the normal load process.
*/
return NS_ERROR_FAILURE;
NS_ENSURE_ARG_POINTER(document);
NS_ENSURE_STATE(m_DocShell);
NS_ENSURE_SUCCESS(m_DocShell->GetDocument(document), NS_ERROR_FAILURE);
return NS_OK;
}
//*****************************************************************************
// nsWebBrowser::nsIProgress
//*****************************************************************************
NS_IMETHODIMP nsWebBrowser::AddListener(nsIProgressListener* listener,
NS_IMETHODIMP nsWebBrowser::AddProgressListener(nsIProgressListener* listener,
PRInt32* cookie)
{
//XXX First Check
@ -238,7 +242,7 @@ NS_IMETHODIMP nsWebBrowser::AddListener(nsIProgressListener* listener,
return NS_ERROR_FAILURE;
}
NS_IMETHODIMP nsWebBrowser::RemoveListener(nsIProgressListener* listener,
NS_IMETHODIMP nsWebBrowser::RemoveProgressListener(nsIProgressListener* listener,
PRInt32 cookie)
{
//XXX First Check

1
embedding/browser/webBrowser/nsWebBrowser.h
View File

@ -52,6 +52,7 @@ protected:
protected:
nsCOMPtr<nsISupportsArray> m_ListenerList;
nsCOMPtr<nsIDocShell> m_DocShell;
PRBool m_Created;
};