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

Make sure that we have an mParentContentListener at all times in docshell. Bug

Browse Source 
282644, r=biesi, sr=jst
This commit is contained in:
bzbarsky%mit.edu 2005-02-18 18:20:42 +00:00
parent d0e111d772
commit 34b03e8a02
4 changed files with 21 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docshell/base/nsDSURIContentListener.cpp
View File

@ -49,8 +49,9 @@
//*** nsDSURIContentListener: Object Management
//*****************************************************************************
nsDSURIContentListener::nsDSURIContentListener() : mDocShell(nsnull),
mParentContentListener(nsnull)
nsDSURIContentListener::nsDSURIContentListener(nsDocShell* aDocShell)
: mDocShell(aDocShell),
mParentContentListener(nsnull)
{
}
@ -210,7 +211,7 @@ nsDSURIContentListener::CanHandleContent(const char* aContentType,
NS_IMETHODIMP
nsDSURIContentListener::GetLoadCookie(nsISupports ** aLoadCookie)
{
NS_ADDREF(*aLoadCookie = NS_STATIC_CAST(nsIDocumentLoader*, mDocShell));
NS_IF_ADDREF(*aLoadCookie = NS_STATIC_CAST(nsIDocumentLoader*, mDocShell));
return NS_OK;
}
@ -267,20 +268,3 @@ nsDSURIContentListener::SetParentContentListener(nsIURIContentListener*
return NS_OK;
}
//*****************************************************************************
// nsDSURIContentListener: Helpers
//*****************************************************************************
//*****************************************************************************
// nsDSURIContentListener: Accessors
//*****************************************************************************
void nsDSURIContentListener::DocShell(nsDocShell* aDocShell)
{
mDocShell = aDocShell;
}
nsDocShell* nsDSURIContentListener::DocShell()
{
return mDocShell;
}

7
docshell/base/nsDSURIContentListener.h
View File

@ -61,11 +61,12 @@ public:
nsresult Init();
protected:
nsDSURIContentListener();
nsDSURIContentListener(nsDocShell* aDocShell);
virtual ~nsDSURIContentListener();
void DocShell(nsDocShell* aDocShell);
nsDocShell* DocShell();
void DropDocShellreference() {
mDocShell = nsnull;
}
protected:
nsDocShell* mDocShell;

41
docshell/base/nsDocShell.cpp
View File

@ -257,7 +257,6 @@ nsDocShell::nsDocShell():
mMarginWidth(0),
mMarginHeight(0),
mItemType(typeContent),
mContentListener(nsnull),
mDefaultScrollbarPref(Scrollbar_Auto, Scrollbar_Auto),
mEditorData(nsnull),
mTreeOwner(nsnull),
@ -297,6 +296,12 @@ nsDocShell::Init()
NS_ASSERTION(mLoadGroup, "Something went wrong!");
mContentListener = new nsDSURIContentListener(this);
NS_ENSURE_TRUE(mContentListener, NS_ERROR_OUT_OF_MEMORY);
rv = mContentListener->Init();
NS_ENSURE_SUCCESS(rv, rv);
// We want to hold a strong ref to the loadgroup, so it better hold a weak
// ref to us... use an InterfaceRequestorProxy to do this.
nsCOMPtr<InterfaceRequestorProxy> proxy =
@ -370,8 +375,7 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink)
*aSink = nsnull;
if (aIID.Equals(NS_GET_IID(nsIURIContentListener)) &&
NS_SUCCEEDED(EnsureContentListener())) {
if (aIID.Equals(NS_GET_IID(nsIURIContentListener))) {
*aSink = mContentListener;
}
else if (aIID.Equals(NS_GET_IID(nsIScriptGlobalObject)) &&
@ -1316,8 +1320,7 @@ nsDocShell::GetChromeEventHandler(nsIChromeEventHandler ** aChromeEventHandler)
NS_IMETHODIMP
nsDocShell::GetParentURIContentListener(nsIURIContentListener ** aParent)
{
NS_ENSURE_ARG_POINTER(aParent);
NS_ENSURE_SUCCESS(EnsureContentListener(), NS_ERROR_FAILURE);
NS_PRECONDITION(aParent, "Null out param?");
return mContentListener->GetParentContentListener(aParent);
}
@ -1325,8 +1328,6 @@ nsDocShell::GetParentURIContentListener(nsIURIContentListener ** aParent)
NS_IMETHODIMP
nsDocShell::SetParentURIContentListener(nsIURIContentListener * aParent)
{
NS_ENSURE_SUCCESS(EnsureContentListener(), NS_ERROR_FAILURE);
return mContentListener->SetParentContentListener(aParent);
}
@ -3414,10 +3415,11 @@ nsDocShell::Destroy()
mSessionHistory = nsnull;
SetTreeOwner(nsnull);
// Note: mContentListener can be null if Init() failed and we're being
// called from the destructor.
if (mContentListener) {
mContentListener->DocShell(nsnull);
mContentListener->DropDocShellreference();
mContentListener->SetParentContentListener(nsnull);
NS_RELEASE(mContentListener);
}
return NS_OK;
@ -6976,27 +6978,6 @@ nsDocShell::GetRootScrollableView(nsIScrollableView ** aOutScrollView)
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::EnsureContentListener()
{
nsresult rv = NS_OK;
if (mContentListener)
return NS_OK;
mContentListener = new nsDSURIContentListener();
NS_ENSURE_TRUE(mContentListener, NS_ERROR_OUT_OF_MEMORY);
NS_ADDREF(mContentListener);
rv = mContentListener->Init();
if (NS_FAILED(rv))
return rv;
mContentListener->DocShell(this);
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::EnsureScriptEnvironment()
{

4
docshell/base/nsDocShell.h
View File

@ -70,6 +70,7 @@
#include "nsCOMPtr.h"
#include "nsPoint.h" // mCurrent/mDefaultScrollbarPreferences
#include "nsString.h"
#include "nsAutoPtr.h"
// Threshold value in ms for META refresh based redirects
#define REFRESH_REDIRECT_TIMER 15000
@ -319,7 +320,6 @@ protected:
NS_IMETHOD GetChildOffset(nsIDOMNode * aChild, nsIDOMNode * aParent,
PRInt32 * aOffset);
NS_IMETHOD GetRootScrollableView(nsIScrollableView ** aOutScrollView);
NS_IMETHOD EnsureContentListener();
NS_IMETHOD EnsureScriptEnvironment();
NS_IMETHOD EnsureEditorData();
nsresult EnsureTransferableHookData();
@ -425,7 +425,7 @@ protected:
*/
nsCString mContentTypeHint;
nsCOMPtr<nsISupportsArray> mRefreshURIList;
nsDSURIContentListener * mContentListener;
nsRefPtr<nsDSURIContentListener> mContentListener;
nsRect mBounds; // Dimensions of the docshell
nsCOMPtr<nsIContentViewer> mContentViewer;
nsCOMPtr<nsIDocumentCharsetInfo> mDocumentCharsetInfo;