Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to reflect the fact that the nsIDocShell API now has a GetPresShell. Used NS_STATIC_CAST on a comparison to 'this'. (Not Part of build).

Browse Source
This commit is contained in:
tbogard%aol.net 1999-11-29 18:41:59 +00:00
parent e61394b1f9
commit 7c9a535d7a
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docshell/base/nsDocShell.cpp
View File

@ -320,6 +320,19 @@ NS_IMETHODIMP nsDocShell::GetPresContext(nsIPresContext** aPresContext)
return NS_OK;
}
NS_IMETHODIMP nsDocShell::GetPresShell(nsIPresShell** aPresShell)
{
NS_ENSURE_ARG_POINTER(aPresShell);
nsCOMPtr<nsIPresContext> presContext;
NS_ENSURE_SUCCESS(GetPresContext(getter_AddRefs(presContext)),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(presContext->GetShell(aPresShell), NS_ERROR_FAILURE);
return NS_OK;
}
NS_IMETHODIMP nsDocShell::GetContentViewer(nsIContentViewer** aContentViewer)
{
NS_ENSURE_ARG_POINTER(aContentViewer);
@ -390,7 +403,7 @@ NS_IMETHODIMP nsDocShell::SetPrefs(nsIPref* aPrefs)
NS_IMETHODIMP nsDocShell::GetRootDocShell(nsIDocShell** aRootDocShell)
{
NS_ENSURE_ARG_POINTER(aRootDocShell);
*aRootDocShell = this;
*aRootDocShell = NS_STATIC_CAST(nsIDocShell*, this);
nsCOMPtr<nsIDocShell> parent;
NS_ENSURE_TRUE(GetParent(getter_AddRefs(parent)), NS_ERROR_FAILURE);
@ -1537,19 +1550,6 @@ nsresult nsDocShell::GetRootScrollableView(nsIScrollableView** aOutScrollView)
return NS_OK;
}
nsresult nsDocShell::GetPresShell(nsIPresShell** aPresShell)
{
NS_ENSURE_ARG_POINTER(aPresShell);
nsCOMPtr<nsIPresContext> presContext;
NS_ENSURE_SUCCESS(GetPresContext(getter_AddRefs(presContext)),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(presContext->GetShell(aPresShell), NS_ERROR_FAILURE);
return NS_OK;
}
nsresult nsDocShell::EnsureContentListener()
{
if(mContentListener)

1
docshell/base/nsDocShell.h
View File

@ -103,7 +103,6 @@ protected:
nsresult GetChildOffset(nsIDOMNode* aChild, nsIDOMNode* aParent,
PRInt32* aOffset);
nsresult GetRootScrollableView(nsIScrollableView** aOutScrollView);
nsresult GetPresShell(nsIPresShell** aPresShell);
nsresult EnsureContentListener();
void SetCurrentURI(nsIURI* aUri);