Bug 557689 - Mochitest-3 (debug) crash after running test_bug366682.html or test_selection_move_commands.xul as a result of bug 542919 [@ nsCOMPtr<nsIMutationObserver>::assign_with_AddRef] (underlying issue will be fixed in bug 534785); r=jrmuizel

This commit is contained in:
Ehsan Akhgari 2010-04-12 02:13:17 -04:00
Родитель 0a8224a4c1
Коммит 18d931eb33
2 изменённых файлов: 9 добавлений и 0 удалений

Просмотреть файл

@ -163,6 +163,8 @@ nsEditor::nsEditor()
nsEditor::~nsEditor()
{
NS_ASSERTION(!mDocWeak || mDidPreDestroy, "Why PreDestroy hasn't been called?");
mTxnMgr = nsnull;
delete mPhonetic;

Просмотреть файл

@ -1023,6 +1023,12 @@ nsTextControlFrame::PreDestroy()
// (now that mUseEditor is false values get stored
// in content).
SetValue(value);
// Reset mUseEditor for now, so that if any of the rest of the operation
// leads to an attempt at getting the editor, lazy initialization doesn't
// kick in. See bug 557689 for an example of the types of problems this
// prevents.
mUseEditor = PR_TRUE;
}
mEditor->PreDestroy(PR_TRUE);
}
@ -1064,6 +1070,7 @@ nsTextControlFrame::PreDestroy()
}
}
mUseEditor = PR_FALSE;
mEditor = nsnull;
if (mSelCon) {
mSelCon->SetScrollableFrame(nsnull);