From 0ff4c5f3cdca6e3d019f39e1ce21cd6bb04178cd Mon Sep 17 00:00:00 2001 From: "cmanske%netscape.com" Date: Wed, 20 Nov 2002 06:25:42 +0000 Subject: [PATCH] Fixed nsDocShell leak and nsEditingSession init after forced reload of document. b=180146, r=cmanske, sr=sfraser git-svn-id: svn://10.0.0.236/trunk@134172 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShellEditorData.cpp | 6 +++--- mozilla/docshell/base/nsDocShellEditorData.h | 2 +- mozilla/docshell/base/nsIEditorDocShell.idl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/docshell/base/nsDocShellEditorData.cpp b/mozilla/docshell/base/nsDocShellEditorData.cpp index 5d457733f83..ea0ed3629f3 100644 --- a/mozilla/docshell/base/nsDocShellEditorData.cpp +++ b/mozilla/docshell/base/nsDocShellEditorData.cpp @@ -53,7 +53,7 @@ nsDocShellEditorData::~nsDocShellEditorData() { // Get editing session on the root docShell nsCOMPtr editingSession; - nsresult rv = GetOrCreateEditingSession(getter_AddRefs(editingSession), PR_FALSE); + nsresult rv = GetOrCreateEditingSession(PR_FALSE, getter_AddRefs(editingSession)); if (editingSession) { @@ -136,7 +136,7 @@ nsresult nsDocShellEditorData::GetEditingSession(nsIEditingSession **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 -nsDocShellEditorData::GetOrCreateEditingSession(nsIEditingSession **outEditingSession, PRBool inAllowCreation) +nsDocShellEditorData::GetOrCreateEditingSession(PRBool inAllowCreation, nsIEditingSession **outEditingSession) { NS_ENSURE_ARG_POINTER(outEditingSession); *outEditingSession = nsnull; diff --git a/mozilla/docshell/base/nsDocShellEditorData.h b/mozilla/docshell/base/nsDocShellEditorData.h index f1e10576ae9..ae91868ab37 100644 --- a/mozilla/docshell/base/nsDocShellEditorData.h +++ b/mozilla/docshell/base/nsDocShellEditorData.h @@ -69,7 +69,7 @@ public: protected: - nsresult GetOrCreateEditingSession(nsIEditingSession **outEditingSession, PRBool inAllowCreation); + nsresult GetOrCreateEditingSession(PRBool inAllowCreation, nsIEditingSession **outEditingSession); protected: diff --git a/mozilla/docshell/base/nsIEditorDocShell.idl b/mozilla/docshell/base/nsIEditorDocShell.idl index db20e4d9a6b..006ad478751 100644 --- a/mozilla/docshell/base/nsIEditorDocShell.idl +++ b/mozilla/docshell/base/nsIEditorDocShell.idl @@ -17,7 +17,8 @@ * Copyright (C) 1999, Mozilla. All Rights Reserved. * * Contributor(s): - * Simon Fraser + * Simon Fraser + * Charles Manske */ #include "nsISupports.idl" @@ -45,7 +46,6 @@ interface nsIEditorDocShell : nsISupports * @param inWaitForUriLoad true to wait for a URI before * creating the editor. */ - void makeEditable(in boolean inWaitForUriLoad); - + void makeEditable(in boolean inWaitForUriLoad); };