зеркало из https://github.com/mozilla/gecko-dev.git
Back out Chris Pearce's patch from bug 430921 as a possible cause of the crashes on Linux.
This commit is contained in:
Родитель
603974132b
Коммит
4d6ffbf188
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче