corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nsDocShell leak and nsEditingSession init after forced reload of document. b=180146, r=cmanske, sr=sfraser

Browse Source
This commit is contained in:
cmanske@netscape.com
2002-11-20 06:25:42 +00:00
parent 9c3517f8f8
commit 8c98e13062
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/nsDocShellEditorData.cpp
View File

@@ -53,7 +53,7 @@ nsDocShellEditorData::~nsDocShellEditorData()
{ {
// Get editing session on the root docShell // Get editing session on the root docShell
nsCOMPtr <nsIEditingSession> editingSession; nsCOMPtr <nsIEditingSession> editingSession;
nsresult rv = GetOrCreateEditingSession(getter_AddRefs(editingSession), PR_FALSE); nsresult rv = GetOrCreateEditingSession(PR_FALSE, getter_AddRefs(editingSession));
if (editingSession) if (editingSession)
{ {
@@ -136,7 +136,7 @@ nsresult
nsDocShellEditorData::GetEditingSession(nsIEditingSession **outEditingSession) nsDocShellEditorData::GetEditingSession(nsIEditingSession **outEditingSession)
{ {
NS_ENSURE_ARG_POINTER(outEditingSession); NS_ENSURE_ARG_POINTER(outEditingSession);
return GetOrCreateEditingSession(outEditingSession, PR_TRUE); return GetOrCreateEditingSession(PR_TRUE, outEditingSession);
} }
@@ -189,7 +189,7 @@ nsDocShellEditorData::SetEditor(nsIEditor *inEditor)
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
nsresult nsresult
nsDocShellEditorData::GetOrCreateEditingSession(nsIEditingSession **outEditingSession, PRBool inAllowCreation) nsDocShellEditorData::GetOrCreateEditingSession(PRBool inAllowCreation, nsIEditingSession **outEditingSession)
{ {
NS_ENSURE_ARG_POINTER(outEditingSession); NS_ENSURE_ARG_POINTER(outEditingSession);
*outEditingSession = nsnull; *outEditingSession = nsnull;

2
docshell/base/nsDocShellEditorData.h
View File

@@ -69,7 +69,7 @@ public:
protected: protected:
nsresult GetOrCreateEditingSession(nsIEditingSession **outEditingSession, PRBool inAllowCreation); nsresult GetOrCreateEditingSession(PRBool inAllowCreation, nsIEditingSession **outEditingSession);
protected: protected:

6
docshell/base/nsIEditorDocShell.idl
View File

@@ -17,7 +17,8 @@
* Copyright (C) 1999, Mozilla. All Rights Reserved. * Copyright (C) 1999, Mozilla. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* Simon Fraser <sfraser@netscape.com> * Simon Fraser <sfraser@netscape.com>
* Charles Manske <cmanske@netscape.com>
*/ */
#include "nsISupports.idl" #include "nsISupports.idl"
@@ -45,7 +46,6 @@ interface nsIEditorDocShell : nsISupports
* @param inWaitForUriLoad true to wait for a URI before * @param inWaitForUriLoad true to wait for a URI before
* creating the editor. * creating the editor.
*/ */
void makeEditable(in boolean inWaitForUriLoad); void makeEditable(in boolean inWaitForUriLoad);
}; };