From 68aca070dea8a8b6ba6c522fd2f982d8ac947cfb Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Wed, 7 May 2008 12:01:40 +0000 Subject: [PATCH] Back out Chris Pearce's patch from bug 430921 in case it is the cause of the crashes. git-svn-id: svn://10.0.0.236/trunk@251326 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 7 ------- mozilla/editor/composer/src/nsEditingSession.cpp | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index fbaad68cac9..3da1422f09f 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3670,13 +3670,6 @@ nsDocShell::Destroy() // Fire unload event before we blow anything away. (void) FirePageHideNotification(PR_TRUE); - // Clear pointers to any detached nsEditorData that's lying - // around in shistory entries. Breaks cycle. See bug 430921. - if (mOSHE) - mOSHE->SetEditorData(nsnull); - if (mLSHE) - mLSHE->SetEditorData(nsnull); - // Note: mContentListener can be null if Init() failed and we're being // called from the destructor. if (mContentListener) { diff --git a/mozilla/editor/composer/src/nsEditingSession.cpp b/mozilla/editor/composer/src/nsEditingSession.cpp index 565e9117485..56862f20207 100644 --- a/mozilla/editor/composer/src/nsEditingSession.cpp +++ b/mozilla/editor/composer/src/nsEditingSession.cpp @@ -1407,6 +1407,7 @@ nsEditingSession::DetachFromWindow(nsIDOMWindow* aWindow) if (!mDoneSetup) return NS_OK; + NS_ASSERTION(mEditorFlags != 0, "mEditorFlags should not be 0"); NS_ASSERTION(mStateMaintainer, "mStateMaintainer should exist."); // Kill any existing reload timer @@ -1436,6 +1437,7 @@ nsEditingSession::ReattachToWindow(nsIDOMWindow* aWindow) if (!mDoneSetup) return NS_OK; + NS_ASSERTION(mEditorFlags != 0, "mEditorFlags should still be valid..."); NS_ASSERTION(mStateMaintainer, "mStateMaintainer should exist."); // Imitate nsEditorDocShell::MakeEditable() to reattach the