Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out Chris Pearce's patch from bug 430921 in case it is the cause of the crashes.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251326 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com 2008-05-07 12:01:40 +00:00
parent 13b8bc22fc
commit 68aca070de
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/docshell/base/nsDocShell.cpp
View File

@ -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) {

2
mozilla/editor/composer/src/nsEditingSession.cpp
View File

@ -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