зеркало из https://github.com/mozilla/gecko-dev.git
removing nsIWebBrowserChrome::FindNamedBrowserItem per 5 Feb 01 API review. functionality has been moved to nsDocShellTreeOwner. r=scc,valeski
This commit is contained in:
Родитель
06bc9f172f
Коммит
cdda7836f7
|
@ -664,13 +664,6 @@ CWebBrowserContainer::CreateBrowserWindow(PRUint32 chromeFlags, PRInt32 aX, PRI
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
CWebBrowserContainer::FindNamedBrowserItem(const PRUnichar *aName, nsIDocShellTreeItem **_retval)
|
|
||||||
{
|
|
||||||
return NS_ERROR_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
CWebBrowserContainer::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
CWebBrowserContainer::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -432,10 +432,16 @@ NS_IMETHODIMP GtkMozEmbedChrome::SetChromeFlags(PRUint32 aChromeFlags)
|
||||||
NS_IMETHODIMP GtkMozEmbedChrome::CreateBrowserWindow(PRUint32 chromeMask,
|
NS_IMETHODIMP GtkMozEmbedChrome::CreateBrowserWindow(PRUint32 chromeMask,
|
||||||
PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, nsIWebBrowser **_retval)
|
PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, nsIWebBrowser **_retval)
|
||||||
{
|
{
|
||||||
PR_LOG(mozEmbedLm, PR_LOG_DEBUG, ("GtkMozEmbedChrome::GetNewBrowser\n"));
|
PR_LOG(mozEmbedLm, PR_LOG_DEBUG, ("GtkMozEmbedChrome::CreateBrowserWindow\n"));
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_NOT_IMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* Just commenting out for now because it looks like somebody went to
|
||||||
|
a lot of work here. This method has been removed from nsIWebBrowserChrome
|
||||||
|
per the 5 Feb 01 API review, to be handled one level further down
|
||||||
|
in nsDocShellTreeOwner.
|
||||||
|
*/
|
||||||
NS_IMETHODIMP GtkMozEmbedChrome::FindNamedBrowserItem(const PRUnichar *aName,
|
NS_IMETHODIMP GtkMozEmbedChrome::FindNamedBrowserItem(const PRUnichar *aName,
|
||||||
nsIDocShellTreeItem **_retval)
|
nsIDocShellTreeItem **_retval)
|
||||||
{
|
{
|
||||||
|
@ -462,6 +468,7 @@ NS_IMETHODIMP GtkMozEmbedChrome::FindNamedBrowserItem(const PRUnichar *aName,
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
NS_IMETHODIMP GtkMozEmbedChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
NS_IMETHODIMP GtkMozEmbedChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -391,10 +391,11 @@ NS_IMETHODIMP PhMozEmbedChrome::SetChromeFlags(PRUint32 aChromeFlags)
|
||||||
NS_IMETHODIMP PhMozEmbedChrome::CreateBrowserWindow(PRUint32 chromeMask,
|
NS_IMETHODIMP PhMozEmbedChrome::CreateBrowserWindow(PRUint32 chromeMask,
|
||||||
PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, nsIWebBrowser **_retval)
|
PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, nsIWebBrowser **_retval)
|
||||||
{
|
{
|
||||||
PR_LOG(mozEmbedLm, PR_LOG_DEBUG, ("PhMozEmbedChrome::GetNewBrowser\n"));
|
PR_LOG(mozEmbedLm, PR_LOG_DEBUG, ("PhMozEmbedChrome::CreateBrowserWindow\n"));
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_NOT_IMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
NS_IMETHODIMP PhMozEmbedChrome::FindNamedBrowserItem(const PRUnichar *aName,
|
NS_IMETHODIMP PhMozEmbedChrome::FindNamedBrowserItem(const PRUnichar *aName,
|
||||||
nsIDocShellTreeItem **_retval)
|
nsIDocShellTreeItem **_retval)
|
||||||
{
|
{
|
||||||
|
@ -421,6 +422,7 @@ NS_IMETHODIMP PhMozEmbedChrome::FindNamedBrowserItem(const PRUnichar *aName,
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
NS_IMETHODIMP PhMozEmbedChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
NS_IMETHODIMP PhMozEmbedChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -226,6 +226,12 @@ NS_IMETHODIMP CWebBrowserChrome::IsWindowModal(PRBool *_retval)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* Just commenting out for now because it looks like somebody went to
|
||||||
|
a lot of work here. This method has been removed from nsIWebBrowserChrome
|
||||||
|
per the 5 Feb 01 API review, to be handled one level further down
|
||||||
|
in nsDocShellTreeOwner.
|
||||||
|
*/
|
||||||
NS_IMETHODIMP CWebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
NS_IMETHODIMP CWebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
||||||
nsIDocShellTreeItem ** aBrowserItem)
|
nsIDocShellTreeItem ** aBrowserItem)
|
||||||
{
|
{
|
||||||
|
@ -254,6 +260,7 @@ NS_IMETHODIMP CWebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
||||||
|
|
||||||
return NS_OK; // Return OK even if we didn't find it???
|
return NS_OK; // Return OK even if we didn't find it???
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
NS_IMETHODIMP CWebBrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
NS_IMETHODIMP CWebBrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -103,16 +103,6 @@ interface nsIWebBrowserChrome : nsISupports
|
||||||
nsIWebBrowser createBrowserWindow(in unsigned long chromeFlags,
|
nsIWebBrowser createBrowserWindow(in unsigned long chromeFlags,
|
||||||
in long aX, in long aY, in long aCX, in long aCY);
|
in long aX, in long aY, in long aCX, in long aCY);
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
Return the child DocShellTreeItem with the specified name. To implement this
|
|
||||||
an embedder should call nsIDocShellTreeItem::findItemWithName on all the open
|
|
||||||
webBrowser objects. If one succeeds this should be returned. If they all fail
|
|
||||||
simply return null.
|
|
||||||
@param aName - This is the name of the item that is trying to be found.
|
|
||||||
*/
|
|
||||||
nsIDocShellTreeItem findNamedBrowserItem(in wstring aName);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Tells the chrome to size itself such that the browser will be the
|
Tells the chrome to size itself such that the browser will be the
|
||||||
specified size.
|
specified size.
|
||||||
|
|
|
@ -157,22 +157,6 @@ NS_IMETHODIMP WebBrowserChrome::CreateBrowserWindow(PRUint32 chromeMask,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP WebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
|
||||||
nsIDocShellTreeItem ** aBrowserItem)
|
|
||||||
{
|
|
||||||
NS_ENSURE_ARG(aName);
|
|
||||||
NS_ENSURE_ARG_POINTER(aBrowserItem);
|
|
||||||
*aBrowserItem = nsnull;
|
|
||||||
|
|
||||||
if (!mWebBrowser)
|
|
||||||
return NS_ERROR_FAILURE;
|
|
||||||
|
|
||||||
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mWebBrowser));
|
|
||||||
NS_ENSURE_TRUE(docShellAsItem, NS_ERROR_FAILURE);
|
|
||||||
|
|
||||||
return docShellAsItem->FindItemWithName(aName, NS_STATIC_CAST(nsIWebBrowserChrome*, this), aBrowserItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP WebBrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
NS_IMETHODIMP WebBrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_ERROR_NOT_IMPLEMENTED;
|
||||||
|
@ -187,7 +171,7 @@ NS_IMETHODIMP WebBrowserChrome::ShowAsModal(void)
|
||||||
NS_IMETHODIMP WebBrowserChrome::IsWindowModal(PRBool *_retval)
|
NS_IMETHODIMP WebBrowserChrome::IsWindowModal(PRBool *_retval)
|
||||||
{
|
{
|
||||||
*_retval = PR_FALSE;
|
*_retval = PR_FALSE;
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP WebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
|
NS_IMETHODIMP WebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
|
||||||
|
|
|
@ -228,6 +228,11 @@ NS_IMETHODIMP CBrowserImpl::CreateBrowserWindow(PRUint32 chromeMask, PRInt32 aX,
|
||||||
//
|
//
|
||||||
// So, we get called to see if a target by that name already exists
|
// So, we get called to see if a target by that name already exists
|
||||||
//
|
//
|
||||||
|
#if 0
|
||||||
|
/* I didn't really want to mess with your code, but this method has
|
||||||
|
been removed from nsIWebBrowserChrome per the API review meeting
|
||||||
|
on 5 Feb 01.
|
||||||
|
*/
|
||||||
NS_IMETHODIMP CBrowserImpl::FindNamedBrowserItem(const PRUnichar *aName,
|
NS_IMETHODIMP CBrowserImpl::FindNamedBrowserItem(const PRUnichar *aName,
|
||||||
nsIDocShellTreeItem ** aBrowserItem)
|
nsIDocShellTreeItem ** aBrowserItem)
|
||||||
{
|
{
|
||||||
|
@ -236,6 +241,7 @@ NS_IMETHODIMP CBrowserImpl::FindNamedBrowserItem(const PRUnichar *aName,
|
||||||
|
|
||||||
return m_pBrowserFrameGlue->FindNamedBrowserItem(aName, NS_STATIC_CAST(nsIWebBrowserChrome*, this), aBrowserItem);
|
return m_pBrowserFrameGlue->FindNamedBrowserItem(aName, NS_STATIC_CAST(nsIWebBrowserChrome*, this), aBrowserItem);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Gets called in response to set the size of a window
|
// Gets called in response to set the size of a window
|
||||||
// Ex: In response to a JavaScript Window.Open() call of
|
// Ex: In response to a JavaScript Window.Open() call of
|
||||||
|
|
|
@ -146,6 +146,12 @@ NS_IMETHODIMP nsWebBrowserChrome::CreateBrowserWindow(PRUint32 aChromeMask,
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* Just commenting out for now because it looks like somebody went to
|
||||||
|
a lot of work here. This method has been removed from nsIWebBrowserChrome
|
||||||
|
per the 5 Feb 01 API review, to be handled one level further down
|
||||||
|
in nsDocShellTreeOwner.
|
||||||
|
*/
|
||||||
NS_IMETHODIMP nsWebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
NS_IMETHODIMP nsWebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
||||||
nsIDocShellTreeItem** aBrowserItem)
|
nsIDocShellTreeItem** aBrowserItem)
|
||||||
{
|
{
|
||||||
|
@ -170,6 +176,7 @@ NS_IMETHODIMP nsWebBrowserChrome::FindNamedBrowserItem(const PRUnichar* aName,
|
||||||
}
|
}
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
NS_IMETHODIMP nsWebBrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
NS_IMETHODIMP nsWebBrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -271,13 +271,6 @@ NS_IMETHODIMP nsContentTreeOwner::CreateBrowserWindow(PRUint32 aChromeFlags,
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP nsContentTreeOwner::FindNamedBrowserItem(const PRUnichar* aName,
|
|
||||||
nsIDocShellTreeItem** aBrowserItem)
|
|
||||||
{
|
|
||||||
NS_ERROR("Haven't Implemented this yet");
|
|
||||||
return NS_ERROR_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP nsContentTreeOwner::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
NS_IMETHODIMP nsContentTreeOwner::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
|
||||||
{
|
{
|
||||||
NS_ERROR("Haven't Implemented this yet");
|
NS_ERROR("Haven't Implemented this yet");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче